[update] 设备厂家实体优化

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

@@ -669,7 +669,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
                         String location = tBaseCrossInfo.getLocation().replace("POINT", "").replace("(", "").replace(")", "").replace(" ", ",");
                         signalOperationModeVO.setLocation(location);
                         signalOperationModeVO.setCrossName(tBaseCrossInfo.getName());
-                        signalOperationModeVO.setOperationTime(DateUtils.dateToString(signalOperationModeVO.getStartTime(),DateStyle.YYYY_MM_DD_HH_MM_SS));
+                        signalOperationModeVO.setOperationTime(DateUtils.dateToString(signalOperationModeVO.getStartTime(), DateStyle.YYYY_MM_DD_HH_MM_SS));
                     }
                 }
             }
@@ -742,9 +742,9 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
             SignalManufacturerCountInfoVO signalManufacturerCountInfoVO = new SignalManufacturerCountInfoVO();
             String nickName = entry.getKey();
             List<String> crossIdList = entry.getValue();
-            int onlineCount = 0;
-            int offlineCount = 0;
-            int faultCount = 0;
+            Integer onlineCount = 0;
+            Integer offlineCount = 0;
+            Integer faultCount = 0;
             signalManufacturerCountInfoVO.setName(nickName);
             for (TDeviceStatusInfo tDeviceStatusInfo : tDeviceStatusInfos) {
                 String crossId = tDeviceStatusInfo.getCode();

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

@@ -14,10 +14,10 @@ public class SignalManufacturerCountInfoVO {
     @ApiModelProperty( value = "厂商名称")
     private String name;
     @ApiModelProperty(value = "在线数量")
-    private int onlineCount;
+    private Integer onlineCount;
     @ApiModelProperty(value = "离线数量")
-    private int offlineCount;
+    private Integer offlineCount;
     @ApiModelProperty(value = "故障数量")
-    private int faultCount;
+    private Integer faultCount;
 
 }