新增路口设备状态信息查询

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

@@ -145,4 +145,13 @@ public class SituationDetectionController extends BaseController{
 
         return jsonViewObject.success(greenwaveCrossOutVOList);
     }
+
+    @ApiOperation(value = "路口设备状态信息", notes = "路口设备状态信息", response = JsonViewObject.class,
+    produces = MediaType.APPLICATION_JSON)
+    @GetMapping(value = "crossDeviceStatusInfo", produces = MediaType.APPLICATION_JSON)
+    public JsonViewObject crossDeviceStatusInfo() {
+        List<CrossDeviceStatusInfoResultVO> list = situationDetectionService.crossDeviceStatusInfo();
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        return jsonViewObject.success(list);
+    }
 }

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

 package net.wanji.web.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import net.wanji.web.po.CrossInfo;
+import net.wanji.web.vo.situationDetection.CrossDeviceStatusInfoResultVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 * @Description: [路口信息持久层实现]</p>
 * @author wanji
@@ -12,7 +14,7 @@ import org.springframework.stereotype.Repository;
 * Created on 2019年05月06日
 */
 @Repository
-@DS("webService")
+//@DS("webService")
 public interface CrossInfoMapper {
 
     /**
@@ -34,4 +36,6 @@ public interface CrossInfoMapper {
     void listCrossInfo(@Param("crossName") String crossName);
 
     CrossInfo selectById(String crossId);
+
+    List<CrossDeviceStatusInfoResultVO> listCrossDeviceStatusInfo();
 }
\ No newline at end of file

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

@@ -30,4 +30,6 @@ public interface SituationDetectionService {
     Map<String, Map<String, Integer>> allDeviceStatus(String adCode);
 
     List<GreenwaveCrossOutVO> greenwaveCross(String adCode, String currentTime, Integer id);
+
+    List<CrossDeviceStatusInfoResultVO> crossDeviceStatusInfo();
 }

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

@@ -381,6 +381,12 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
 
         return greenwaveCrossOutVOList;
     }
+
+    @Override
+    public List<CrossDeviceStatusInfoResultVO> crossDeviceStatusInfo() {
+        List<CrossDeviceStatusInfoResultVO> results = crossInfoMapper.listCrossDeviceStatusInfo();
+        return results;
+    }
 }
 
 class CrossAlarmComparator implements Comparator<CrossAlarmOutVO> {
@@ -398,4 +404,6 @@ class CrossAlarmComparator implements Comparator<CrossAlarmOutVO> {
         }
         return flag;
     }
+
+
 }

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

+package net.wanji.web.vo.situationDetection;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author duanruiming
+ * @date 2022/12/29 12:58
+ */
+@Data
+@ApiModel(value = "CrossDeviceStatusInfoResultVO", description = "查询路口设备状态返回参数")
+public class CrossDeviceStatusInfoResultVO {
+    @ApiModelProperty(value = "路口编号")
+    private String crossId;
+
+    @ApiModelProperty(value = "路口名称")
+    private String crossName;
+
+    @ApiModelProperty(value = "经纬度")
+    private String location;
+
+    @ApiModelProperty(value = "设备状态：0离线；1在线；2故障")
+    private int status;
+}

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

@@ -62,4 +62,10 @@
         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
+        left join t_device_status_log d on c.id = d.code
+        where c.is_signal = 1 and d.type = 1
+    </select>
+
 </mapper>