故障预测接口修改

gyee-sample-impala/src/main/java/com/gyee/impala/controller/diagnose/TrainFaultDiagnoseController.java

@@ -9,7 +9,8 @@ import com.gyee.impala.model.custom.diagnose.DataInfo;
 import com.gyee.impala.model.custom.diagnose.ExecuteInfo;
 import com.gyee.impala.model.master.Casefault;
 import com.gyee.impala.model.master.diagnose.Diagnosepoint;
-import com.gyee.impala.service.custom.diagnose.DataPointService;
+import com.gyee.impala.model.master.diagnose.Diagnosetrainhistory;
+import com.gyee.impala.service.custom.diagnose.DataDiagnoseService;
 import com.gyee.impala.service.custom.diagnose.TrainFaultDiagnoseService;;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @CrossOrigin
 @RestController
-@RequestMapping("/api/diagnose")
+    @RequestMapping("/api/diagnose")
 public class TrainFaultDiagnoseController {
 
 
@@ -44,7 +45,7 @@ public class TrainFaultDiagnoseController {
      * 数据服务
      */
     @Autowired
-    private DataPointService dataService;
+    private DataDiagnoseService dataDiagnoseService;
 
     /**
      * 线程池
@@ -79,7 +80,7 @@ public class TrainFaultDiagnoseController {
         List<Casefault> faults = JSONObject.parseArray(json.getJSONArray("faults").toString(), Casefault.class);
 
         /** 组装数据  删除添加的故障类型**/
-        dataService.formatUniformcode(points.stream().filter(a -> !a.getUniformcode().equals("faulttype")).collect(Collectors.toList()));
+        dataDiagnoseService.formatUniformcode(points.stream().filter(a -> !a.getUniformcode().equals("faulttype")).collect(Collectors.toList()));
         executeInfo = new ExecuteInfo();
         Calendar cal = Calendar.getInstance();
         DataInfo[] dataInfos = new DataInfo[faults.size()];
@@ -109,7 +110,7 @@ public class TrainFaultDiagnoseController {
             }
             return JsonResult.success(ResultCode.SUCCESS);
         }else {
-            Map<String, Object> mp = dataService.getFormData(executeInfo);
+            Map<String, Object> mp = dataDiagnoseService.getFormData(executeInfo);
             return JsonResult.successData(ResultCode.SUCCESS, mp);
         }
     }
@@ -120,14 +121,13 @@ public class TrainFaultDiagnoseController {
      */
     private void execute() {
 
-        fileName = dataService.getFormDataAll(executeInfo);
+        fileName = dataDiagnoseService.getFormDataAll(executeInfo);
         trainFaultDiagnoseService.exec();
 
     }
 
 
 
-
     /**
      * py 获取预测数据
      *
@@ -144,9 +144,42 @@ public class TrainFaultDiagnoseController {
 
 
 
+    /**
+     * 缓存训练预测模型结果
+     *
+     * @param history
+     * @return
+     */
+    @PostMapping("/putHistory")
+    public JSONObject putDiagnosetrainhistory(@RequestBody String history) {
+        try {
+            log.info("训练模型结果：" + history);
+            trainFaultDiagnoseService.putDiagnosetrainhistory(history);
+            return JsonResult.success(ResultCode.SUCCESS);
+        } catch (Exception e) {
+            log.error("请求错误", e);
+            return JsonResult.error(ResultCode.ERROR);
+        }
+    }
 
 
 
 
+    /**
+     * 获取当前训练预测模型结果
+     * @return
+     */
+    @GetMapping("/getHistory")
+    public JSONObject getHistory() {
+        try {
+            Diagnosetrainhistory d = trainFaultDiagnoseService.getHistoryQueue();
+            return JsonResult.successData(ResultCode.SUCCESS, d);
+        } catch (Exception e) {
+            log.error("请求错误", e);
+            return JsonResult.error(ResultCode.ERROR);
+        }
+    }
+
+
 
 }

gyee-sample-impala/src/main/java/com/gyee/impala/model/master/diagnose/Diagnosetrainhistory.java

@@ -69,6 +69,11 @@ public class Diagnosetrainhistory extends Model<Diagnosetrainhistory> {
     private String point;
 
     /**
+     * 训练模型分类（zd：故障诊断；yc：故障预测）
+     */
+    private String type;
+
+    /**
      * 样本数量
      */
     @TableField(exist = false)

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/TrainFaultDiagnoseService.java

@@ -1,9 +1,11 @@
 package com.gyee.impala.service.custom.diagnose;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.gyee.impala.common.config.GyeeConfig;
 import com.gyee.impala.common.util.DateUtil;
 import com.gyee.impala.common.util.JudeSystem;
+import com.gyee.impala.model.master.diagnose.Diagnosetrainhistory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,17 +24,23 @@ public class TrainFaultDiagnoseService {
     private GyeeConfig gyeeConfig;
 
 
-
     /**
      *
      */
     private boolean isComplete = true;
 
+    /**
+     * 预测模型
+     */
+    private Diagnosetrainhistory historyQueue =null;
+
     public boolean isComplete() {
         return isComplete;
     }
 
-
+    public Diagnosetrainhistory getHistoryQueue() {
+        return historyQueue;
+    }
 
     /**
      * 在线训诊断用脚本
@@ -82,5 +90,19 @@ public class TrainFaultDiagnoseService {
     }
 
 
+    /**
+     * 保存训练结果
+     *
+     * @param history
+     * @throws Exception
+     */
+    public void putDiagnosetrainhistory(String history){
+        String body = JSONObject.toJSONString(history);
+        Object historys = JSONObject.parse(body);
+        historyQueue= JSONObject.parseObject(historys.toString(), Diagnosetrainhistory.class);
+        historyQueue.setEnable(false);
+        historyQueue.setType("yc");
+    }
+
 
 }

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/diagnose/TrainFileModeService.java

@@ -158,6 +158,7 @@ public class TrainFileModeService {
         Object historys = JSONObject.parse(body);
         historyQueue= JSONObject.parseObject(historys.toString(), Diagnosetrainhistory.class);
         historyQueue.setEnable(false);
+        historyQueue.setType("zd");
     }
 
     /**