数据源修改

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ModelServiceImpl.java

@@ -117,10 +117,11 @@ public class ModelServiceImpl implements IModelService {
             throw new GlobalException("上传文件失败");
         }
         // Map<String, String> parms = new HashMap<>();
-        parmsMap.put("data_url", url);
+        parmsMap.put("url", url);
         String result = HttpClientUtils.postJson(modelInfo.getUrl(), parmsMap);
         // TODO 需要判断结果状态
         JSONObject jsonObject = JSONUtil.parseObj(result);
+        log.info("模型返回结果：{}", jsonObject.toString());
         String status = jsonObject.getStr("status");
         String jsonString = jsonObject.getStr("data");
         // 故障深度隔离无结果。需要匹配故障案例

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/CsvUtils.java

@@ -102,7 +102,7 @@ public class CsvUtils {
     public static File jsonToFileCsvByJsonArray(JSONArray jsonArray, String csvFilePath) {
         try {
             // 将JSON数组写入CSV文件
-            return FileUtil.writeLines(jsonArrayToCsv(jsonArray), csvFilePath, CharsetUtil.CHARSET_GBK);
+            return FileUtil.writeLines(jsonArrayToCsv(jsonArray), csvFilePath, CharsetUtil.CHARSET_UTF_8);
         } catch (Exception e) {
             log.error("json转csv文件错误：{}", e.getMessage());
         }
@@ -185,7 +185,7 @@ public class CsvUtils {
         try {
             CsvReader reader = CsvUtil.getReader();
             // 从文件中读取CSV数据
-            CsvData data = reader.read(FileUtil.file(csvFilePath), CharsetUtil.CHARSET_GBK);
+            CsvData data = reader.read(FileUtil.file(csvFilePath), CharsetUtil.CHARSET_UTF_8);
             return data.getRows();
         } catch (Exception e) {
             log.error(e.getMessage());

PHM-admin/phm-netty/src/main/java/com/phm/netty/domain/Message.java

@@ -98,6 +98,7 @@ public class Message implements Serializable {
         }
     }
 
+    // 发送指令的内容
     public static byte[] testMsg() {
         Message message = new Message();
         message.setType(OrderEnum.COMMON.getType()).setTarget("GPHM").setSource("SPHM")

PHM-web/src/views/manage/model/index.vue

@@ -254,7 +254,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
-        type: 1,
+        type: null,
         url: null,
         modelParams: null,
         dataParams: null,
@@ -263,10 +263,10 @@ export default {
       form: {
         id: null,
         name: null,
-        type: 1,
+        type: null,
         url: null,
-        modelParamsArr: [],
-        dataParamsArr: [],
+        modelParamsArr: null,
+        dataParamsArr: null,
       },
       // 表单校验
       rules: {
@@ -313,7 +313,7 @@ export default {
       this.form = {
         id: null,
         name: null,
-        type: 1,
+        type: null,
         url: null,
         modelParamsArr: [],
         dataParamsArr: [],
@@ -357,12 +357,16 @@ export default {
       this.form.name = data.name
       this.form.type = data.type
       this.form.url = data.url
-      this.form.modelParamsArr = JSON.parse(data.modelParams || [])
-      this.form.dataParamsArr = JSON.parse(data.dataParams || [])
+      if (data.modelParams) {
+        this.form.modelParamsArr = JSON.parse(data.modelParams)
+      }
+      if (data.dataParams) {
+        this.form.dataParamsArr = JSON.parse(data.dataParams)
+      }
     },
     toStr() {
-      this.form.modelParams = JSON.stringify(this.form.modelParamsArr)
-      this.form.dataParams = JSON.stringify(this.form.dataParamsArr)
+      this.form.modelParams = JSON.stringify(this.form.modelParamsArr || '') 
+      this.form.dataParams = JSON.stringify(this.form.dataParamsArr || '')
     },
     /** 提交按钮 */
     submitForm() {