Merge remote-tracking branch 'origin/master'

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

@@ -151,6 +151,19 @@ public class SituationDetectionController extends BaseController {
     @GetMapping(value = "crossDeviceStatusInfo", produces = MediaType.APPLICATION_JSON)
     public JsonViewObject crossDeviceStatusInfo() {
         List<CrossDeviceStatusInfoResultVO> list = situationDetectionService.crossDeviceStatusInfo();
+        // 数据库 status 0离线；1在线 faultType 0正常
+        // 适配前端 status 1在线；2离线；3故障
+        for (CrossDeviceStatusInfoResultVO item : list) {
+            int fualType = item.getFaultType();
+            int status = item.getStatus();
+            if (status == 0) {
+                status = 2;
+            }
+            if (fualType != 0) {
+                status = 3;
+            }
+            item.setStatus(status);
+        }
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         return jsonViewObject.success(list);
     }

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

@@ -20,6 +20,9 @@ public class CrossDeviceStatusInfoResultVO {
     @ApiModelProperty(value = "经纬度")
     private String location;
 
-    @ApiModelProperty(value = "设备状态：0离线；1在线；2故障")
+    @ApiModelProperty(value = "设备状态：1在线；2离线；3故障")
     private int status;
+
+    @ApiModelProperty(value = "故障状态：0正常")
+    private int faultType;
 }

signal-control-service/src/main/resources/mapper/CrossInfoMapper.xml

@@ -62,8 +62,15 @@
         where ID = #{id}
     </select>
 
-    <select id="listCrossDeviceStatusInfo"  resultType="Map">
-        select c.id crossId, c.name crossName, c.location, d.status from t_base_cross_info c
+    <resultMap id="listCrossDeviceStatusInfoMap" type="net.wanji.web.vo.situationDetection.CrossDeviceStatusInfoResultVO">
+        <result property="crossId" column="id"/>
+        <result property="crossName" column="name"/>
+        <result property="location" column="location"/>
+        <result property="status" column="status"/>
+        <result property="faultType" column="fault_type"/>
+    </resultMap>
+    <select id="listCrossDeviceStatusInfo"  resultMap="listCrossDeviceStatusInfoMap">
+        select c.id, c.name, c.location, d.status, d.fault_type from t_base_cross_info c
         left join t_device_status d on c.id = d.code
         where c.is_signal = 1 and d.type = 1
     </select>