在线诊断数据

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +37,9 @@ public class DiagnosepointController {
     @GetMapping("/list")
     public JSONObject getDiagnosepointList(String station, String model) {
         if (!StringUtils.isEmpty(station) && !StringUtils.isEmpty(model)) {
-            List<Diagnosepoint> list = InitialRunner.mapPoint.get(station).get(model);
+            List<Diagnosepoint> list = new ArrayList<>();
+            list.addAll(InitialRunner.mapPoint.get(station).get(model));
+            list.add(new Diagnosepoint().faultType());
             return JsonResult.successData(ResultCode.SUCCESS, list);
         }
         else {

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 数据源方式训练模型
@@ -93,8 +94,8 @@ public class TrainDataModeController {
         List<Casefault> faults = JSONObject.parseArray(json.getJSONArray("faults").toString(), Casefault.class);
 
         Map<String, Object> map = new HashMap<>();
-        /** 组装数据 **/
-        dataService.formatUniformcode(points);
+        /** 组装数据  删除添加的故障类型**/
+        dataService.formatUniformcode(points.stream().filter(a -> !a.getUniformcode().equals("faulttype")).collect(Collectors.toList()));
         ExecuteInfo executeInfo = new ExecuteInfo();
         Calendar cal = Calendar.getInstance();
         DataInfo[] dataInfos = new DataInfo[faults.size()];

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

@@ -41,4 +41,13 @@ public class Diagnosepoint {
     private int ordernum;
 
 
+    //由于前端选择数据需要展示预测列，需新增故障类型  补到最后一条
+    public Diagnosepoint faultType(){
+        Diagnosepoint point = new Diagnosepoint();
+        point.setName("故障类型");
+        point.setUniformcode("faulttype");
+        point.setOrdernum(10000000);
+
+        return point;
+    }
 }

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

@@ -90,6 +90,7 @@ public class FaultRefreshService implements ApplicationRunner {
             if (!infoCache.faultMap.containsKey(fi.getId()+fi.getFaultTime()+fi.getSnapID())) {
                 autoCmdService.exec(fi);
                 infoCache.faultMap.put(fi.getId()+fi.getFaultTime()+fi.getSnapID(), fi);
+                log.info("==在线诊断：" + fi.toString());
             }
         }