songyh %!s(int64=3) %!d(string=hai) anos
pai
achega
c5a64d9acc

+ 9 - 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java

@@ -132,10 +132,6 @@ public class DictAspect {
                 }
                 ((IPage) ((Result) result).getResult()).setRecords(items);
             }else if(((Result) result).getResult() instanceof PageInfo){
-                //返回类型为 pageInfo  list
-               /* if (((Result) result).getResult() instanceof List) {
-                    return;
-                }*/
                 List<JSONObject> items = new ArrayList<>();
                 for (Object record : ((Result<PageInfo>) result).getResult().getList()){
                     ObjectMapper mapper = new ObjectMapper();
@@ -153,9 +149,17 @@ public class DictAspect {
                             String code = field.getAnnotation(Dict.class).dicCode();
                             String text = field.getAnnotation(Dict.class).dicText();
                             String table = field.getAnnotation(Dict.class).dictTable();
+                            String extendsKey = field.getAnnotation(Dict.class).extendsKey();
+                            if("".equals(extendsKey.trim())){
+                                extendsKey = null;
+                            }
+                            String extendsValue = field.getAnnotation(Dict.class).extendsValue();
+                            if("".equals(extendsValue.trim())){
+                                extendsValue = null;
+                            }
                             String key = String.valueOf(item.get(field.getName()));
                             //翻译字典值对应的txt
-                            String textValue = translateDictValue(code, text, table, key,null,null);
+                            String textValue = translateDictValue(code, text, table, key,extendsKey,extendsValue);
                             log.debug(" 字典Val : "+ textValue);
                             log.debug(" __翻译字典字段__ "+field.getName() + CommonConstant.DICT_TEXT_SUFFIX+": "+ textValue);
                             item.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue);

+ 22 - 0
jeecg-boot-module-demo/pom.xml

@@ -23,6 +23,28 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-system-local-api</artifactId>
         </dependency>
+
+        <!--alink -->
+        <dependency>
+            <groupId>com.alibaba.alink</groupId>
+            <artifactId>alink_core_flink-1.13_2.11</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-scala_2.11</artifactId>
+            <version>1.13.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-planner_2.11</artifactId>
+            <version>1.13.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-clients_2.11</artifactId>
+            <version>1.13.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

+ 29 - 0
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/TestAlinkController.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.demo.test.controller;
+
+import com.alibaba.alink.operator.batch.BatchOperator;
+import com.alibaba.alink.operator.batch.source.CsvSourceBatchOp;
+import com.alibaba.alink.pipeline.Pipeline;
+import com.alibaba.alink.pipeline.clustering.KMeans;
+import com.alibaba.alink.pipeline.dataproc.vector.VectorAssembler;
+
+public class TestAlinkController {
+    public static void main(String[] args) throws Exception {
+        String URL = "https://alink-release.oss-cn-beijing.aliyuncs.com/data-files/iris.csv";
+        String SCHEMA_STR = "sepal_length double, sepal_width double, petal_length double, petal_width double, category string";
+
+        BatchOperator data = new CsvSourceBatchOp().setFilePath(URL).setSchemaStr(SCHEMA_STR);
+
+        VectorAssembler va = new VectorAssembler()
+                .setSelectedCols(new String[]{"sepal_length", "sepal_width", "petal_length", "petal_width"})
+                .setOutputCol("features");
+
+        KMeans kMeans = new KMeans().setVectorCol("features").setK(3)
+                .setPredictionCol("prediction_result")
+                .setPredictionDetailCol("prediction_detail")
+                .setReservedCols("category")
+                .setMaxIter(100);
+
+        Pipeline pipeline = new Pipeline().add(va).add(kMeans);
+        pipeline.fit(data).transform(data).print();
+    }
+}

+ 4 - 5
pom.xml

@@ -50,11 +50,10 @@
 	<modules>
         <module>jeecg-boot-base</module>
         <module>jeecg-boot-module-demo</module>
-        <module>jeecg-boot-module-system</module>
-        <module>jeecg-boot-bytedance-ad</module>
-
-       <!-- 需要微服务,请打开注释-->
-       <module>jeecg-boot-starter</module>
+		<module>jeecg-boot-bytedance-data</module>
+		<module>jeecg-boot-module-system</module>
+		<module>jeecg-boot-bytedance-ad</module>
+       	<module>jeecg-boot-starter</module>
         <module>jeecg-cloud-module</module>
         <module>jeecg-boot-finance</module>
     </modules>