报警详情增加统计

gyee-sample-impala/src/main/java/com/gyee/impala/common/feign/IAdapterService.java

@@ -61,6 +61,6 @@ public interface IAdapterService {
      * @param thingId 风机（或其他）ID
      * @return 历史数据列表
      */
-    @RequestLine("GET /ts/history/snap?uniformCode={uniformCode}&startTs={startTs}&endTs={endTs}&thingType=windturbine&thingId={thingId}&interval=1")
+    @RequestLine("GET /ts/history/snap?uniformCode={uniformCode}&startTs={startTs}&endTs={endTs}&thingType=windturbine&thingId={thingId}&interval=10")
     List<PointData> getHistoryByUniformCode(@Param(value = "uniformCode") String uniformCode, @Param("startTs") String startTs, @Param("endTs") String endTs, @Param("thingId") String thingId);
 }

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

@@ -139,7 +139,7 @@ public class AutoFaultController {
             }
         }
         dataPointService.formatUniformcode(uniforms);
-        Map<String, List<PointData>> data = dataPointService.getData(dataInfo, false);
+        Map<String, List<PointData>> data = dataPointService.getData(dataInfo, true);
         Map<String, Object> mp = new HashMap<>();
         mp.put("data", data);
         mp.put("info", fi);

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

@@ -40,25 +40,31 @@ public class AlarmService {
         Map<String, List<AlertHistory>> collect = list.stream()
                 .filter(a -> !StringUtils.isEmpty(a.getCategory2()))
                 .collect(Collectors.groupingBy(AlertHistory::getCategory2));
-        collect.forEach((k, v) ->{
+        int count = 0;
+        for (Map.Entry<String, List<AlertHistory>> entry : collect.entrySet()) {
+            String k = entry.getKey();
+            List<AlertHistory> v = entry.getValue();
             List<Object> ls = new ArrayList<>();
             Map<String, Object> mp = new HashMap<>();
             String name = InitialRunner.scadaWarnMap.get(k.toUpperCase());
-            if (!StringUtils.isEmpty(name)){
+            if (!StringUtils.isEmpty(name)) {
                 mp.put("name", name);
-                v.stream().filter(CollectUtil.distinctByKey(AlertHistory::getAlertText)).collect(Collectors.toList()).forEach(a -> {
+                for (AlertHistory a : v.stream().filter(CollectUtil.distinctByKey(AlertHistory::getAlertText)).collect(Collectors.toList())) {
                     Map<String, String> pm = new HashMap<>();
                     pm.put("name", a.getAlertText());
                     ls.add(pm);
-                });
+                    count += 1;
+                }
                 mp.put("children", ls);
                 faults.add(mp);
             }
-        });
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("name", "总故障");
         map.put("children", faults);
+        map.put("count", count);
 
         return map;
     }
 }
+

gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/master/CasefaultalgServiceImpl.java

@@ -151,6 +151,7 @@ public class CasefaultalgServiceImpl extends ServiceImpl<CasefaultalgMapper, Cas
             row.addObject("faulttype", obj.getFaulttype());
             row.addObject("faultcode", obj.getFaultcode());
             row.addObject("algname", obj.getAlgname());
+            row.addObject("algcode", obj.getAlgcode());
             row.addObject("symptom", obj.getSymptom());
             row.addObject("symptomcode", obj.getSymptomcode());
             row.addObject("starttime", obj.getStarttime());