[update] 态势检测-故障统计优化

signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java

@@ -194,10 +194,10 @@ public class SituationDetectionController extends BaseController {
         return jsonViewObject.success(tDeviceStatusInfos);
     }
 
-    @ApiOperation(value = "查询信号机故障列表", notes = "查询信号机故障列表")
+    @ApiOperation(value = "信号机故障统计", notes = "信号机故障统计")
     @GetMapping("/countSignalFaultInfos")
     public JsonViewObject countSignalFaultInfos() {
-        Map<String, Integer> result = situationDetectionService.countSignalFaultInfos();
+        DeviceFaultCountVO result = situationDetectionService.countSignalFaultInfos();
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         return jsonViewObject.success(result);
     }

signal-control-service/src/main/java/net/wanji/web/service/SituationDetectionService.java

@@ -43,5 +43,5 @@ public interface SituationDetectionService {
 
     List<TDeviceStatusLog> listSignalFaultInfos();
 
-    Map<String, Integer> countSignalFaultInfos();
+    DeviceFaultCountVO countSignalFaultInfos();
 }

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -458,24 +458,24 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     }
 
     @Override
-    public Map<String, Integer> countSignalFaultInfos() {
-        HashMap<String, Integer> resultMap = new HashMap<>();
+    public DeviceFaultCountVO countSignalFaultInfos() {
+        DeviceFaultCountVO countVO = new DeviceFaultCountVO();
         List<TDeviceStatusLog> tDeviceStatusInfos = listSignalFaultInfos();
-        int dealSize = 0;
-        int faultSize = 0;
+        int dealCount = 0;
+        int faultCount = 0;
         for (TDeviceStatusLog tDeviceStatusLog : tDeviceStatusInfos) {
             int faultType = tDeviceStatusLog.getFaultType();
             if (100 == faultType) {
-                dealSize++;
+                dealCount++;
             }
             if (faultType > 0 && faultType < 100) {
-                faultSize++;
+                faultCount++;
             }
         }
-        resultMap.put("dealSize", dealSize);
-        resultMap.put("faultSize", faultSize);
-        resultMap.put("allSize", tDeviceStatusInfos.size());
-        return resultMap;
+        countVO.setDealCount(dealCount);
+        countVO.setFaultCount(faultCount);
+        countVO.setAllCount(tDeviceStatusInfos.size());
+        return countVO;
     }
 }
 

signal-control-service/src/main/java/net/wanji/web/vo/situationDetection/DeviceFaultCountVO.java

+package net.wanji.web.vo.situationDetection;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author duanruiming
+ * @date 2023/02/07 8:37
+ */
+@Data
+@ApiModel(value = "设备故障统计实体")
+public class DeviceFaultCountVO {
+    @ApiModelProperty(value = "已处理")
+    private int dealCount;
+    @ApiModelProperty(value = "未处理")
+    private int faultCount;
+    @ApiModelProperty(value = "全部")
+    private int allCount;
+}