[update] 统一信控，解决Mapper类冲突

signal-control-service/src/main/java/net/wanji/web/mapper/GreenwaveRealtimeMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/GreenwaveRealtimeMapperOld.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2022/10/27 14:25
  */
 @Repository
-public interface GreenwaveRealtimeMapper {
+public interface GreenwaveRealtimeMapperOld {
 
     List<GreenwaveRealtimePO> selectByAdCodeAndCurrentTime(@Param("adCode") String adCode,
                                                            @Param("todayDate") Date todayDate);

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

@@ -37,7 +37,7 @@ import net.wanji.web.mapper.AllDeviceStatusMapper;
 import net.wanji.web.mapper.ControlHistMapper;
 import net.wanji.web.mapper.CrossAlarmMapper;
 import net.wanji.web.mapper.EventAlarmMapper;
-import net.wanji.web.mapper.GreenwaveRealtimeMapper;
+import net.wanji.web.mapper.GreenwaveRealtimeMapperOld;
 import net.wanji.web.mapper.OptRecordsMapper;
 import net.wanji.web.mapper.TBaseAreaCrossMapper;
 import net.wanji.web.mapper.TBaseAreaInfoMapper;
@@ -101,7 +101,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     private final ControlHistMapper controlHistMapper;
     private final VehicleTraceMapper vehicleTraceMapper;
     private final VideoDeviceInfoMapper videoDeviceInfoMapper;
-    private final GreenwaveRealtimeMapper greenwaveRealtimeMapper;
+    private final GreenwaveRealtimeMapperOld greenwaveRealtimeMapperOld;
     private final AllDeviceStatusMapper allDeviceStatusMapper;
     private final GreenwaveCrossMapper greenwaveCrossMapper;
     private final BaseCrossInfoMapper tBaseBaseCrossInfoMapper;
@@ -384,7 +384,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     @Override
     public List<GreenwaveRealtimeOutVO> greenwaveRealtime(String adCode, String currentTime) throws ParseException {
         Date todayDate = sdf.parse(currentTime);
-        List<GreenwaveRealtimePO> greenwaveRealtimePOList = greenwaveRealtimeMapper.selectByAdCodeAndCurrentTime(adCode, todayDate);
+        List<GreenwaveRealtimePO> greenwaveRealtimePOList = greenwaveRealtimeMapperOld.selectByAdCodeAndCurrentTime(adCode, todayDate);
         List<GreenwaveRealtimeOutVO> greenwaveRealtimeOutVOList = new ArrayList<>();
         for (GreenwaveRealtimePO greenwaveRealtimePO : greenwaveRealtimePOList) {
             GreenwaveRealtimeOutVO greenwaveRealtimeOutVO = new GreenwaveRealtimeOutVO();

signal-control-service/src/main/resources/mapper/GreenwaveRealtimeMapper.xml → signal-control-service/src/main/resources/mapper/GreenwaveRealtimeMapperOld.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.wanji.web.mapper.GreenwaveRealtimeMapper">
+<mapper namespace="net.wanji.web.mapper.GreenwaveRealtimeMapperOld">
 
     <!-- 通用查询映射结果 -->
     <resultMap type="net.wanji.web.po.GreenwaveRealtimePO" id="BaseResultMap">