[update] opt模块DAO层迁移至databus模块

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

 package net.wanji.web.mapper.scheme;
 
-import net.wanji.common.po.CrossDirDataRealtimePO;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -18,7 +18,6 @@ import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
 import net.wanji.web.mapper.scheme.CrossTurnDataHistMapper;
 import net.wanji.web.mapper.scheme.LaneInfoMapper;
 import net.wanji.web.mapper.scheme.LaneSegmentMapper;
-import net.wanji.common.po.CrossDirDataRealtimePO;
 import net.wanji.web.po.scheme.CrossDirInfoPO;
 import net.wanji.web.po.scheme.CrossLaneLightsPO;
 import net.wanji.web.po.scheme.CrossLightsPO;

signal-datacenter-service/src/main/java/net/wanji/datacenter/pojo/convert/LanePeriodicDataEventListConvert.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Component
 public class LanePeriodicDataEventListConvert {
     
-    public CrossDataRealTimePO convert2CrossDataRealTimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
+    public CrossDataRealtimePO convert2CrossDataRealTimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
         String id = laneInfoPO.getId();
         String crossId = laneInfoPO.getCrossId();
         // todo 路口状态
@@ -29,7 +29,7 @@ public class LanePeriodicDataEventListConvert {
         int batchTime = (int)now.getTime();
         String dir = String.valueOf(laneInfoPO.getDir());
 
-        CrossDataRealTimePO crossDataRealTimePO = new CrossDataRealTimePO();
+        CrossDataRealtimePO crossDataRealTimePO = new CrossDataRealtimePO();
         crossDataRealTimePO.setCrossId(crossId);
         crossDataRealTimePO.setStatus(0000); // 路口状态
         crossDataRealTimePO.setType(1); // 1常规 2异常
@@ -60,7 +60,7 @@ public class LanePeriodicDataEventListConvert {
         return crossDataRealTimePO;
     }
 
-    public CrossDirDataRealTimePO convert2CrossDirDataRealTimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
+    public CrossDirDataRealtimePO convert2CrossDirDataRealTimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
         String crossId = laneInfoPO.getCrossId();
         // todo 路口状态
         int trafficFlow = eventList.getTrafficFlow();
@@ -75,7 +75,7 @@ public class LanePeriodicDataEventListConvert {
         Integer dir = laneInfoPO.getDir();
         Integer type = laneInfoPO.getType();
 
-        CrossDirDataRealTimePO crossDirDataRealTimePO = new CrossDirDataRealTimePO();
+        CrossDirDataRealtimePO crossDirDataRealTimePO = new CrossDirDataRealtimePO();
         // 路口方向ID（路口ID_方向_进出口_主辅路序号）
         crossDirDataRealTimePO.setId(String.valueOf(dir).concat(String.valueOf(type)));
         crossDirDataRealTimePO.setDirType(dir);
@@ -100,7 +100,7 @@ public class LanePeriodicDataEventListConvert {
         return crossDirDataRealTimePO;
     }
 
-    public CrossTurnDataRealTimePO convert2CrossTurnDataRealtimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
+    public CrossTurnDataRealtimePO convert2CrossTurnDataRealtimePO(LanePeriodicDataDTO.EventList eventList, CrossBaseLaneInfoPO laneInfoPO) {
         String crossId = laneInfoPO.getCrossId();
         // todo 路口状态
         int trafficFlow = eventList.getTrafficFlow();
@@ -116,7 +116,7 @@ public class LanePeriodicDataEventListConvert {
         Integer type = laneInfoPO.getType();
         Integer turn = laneInfoPO.getTurn();
 
-        CrossTurnDataRealTimePO crossTurnDataRealtimePO = new CrossTurnDataRealTimePO();
+        CrossTurnDataRealtimePO crossTurnDataRealtimePO = new CrossTurnDataRealtimePO();
         crossTurnDataRealtimePO.setId( crossId.concat("").concat(String.valueOf(turn)));
         crossTurnDataRealtimePO.setTurnType("");
         crossTurnDataRealtimePO.setInDir(0000);

signal-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/LanePeriodicDataProcessServiceImpl.java

@@ -31,10 +31,10 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
 
     private final ConsumerHandler consumerHandler;
     private final CrossBaseLaneInfoMapper crossBaseLaneInfoMapper;
-    private final CrossDirDataRealTimeMapper crossDirDataRealTimeMapper;
-    private final CrossTurnDataRealTimeMapper crossTurnDataRealTimeMapper;
+    private final CrossDirDataRealtimeMapper crossDirDataRealTimeMapper;
+    private final CrossTurnDataRealtimeMapper crossTurnDataRealTimeMapper;
     private final CrossLaneDataRealTimeMapper crossLaneDataRealTimeMapper;
-    private final CrossDataRealTimeMapper crossDataRealTimeMapper;
+    private final CrossDataRealtimeMapper crossDataRealTimeMapper;
     private final CrossLaneDataHistMapper crossLaneDataHistMapper;
     private final CrossTurnDataHistMapper crossTurnDataHistMapper;
     private final CrossDirDataHistMapper crossDirDataHistMapper;
@@ -69,9 +69,9 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
         LanePeriodicDataDTO lanePeriodicDataDTO = (LanePeriodicDataDTO) convertData;
 
         int laneNum = lanePeriodicDataDTO.getLaneNum();
-        List<CrossDataRealTimePO> crossDataRealTimePOS = new ArrayList<>(laneNum);
-        List<CrossDirDataRealTimePO> crossDirDataRealTimePOS = new ArrayList<>(laneNum);
-        List<CrossTurnDataRealTimePO> crossTurnDataRealTimePOS = new ArrayList<>(laneNum);
+        List<CrossDataRealtimePO> crossDataRealtimePOS = new ArrayList<>(laneNum);
+        List<CrossDirDataRealtimePO> crossDirDataRealtimePOS = new ArrayList<>(laneNum);
+        List<CrossTurnDataRealtimePO> crossTurnDataRealtimePOS = new ArrayList<>(laneNum);
         List<CrossLaneDataRealTimePO> crossLaneDataRealTimePOS = new ArrayList<>(laneNum);
 
         List<LanePeriodicDataDTO.EventList> eventLists = lanePeriodicDataDTO.getEventList();
@@ -91,36 +91,36 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
                 String id = laneInfoPO.getId();
                 if (StringUtils.endsWithIgnoreCase(laneId, id)) {
 
-                    crossDataRealTimePOS.add(lanePeriodicDataEventListConvert.convert2CrossDataRealTimePO(laneRealTimeItem, laneInfoPO));
+                    crossDataRealtimePOS.add(lanePeriodicDataEventListConvert.convert2CrossDataRealTimePO(laneRealTimeItem, laneInfoPO));
 
-                    crossDirDataRealTimePOS.add(lanePeriodicDataEventListConvert.convert2CrossDirDataRealTimePO(laneRealTimeItem, laneInfoPO));
+                    crossDirDataRealtimePOS.add(lanePeriodicDataEventListConvert.convert2CrossDirDataRealTimePO(laneRealTimeItem, laneInfoPO));
 
-                    crossTurnDataRealTimePOS.add(lanePeriodicDataEventListConvert.convert2CrossTurnDataRealtimePO(laneRealTimeItem, laneInfoPO));
+                    crossTurnDataRealtimePOS.add(lanePeriodicDataEventListConvert.convert2CrossTurnDataRealtimePO(laneRealTimeItem, laneInfoPO));
 
                     crossLaneDataRealTimePOS.add(lanePeriodicDataEventListConvert.convert2CrossLaneDataRealTimePO(laneRealTimeItem, laneInfoPO));
                 }
             }
         }
         // 删除操作 实时数据表只能有一条实时数据
-        Set<String> crossDataRealTimeSet = crossDataRealTimePOS.stream().map(CrossDataRealTimePO::getCrossId).collect(Collectors.toSet());
+        Set<String> crossDataRealTimeSet = crossDataRealtimePOS.stream().map(CrossDataRealtimePO::getCrossId).collect(Collectors.toSet());
         crossDataRealTimeMapper.deleteBatch(crossDataRealTimeSet);
 
-        Set<String> crossDirDataRealTimeSet = crossDirDataRealTimePOS.stream().map(CrossDirDataRealTimePO::getCrossId).collect(Collectors.toSet());
+        Set<String> crossDirDataRealTimeSet = crossDirDataRealtimePOS.stream().map(CrossDirDataRealtimePO::getCrossId).collect(Collectors.toSet());
         crossDirDataRealTimeMapper.deleteBatch(crossDirDataRealTimeSet);
 
-        Set<String> crossTurnDataRealTimeSet = crossTurnDataRealTimePOS.stream().map(CrossTurnDataRealTimePO::getCrossId).collect(Collectors.toSet());
+        Set<String> crossTurnDataRealTimeSet = crossTurnDataRealtimePOS.stream().map(CrossTurnDataRealtimePO::getCrossId).collect(Collectors.toSet());
         crossTurnDataRealTimeMapper.deleteBatch(crossTurnDataRealTimeSet);
 
         Set<String> crossLaneDataRealTimeSet = crossLaneDataRealTimePOS.stream().map(CrossLaneDataRealTimePO::getCrossId).collect(Collectors.toSet());
         crossLaneDataRealTimeMapper.deleteBatch(crossLaneDataRealTimeSet);
 
         // 将车道转换的数据通过路口，方向，转向维度计算，存储
-        List<CrossDataRealTimePO> insertCrossDataRealTimePOS = new ArrayList<>();
-        Map<String, List<CrossDataRealTimePO>> crossDataRealTimePOSMap = crossDataRealTimePOS.stream().collect(Collectors.groupingBy(CrossDataRealTimePO::getCrossId));
-        for (Map.Entry<String, List<CrossDataRealTimePO>> entry : crossDataRealTimePOSMap.entrySet()) {
+        List<CrossDataRealtimePO> insertCrossDataRealtimePOS = new ArrayList<>();
+        Map<String, List<CrossDataRealtimePO>> crossDataRealTimePOSMap = crossDataRealtimePOS.stream().collect(Collectors.groupingBy(CrossDataRealtimePO::getCrossId));
+        for (Map.Entry<String, List<CrossDataRealtimePO>> entry : crossDataRealTimePOSMap.entrySet()) {
             String crossId = entry.getKey();
-            List<CrossDataRealTimePO> value = entry.getValue();
-            CrossDataRealTimePO insertCrossDataRealTimePO = new CrossDataRealTimePO();
+            List<CrossDataRealtimePO> value = entry.getValue();
+            CrossDataRealtimePO insertCrossDataRealtimePO = new CrossDataRealtimePO();
             Integer status = 0;
             Double trafficIndex = 0.0;
             Integer flow = 0;
@@ -129,7 +129,7 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
             Double queueLength = 0.0;
             Integer stopTimes = 0;
             Integer delayTime = 0;
-            for (CrossDataRealTimePO crossDataRealTimePO : value) {
+            for (CrossDataRealtimePO crossDataRealTimePO : value) {
                 // 每个路口计算交通流量累加，筛选最大停车长度
                 flow += crossDataRealTimePO.getFlow();
                 flowRate += crossDataRealTimePO.getFlowRate();
@@ -137,29 +137,29 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
                 queueLength = queueLength >= crossDataRealTimePO.getQueueLength() ? queueLength : crossDataRealTimePO.getQueueLength();
                 stopTimes += crossDataRealTimePO.getStopTimes();
                 delayTime += crossDataRealTimePO.getDelayTime();
-                BeanUtils.copyProperties(crossDataRealTimePO, insertCrossDataRealTimePO);
+                BeanUtils.copyProperties(crossDataRealTimePO, insertCrossDataRealtimePO);
             }
-            insertCrossDataRealTimePO.setStatus(status);
-            insertCrossDataRealTimePO.setTrafficIndex(trafficIndex);
-            insertCrossDataRealTimePO.setFlow(flow);
-            insertCrossDataRealTimePO.setFlowRate(flowRate / value.size());
-            insertCrossDataRealTimePO.setSpeed(speed / value.size());
-            insertCrossDataRealTimePO.setQueueLength(queueLength);
-            insertCrossDataRealTimePO.setStopTimes(stopTimes / value.size());
-            insertCrossDataRealTimePO.setDelayTime(delayTime / value.size());
-            insertCrossDataRealTimePOS.add(insertCrossDataRealTimePO);
+            insertCrossDataRealtimePO.setStatus(status);
+            insertCrossDataRealtimePO.setTrafficIndex(trafficIndex);
+            insertCrossDataRealtimePO.setFlow(flow);
+            insertCrossDataRealtimePO.setFlowRate(flowRate / value.size());
+            insertCrossDataRealtimePO.setSpeed(speed / value.size());
+            insertCrossDataRealtimePO.setQueueLength(queueLength);
+            insertCrossDataRealtimePO.setStopTimes(stopTimes / value.size());
+            insertCrossDataRealtimePO.setDelayTime(delayTime / value.size());
+            insertCrossDataRealtimePOS.add(insertCrossDataRealtimePO);
         }
-//        crossDataRealTimeMapper.insertBatch(insertCrossDataRealTimePOS);
+//        crossDataRealTimeMapper.insertBatch(insertCrossDataRealtimePOS);
 
         // 方向数据
-        List<CrossDirDataRealTimePO> insertCrossDirDataRealTimePOS = new ArrayList<>();
-        Map<String, List<CrossDirDataRealTimePO>> crossDirDataRealTimePOSMap = crossDirDataRealTimePOS.stream().collect(Collectors.groupingBy(CrossDirDataRealTimePO::getCrossId));
-        for (Map.Entry<String, List<CrossDirDataRealTimePO>> entry : crossDirDataRealTimePOSMap.entrySet()) {
+        List<CrossDirDataRealtimePO> insertCrossDirDataRealtimePOS = new ArrayList<>();
+        Map<String, List<CrossDirDataRealtimePO>> crossDirDataRealTimePOSMap = crossDirDataRealtimePOS.stream().collect(Collectors.groupingBy(CrossDirDataRealtimePO::getCrossId));
+        for (Map.Entry<String, List<CrossDirDataRealtimePO>> entry : crossDirDataRealTimePOSMap.entrySet()) {
             String key = entry.getKey();
-            List<CrossDirDataRealTimePO> value = entry.getValue();
-            Map<Integer, List<CrossDirDataRealTimePO>> crossIdMap = value.stream().collect(Collectors.groupingBy(CrossDirDataRealTimePO::getDirType));
+            List<CrossDirDataRealtimePO> value = entry.getValue();
+            Map<Integer, List<CrossDirDataRealtimePO>> crossIdMap = value.stream().collect(Collectors.groupingBy(CrossDirDataRealtimePO::getDirType));
 
-            CrossDirDataRealTimePO crossDirDataRealTimePO = new CrossDirDataRealTimePO();
+            CrossDirDataRealtimePO crossDirDataRealTimePO = new CrossDirDataRealtimePO();
             Integer status = 0;
             Double trafficIndex = 0.0;
             Integer flow = 0;
@@ -168,31 +168,31 @@ public class LanePeriodicDataProcessServiceImpl implements DataProcessService {
             Double queueLength = 0.0;
             Integer stopTimes = 0;
             Integer delayTime = 0;
-            for (Map.Entry<Integer, List<CrossDirDataRealTimePO>> dirEntry : crossIdMap.entrySet()) {
+            for (Map.Entry<Integer, List<CrossDirDataRealtimePO>> dirEntry : crossIdMap.entrySet()) {
                 Integer dir = dirEntry.getKey();
-                List<CrossDirDataRealTimePO> dirMap = dirEntry.getValue();
+                List<CrossDirDataRealtimePO> dirMap = dirEntry.getValue();
                 // 每个方向计算交通流量累加，筛选最大停车长度
             }
-            insertCrossDirDataRealTimePOS.add(crossDirDataRealTimePO);
+            insertCrossDirDataRealtimePOS.add(crossDirDataRealTimePO);
         }
-//        crossDirDataRealTimeMapper.insertBatch(insertCrossDirDataRealTimePOS);
+//        crossDirDataRealTimeMapper.insertBatch(insertCrossDirDataRealtimePOS);
 
         // 转向数据
-        ArrayList<CrossTurnDataRealTimePO> insertCrossTurnDataRealTimePOS = new ArrayList<>();
-        Map<String, List<CrossTurnDataRealTimePO>> crossTurnDataRealTimePOSMap = crossTurnDataRealTimePOS.stream().collect(Collectors.groupingBy(CrossTurnDataRealTimePO::getCrossId));
-        for (Map.Entry<String, List<CrossTurnDataRealTimePO>> entry : crossTurnDataRealTimePOSMap.entrySet()) {
+        ArrayList<CrossTurnDataRealtimePO> insertCrossTurnDataRealtimePOS = new ArrayList<>();
+        Map<String, List<CrossTurnDataRealtimePO>> crossTurnDataRealTimePOSMap = crossTurnDataRealtimePOS.stream().collect(Collectors.groupingBy(CrossTurnDataRealtimePO::getCrossId));
+        for (Map.Entry<String, List<CrossTurnDataRealtimePO>> entry : crossTurnDataRealTimePOSMap.entrySet()) {
             String key = entry.getKey();
-            List<CrossTurnDataRealTimePO> value = entry.getValue();
+            List<CrossTurnDataRealtimePO> value = entry.getValue();
 
-            CrossTurnDataRealTimePO crossTurnDataRealTimePO = new CrossTurnDataRealTimePO();
-            Map<String, List<CrossTurnDataRealTimePO>> crossIdMap = value.stream().collect(Collectors.groupingBy(CrossTurnDataRealTimePO::getTurnType));
-            for (Map.Entry<String, List<CrossTurnDataRealTimePO>> item : crossIdMap.entrySet()) {
+            CrossTurnDataRealtimePO crossTurnDataRealTimePO = new CrossTurnDataRealtimePO();
+            Map<String, List<CrossTurnDataRealtimePO>> crossIdMap = value.stream().collect(Collectors.groupingBy(CrossTurnDataRealtimePO::getTurnType));
+            for (Map.Entry<String, List<CrossTurnDataRealtimePO>> item : crossIdMap.entrySet()) {
                 String turn = item.getKey();
-                List<CrossTurnDataRealTimePO> turnMap = item.getValue();
+                List<CrossTurnDataRealtimePO> turnMap = item.getValue();
             }
-            insertCrossTurnDataRealTimePOS.add(crossTurnDataRealTimePO);
+            insertCrossTurnDataRealtimePOS.add(crossTurnDataRealTimePO);
         }
-//        crossTurnDataRealTimeMapper.insertBatch(insertCrossTurnDataRealTimePOS);
+//        crossTurnDataRealTimeMapper.insertBatch(insertCrossTurnDataRealtimePOS);
 
         // 车道数据
 //        crossLaneDataRealTimeMapper.insertBatch(crossLaneDataRealTimePOS);

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/CrossDataHistMapper.java

-package net.wanji.opt.dao.mapper;
-
-import net.wanji.opt.po.CrossDataHistPO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author hanbing
- * @date 2023/1/12 13:24
- * @desc CrossInfoMapper
- */
-@Repository
-public interface CrossDataHistMapper {
-
-    List<CrossDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds);
-}

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/CrossDirDataRealtimeMapper.java

-package net.wanji.opt.dao.mapper;
-
-import net.wanji.common.po.CrossDirDataRealtimePO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author Kent HAN
- * @date 2023/1/11 17:25
- */
-@Repository
-public interface CrossDirDataRealtimeMapper {
-
-    CrossDirDataRealtimePO selectByCrossIdAndDirType(String crossId, Integer key);
-
-    List<CrossDirDataRealtimePO> selectByCrossIdAndInOutType(String crossId, Integer inOutType);
-}

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/trend/CrossDataRealtimeMapper.java

-package net.wanji.opt.dao.mapper.trend;
-
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
-import net.wanji.opt.vo.AbnormalCrossListVO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 态势监测-问题路口基础信息
- *
- * @author Kent HAN
- * @date 2023/2/8 9:22
- */
-@Repository
-public interface CrossDataRealtimeMapper {
-    List<AbnormalCrossListVO> selectAbnormalCross(Integer status, String name, Integer type);
-
-    CrossDataRealtimePO selectByCrossId(String crossId);
-}

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/trend/CrossDirDataHistMapper.java

-package net.wanji.opt.dao.mapper.trend;
-
-import net.wanji.opt.bo.CrossDirDataHistAvgBO;
-import net.wanji.opt.po.trend.CrossDirDataHistPO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 路口方向历史数据
- *
- * @author Kent HAN
- * @date 2023/2/8 9:22
- */
-@Repository
-public interface CrossDirDataHistMapper {
-
-    List<CrossDirDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds);
-
-    List<CrossDirDataHistPO> selectByCrossIdDirAndTimestamp(String crossId, Integer dir, long preSeconds);
-
-    List<CrossDirDataHistAvgBO> selectByCrossIdInOutTimestamp(String crossId, Integer inOutType, long preSeconds);
-}

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/trend/CrossTurnDataRealtimeMapper.java

-package net.wanji.opt.dao.mapper.trend;
-
-import net.wanji.opt.po.trend.CrossTurnDataRealtimePO;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 路口转向实时数据
- *
- * @author Kent HAN
- * @date 2023/2/8 9:22
- */
-@Repository
-public interface CrossTurnDataRealtimeMapper {
-
-    List<CrossTurnDataRealtimePO> selectByCrossId(String crossId);
-}

signal-optimize-service/src/main/java/net/wanji/opt/dto/CrossDataRealtimeDTO.java

@@ -3,6 +3,8 @@ package net.wanji.opt.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import net.wanji.databus.dto.CrossDirInfoDTO;
+import net.wanji.databus.dto.CrossTurnInfoDTO;
 
 import java.util.List;
 

signal-optimize-service/src/main/java/net/wanji/opt/po/CrossDataHistPO.java

-package net.wanji.opt.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author hanbing
- * @date 2023/1/10 16:36
- */
-@Data
-public class CrossDataHistPO {
-    /** 路口编号 */
-    @ApiModelProperty(name = "路口编号",notes = "")
-    private String crossId ;
-    /** 路口状态：0正常；1失衡；2拥堵；3溢出；4死锁 */
-    @ApiModelProperty(name = "路口状态：0正常；1失衡；2拥堵；3溢出；4死锁",notes = "")
-    private Integer status ;
-    /** 拥堵类型：1常规；2异常 */
-    @ApiModelProperty(name = "拥堵类型：1常规；2异常",notes = "")
-    private Integer type ;
-    /** 交通指数（1~10） */
-    @ApiModelProperty(name = "交通指数（1~10）",notes = "")
-    private Double trafficIndex ;
-    /** 开始时间：yyyy-MM-dd HH;mm:ss */
-    @ApiModelProperty(name = "开始时间：yyyy-MM-dd HH",notes = "mm:ss")
-    private Date startTime ;
-    /** 持续时间（单位：分钟） */
-    @ApiModelProperty(name = "持续时间（单位：分钟）",notes = "")
-    private Integer duration ;
-    /** 是否失衡：0否；1是 */
-    @ApiModelProperty(name = "是否失衡：0否；1是",notes = "")
-    private Integer isUnbalance ;
-    /** 是否溢出：0否；1是 */
-    @ApiModelProperty(name = "是否溢出：0否；1是",notes = "")
-    private Integer isSpillover ;
-    /** 是否拥堵：0否；1是 */
-    @ApiModelProperty(name = "是否拥堵：0否；1是",notes = "")
-    private Integer isCongestion ;
-    /** 失衡指数 */
-    @ApiModelProperty(name = "失衡指数",notes = "")
-    private Double unbalanceIndex ;
-    /** 溢出指数 */
-    @ApiModelProperty(name = "溢出指数",notes = "")
-    private Double spilloverIndex ;
-    /** 拥堵指数 */
-    @ApiModelProperty(name = "拥堵指数",notes = "")
-    private Double congestionIndex ;
-    /** 路口失衡方向：1，2，3... */
-    @ApiModelProperty(name = "路口失衡方向：1，2，3...",notes = "")
-    private String unbalanceDirs ;
-    /** 路口溢出方向：1，2，3... */
-    @ApiModelProperty(name = "路口溢出方向：1，2，3...",notes = "")
-    private String spilloverDirs ;
-    /** 路口拥堵方向：1，2，3... */
-    @ApiModelProperty(name = "路口拥堵方向：1，2，3...",notes = "")
-    private String congestionDirs ;
-    /** 交通流量（辆） */
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow ;
-    /** 交通流率/h */
-    @ApiModelProperty(name = "交通流率/h",notes = "")
-    private Double flowRate ;
-    /** 平均速度（km/h） */
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed ;
-    /** 最大排队（米） */
-    @ApiModelProperty(name = "最大排队（米）",notes = "")
-    private Double queueLength ;
-    /** 停车次数（次） */
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 饱和度 */
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation ;
-    /** 采集时间（10位时间戳） */
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    private Integer batchTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-
-}

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDirDataHistPO.java

-package net.wanji.opt.po.trend;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author hfx
- * @date 2023/1/10 16:36
- */
-@Data
-public class CrossDirDataHistPO {
-    /** 路口方向ID（路口ID_方向_进出口_主辅路序号） */
-    @ApiModelProperty(name = "路口方向ID（路口ID_方向_进出口_主辅路序号）",notes = "")
-    private String id ;
-    /** 路口方向类型：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "路口方向类型：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer dirType ;
-    /** 进出口类型：1进口；2出口 */
-    @ApiModelProperty(name = "进出口类型：1进口；2出口",notes = "")
-    private Integer inOutType ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 路段长度 */
-    @ApiModelProperty(name = "路段长度",notes = "")
-    private Double length ;
-    /** 交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知 */
-    @ApiModelProperty(name = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知",notes = "")
-    private Integer status ;
-    /** 交通指数 */
-    @ApiModelProperty(name = "交通指数",notes = "")
-    private Double trafficIndex ;
-    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
-    private Date startTime ;
-    @ApiModelProperty(value = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",notes = "")
-    private Integer capacity ;
-    @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
-    private Integer duration ;
-    /** 交通流量（辆） */
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow ;
-    /** 平均速度（km/h） */
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed ;
-    /** 排队长度（米） */
-    @ApiModelProperty(name = "排队长度（米）",notes = "")
-    private Double queueLength ;
-    /** 停车次数（次） */
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 饱和度 */
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation ;
-    /** 采集时间（10位时间戳） */
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    private Integer batchTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-    @ApiModelProperty(name = "溢流时长，计算溢流率提供；溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
-    private Double effusionTime ;
-}

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossTurnDataRealtimePO.java

-package net.wanji.opt.po.trend;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author hfx
- * @date 2023/1/10 16:36
- */
-@Data
-public class CrossTurnDataRealtimePO {
-    /** 转向ID（路口ID_驶入方向_转向类型） */
-    @ApiModelProperty(name = "转向ID（路口ID_驶入方向_转向类型）",notes = "")
-    private String id ;
-    /** 转向类型：u掉头；l左转；s直行；r右转； */
-    @ApiModelProperty(name = "转向类型：u掉头；l左转；s直行；r右转；",notes = "")
-    private String turnType ;
-    /** 驶入方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "驶入方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer inDir ;
-    /** 驶出方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "驶出方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer outDir ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 交通流量（辆） */
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow ;
-    /** 平均速度（km/h） */
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed ;
-    /** 驶入速度（km/h） */
-    @ApiModelProperty(name = "驶入速度（km/h）",notes = "")
-    private Double inSpeed ;
-    /** 驶出速度（km/h） */
-    @ApiModelProperty(name = "驶出速度（km/h）",notes = "")
-    private Double outSpeed ;
-    /** 排队长度（米） */
-    @ApiModelProperty(name = "排队长度（米）",notes = "")
-    private Double queueLength ;
-    /** 停车次数（次） */
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 饱和度 */
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation ;
-    /** 车头间距（米） */
-    @ApiModelProperty(name = "车头间距（米）",notes = "")
-    private Double vehheadDist ;
-    /** 车头时距（秒） */
-    @ApiModelProperty(name = "车头时距（秒）",notes = "")
-    private Double vehheadTime ;
-    /** 可信度：0~1 */
-    @ApiModelProperty(name = "可信度：0~1",notes = "")
-    private Double quality ;
-    /** 采集时间（10位时间戳） */
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    private Integer batchTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-optimize-service/src/main/java/net/wanji/opt/service/CrossOptimizeService.java

 package net.wanji.opt.service;
 
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
+import net.wanji.databus.po.CrossDataRealtimePO;
 
 import java.util.List;
 

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossOptimizeServiceImpl.java

@@ -5,7 +5,10 @@ import net.wanji.common.enums.CrossStatusEnum;
 import net.wanji.common.framework.Constants;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.RidInfoEntity;
+import net.wanji.databus.dto.CrossDirInfoDTO;
+import net.wanji.databus.dto.CrossTurnInfoDTO;
 import net.wanji.databus.entity.develop.servicedevelop.develop.StatusCodeEnum;
+import net.wanji.databus.po.CrossDataRealtimePO;
 import net.wanji.feign.pojo.vo.SchemeSendVO;
 import net.wanji.feign.pojo.vo.SignalStatusVO;
 import net.wanji.feign.service.UtcFeignClients;
@@ -13,15 +16,12 @@ import net.wanji.opt.cache.CrossDirTurnPhaseCache;
 import net.wanji.opt.cache.CrossRidInfoCache;
 import net.wanji.opt.common.exception.OptServiceException;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
-import net.wanji.opt.dto.CrossDirInfoDTO;
 import net.wanji.opt.dto.CrossPhaseDTO;
 import net.wanji.opt.dto.CrossTurnDataRealtimeDTO;
-import net.wanji.opt.dto.CrossTurnInfoDTO;
 import net.wanji.opt.po.base.CrossPhasePO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
 import net.wanji.opt.po.base.CrossSchemePO;
 import net.wanji.opt.po.strategy.SceneStrategyIdeaPO;
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
 import net.wanji.opt.service.CrossOptimizeService;
 import net.wanji.opt.service.strategy.SceneService;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +34,15 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static net.wanji.opt.cache.CrossPhaseInfoCache.getCrossPhaseCacheByCrossId;

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java

@@ -10,31 +10,31 @@ import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.dto.CrossIdDTO;
 import net.wanji.common.utils.tool.CrossUtil;
 import net.wanji.databus.dao.entity.RidInfoEntity;
+import net.wanji.databus.dao.mapper.CrossDataHistMapper;
+import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
+import net.wanji.databus.dao.mapper.CrossDirDataHistMapper;
 import net.wanji.databus.dao.mapper.RidInfoMapper;
+import net.wanji.databus.po.CrossDataHistPO;
+import net.wanji.databus.po.CrossDataRealtimePO;
+import net.wanji.databus.po.CrossDirDataHistPO;
 import net.wanji.feign.pojo.vo.SchemeSendVO;
-import net.wanji.opt.dao.mapper.CrossDataHistMapper;
 import net.wanji.opt.dao.mapper.CrossDirInfoMapper;
 import net.wanji.opt.dao.mapper.CrossInfoMapper;
 import net.wanji.opt.dao.mapper.CrossPhaseMapper;
 import net.wanji.opt.dao.mapper.CrossSchemeMapper;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDataRealtimeMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDirDataHistMapper;
 import net.wanji.opt.dto.CrossIdAndDirDTO;
 import net.wanji.opt.dto.CrossIdAndSchemeIdDTO;
 import net.wanji.opt.dto.OptDataExtend;
 import net.wanji.opt.dto.SendManualDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.dto.strategy.QuerySceneDTO;
-import net.wanji.opt.po.CrossDataHistPO;
 import net.wanji.opt.po.base.CrossInfoPO;
 import net.wanji.opt.po.base.CrossPhasePO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
 import net.wanji.opt.po.base.CrossSchemePO;
 import net.wanji.opt.po.strategy.ScenePO;
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
-import net.wanji.opt.po.trend.CrossDirDataHistPO;
 import net.wanji.opt.service.DiagnoService;
 import net.wanji.opt.service.signalcontrol.FeignProxyService;
 import net.wanji.opt.service.strategy.SceneService;

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EvaluateServiceImpl.java

@@ -8,19 +8,19 @@ import com.google.gson.GsonBuilder;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.dto.CrossIdDTO;
 import net.wanji.common.enums.CrossInOutEnum;
-import net.wanji.common.po.CrossDirDataRealtimePO;
 import net.wanji.common.utils.tool.CrossUtil;
-import net.wanji.opt.bo.CrossDirDataHistAvgBO;
-import net.wanji.opt.dao.mapper.CrossDirDataRealtimeMapper;
+import net.wanji.databus.bo.CrossDirDataHistAvgBO;
+import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
+import net.wanji.databus.dao.mapper.CrossDirDataHistMapper;
+import net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper;
+import net.wanji.databus.po.CrossDataRealtimePO;
+import net.wanji.databus.po.CrossDirDataRealtimePO;
 import net.wanji.opt.dao.mapper.CrossInfoMapper;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDataRealtimeMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDirDataHistMapper;
 import net.wanji.opt.dto.CrossIdAndMinutesDTO;
 import net.wanji.opt.dto.OptDataExtend;
 import net.wanji.opt.po.base.CrossInfoPO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
 import net.wanji.opt.service.EvaluateService;
 import net.wanji.opt.vo.EvaluateCrossDetailVO;
 import net.wanji.opt.vo.EvaluateMetricsVO;
@@ -48,7 +48,10 @@ public class EvaluateServiceImpl implements EvaluateService {
 
     private Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
 
-    public EvaluateServiceImpl(CrossInfoMapper crossInfoMapper, CrossSchemeOptLogMapper crossSchemeOptLogMapper, CrossDataRealtimeMapper crossDataRealtimeMapper, CrossDirDataRealtimeMapper crossDirDataRealtimeMapper, CrossDirDataHistMapper crossDirDataHistMapper) {
+    public EvaluateServiceImpl(CrossInfoMapper crossInfoMapper, CrossSchemeOptLogMapper crossSchemeOptLogMapper,
+                               CrossDataRealtimeMapper crossDataRealtimeMapper,
+                               CrossDirDataRealtimeMapper crossDirDataRealtimeMapper,
+                               CrossDirDataHistMapper crossDirDataHistMapper) {
         this.crossInfoMapper = crossInfoMapper;
         this.crossSchemeOptLogMapper = crossSchemeOptLogMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java

@@ -9,24 +9,24 @@ import net.wanji.common.enums.EventAlarmEnum;
 import net.wanji.common.enums.EventAlarmSourceEnum;
 import net.wanji.common.utils.tool.CrossUtil;
 import net.wanji.databus.dao.entity.RidInfoEntity;
+import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
+import net.wanji.databus.dao.mapper.CrossDirDataHistMapper;
+import net.wanji.databus.dao.mapper.CrossTurnDataRealtimeMapper;
 import net.wanji.databus.dao.mapper.RidInfoMapper;
+import net.wanji.databus.po.CrossDataRealtimePO;
+import net.wanji.databus.po.CrossDirDataHistPO;
+import net.wanji.databus.po.CrossTurnDataRealtimePO;
+import net.wanji.databus.vo.AbnormalCrossListVO;
 import net.wanji.opt.dao.mapper.CrossDirInfoMapper;
 import net.wanji.opt.dao.mapper.CrossInfoMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDataRealtimeMapper;
-import net.wanji.opt.dao.mapper.trend.CrossDirDataHistMapper;
-import net.wanji.opt.dao.mapper.trend.CrossTurnDataRealtimeMapper;
 import net.wanji.opt.dao.mapper.trend.EventAlarmMapper;
 import net.wanji.opt.dao.mapper.trend.GreenwaveInfoMapper;
 import net.wanji.opt.dto.trend.AbnormalCrossListDTO;
 import net.wanji.opt.dto.trend.GreenwaveListDTO;
 import net.wanji.opt.po.base.CrossInfoPO;
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
-import net.wanji.opt.po.trend.CrossDirDataHistPO;
-import net.wanji.opt.po.trend.CrossTurnDataRealtimePO;
 import net.wanji.opt.po.trend.EventAlarmPO;
 import net.wanji.opt.service.TrendService;
 import net.wanji.opt.vo.AbnormalCrossDetailVO;
-import net.wanji.opt.vo.AbnormalCrossListVO;
 import net.wanji.opt.vo.AbnormalCrossStats;
 import net.wanji.opt.vo.AbnormalCrossVO;
 import net.wanji.opt.vo.EventAlarmVO;
@@ -64,7 +64,8 @@ public class TrendServiceImpl implements TrendService {
     public TrendServiceImpl(GreenwaveInfoMapper greenwaveInfoMapper, CrossInfoMapper crossInfoMapper,
                             CrossDataRealtimeMapper crossDataRealtimeMapper,
                             CrossTurnDataRealtimeMapper crossTurnDataRealtimeMapper,
-                            CrossDirDataHistMapper crossDirDataHistMapper, EventAlarmMapper eventAlarmMapper, RidInfoMapper ridInfoMapper, CrossDirInfoMapper crossDirInfoMapper) {
+                            CrossDirDataHistMapper crossDirDataHistMapper, EventAlarmMapper eventAlarmMapper,
+                            RidInfoMapper ridInfoMapper, CrossDirInfoMapper crossDirInfoMapper) {
         this.greenwaveInfoMapper = greenwaveInfoMapper;
         this.crossInfoMapper = crossInfoMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;

signal-optimize-service/src/main/java/net/wanji/opt/task/CrossMonitorTask.java

@@ -5,12 +5,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.enums.CrossStatusEnum;
 import net.wanji.common.framework.Constants;
-import net.wanji.opt.dao.mapper.trend.CrossDataRealtimeMapper;
+import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
+import net.wanji.databus.po.CrossDataRealtimePO;
 import net.wanji.opt.dto.CrossTurnDataRealtimeDTO;
 import net.wanji.opt.dto.LaneInfoDTO;
 import net.wanji.opt.kafka.ConsumerHandler;
 import net.wanji.opt.po.kafka.LanePeriodicDataPO;
-import net.wanji.opt.po.trend.CrossDataRealtimePO;
 import net.wanji.opt.query.LaneQuery;
 import net.wanji.opt.service.CrossOptimizeService;
 import net.wanji.opt.service.impl.LaneInfoServiceImpl;

signal-optimize-service/src/main/java/net/wanji/opt/vo/AbnormalCrossVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.wanji.databus.vo.AbnormalCrossListVO;
 
 import java.util.List;
 

signal-optimize-service/src/main/resources/mapper/CrossDataHistMapper.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.opt.dao.mapper.CrossDataHistMapper">
-
-    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.opt.po.CrossDataHistPO">
-        select
-            cross_id,status,type,traffic_index,start_time,duration,is_unbalance,is_spillover,is_congestion,unbalance_index,spillover_index,congestion_index,unbalance_dirs,spillover_dirs,congestion_dirs,flow,flow_rate,speed,queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
-        from t_cross_data_hist
-        where cross_id = #{crossId}
-          and batch_time <![CDATA[ >= ]]> #{preSeconds}
-        order by batch_time
-    </select>
-
-</mapper>

signal-optimize-service/src/main/resources/mapper/CrossDirDataRealtimeMapper.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.opt.dao.mapper.CrossDirDataRealtimeMapper">
-
-    <sql id="baseColumnList">
-        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,duration,flow,speed,queue_length,
-        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
-    </sql>
-
-    <select id="selectByCrossIdAndDirType" resultType="net.wanji.common.po.CrossDirDataRealtimePO">
-        select <include refid="baseColumnList"/>
-        from t_cross_dir_data_realtime
-        where cross_id = #{crossId} and dir_type = #{key} and in_out_type = 1
-    </select>
-
-    <select id="selectByCrossIdAndInOutType" resultType="net.wanji.common.po.CrossDirDataRealtimePO">
-        select <include refid="baseColumnList"/>
-        from t_cross_dir_data_realtime
-        where cross_id = #{crossId} and in_out_type = #{inOutType}
-    </select>
-</mapper>

signal-optimize-service/src/main/resources/mapper/trend/CrossDataRealtimeMapper.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.opt.dao.mapper.trend.CrossDataRealtimeMapper">
-
-    <select id="selectAbnormalCross" resultType="net.wanji.opt.vo.AbnormalCrossListVO">
-        select
-            t2.id, t2.name, t1.unbalance_dirs, t1.congestion_dirs, t1.spillover_dirs, t1.status as realtimeStatus,
-            t1.start_time, t1.duration, t2.location as locationStr, t1.is_unbalance, t1.is_spillover, t1.is_congestion
-        from t_cross_data_realtime t1 JOIN t_base_cross_info t2
-            ON t1.cross_id = t2.id
-        <where>
-            <if test="status != null">
-                and (t1.status = #{status}
-                    <if test="status == 1"> or t1.is_unbalance = 1 </if>
-                    <if test="status == 2"> or t1.is_congestion = 1 </if>
-                    <if test="status == 3"> or t1.is_spillover = 1 </if>)
-            </if>
-            <if test="name != null and name != ''">
-                and t2.name like concat('%',#{name},'%')
-            </if>
-            <if test="type != null">
-                and t1.type = #{type}
-            </if>
-            <if test="status == null">
-                and t1.status in (0, 1, 2, 3)
-            </if>
-            and t2.is_signal = 1
-        </where>
-    </select>
-
-    <select id="selectByCrossId" resultType="net.wanji.opt.po.trend.CrossDataRealtimePO">
-        select
-            cross_id,status,type,traffic_index,start_time,duration,is_unbalance,is_spillover,is_congestion,unbalance_index,spillover_index,congestion_index,unbalance_dirs,spillover_dirs,congestion_dirs,flow,flow_rate,speed,queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified
-        from t_cross_data_realtime
-        where cross_id = #{crossId}
-    </select>
-
-</mapper>

signal-optimize-service/src/main/resources/mapper/trend/CrossDirDataHist.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.opt.dao.mapper.trend.CrossDirDataHistMapper">
-
-    <sql id="baseColumnList">
-        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,flow,speed,queue_length,stop_times,
-        delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
-
-    </sql>
-
-
-    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.opt.po.trend.CrossDirDataHistPO">
-        select <include refid="baseColumnList"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1
-          and batch_time <![CDATA[ >= ]]> #{preSeconds}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossIdDirAndTimestamp" resultType="net.wanji.opt.po.trend.CrossDirDataHistPO">
-        select <include refid="baseColumnList"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
-          and batch_time <![CDATA[ >= ]]> #{preSeconds}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossIdInOutTimestamp" resultType="net.wanji.opt.bo.CrossDirDataHistAvgBO">
-        SELECT dir_type as dirType, avg(capacity) as avgCapacity, avg(flow) as avgFlow,
-               avg(queue_length) as avgQueueLength, avg(traffic_index) as avgIndex,
-               avg(effusion_time) as avgEffusionTime
-        FROM t_cross_dir_data_hist
-        WHERE cross_id = #{crossId}
-          AND in_out_type = #{inOutType}
-          AND batch_time <![CDATA[ >= ]]> #{preSeconds}
-        GROUP BY dir_type
-    </select>
-
-</mapper>

signal-optimize-service/src/main/resources/mapper/trend/CrossTurnDataRealtimeMapper.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.opt.dao.mapper.trend.CrossTurnDataRealtimeMapper">
-
-    <select id="selectByCrossId" resultType="net.wanji.opt.po.trend.CrossTurnDataRealtimePO">
-        select
-            id,turn_type,in_dir,out_dir,cross_id,flow,speed,in_speed,out_speed,queue_length,stop_times,delay_time,sturation,vehhead_dist,vehhead_time,quality,batch_time,gmt_create,gmt_modified
-        from t_cross_turn_data_realtime
-        where cross_id = #{crossId}
-    </select>
-
-</mapper>

wj-common/src/main/java/net/wanji/common/po/CrossDirDataRealtimePO.java

-package net.wanji.common.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Kent HAN
- * @date 2023/1/11 17:27
- */
-@Data
-public class CrossDirDataRealtimePO {
-
-    /** 路口方向ID（路口ID_方向_进出口_主辅路序号） */
-    @ApiModelProperty(name = "路口方向ID（路口ID_方向_进出口_主辅路序号）",notes = "")
-    private String id ;
-    /** 路口方向类型：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
-    @ApiModelProperty(name = "路口方向类型：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
-    private Integer dirType ;
-    /** 进出口类型：1进口；2出口 */
-    @ApiModelProperty(name = "进出口类型：1进口；2出口",notes = "")
-    private Integer inOutType ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 路段长度 */
-    @ApiModelProperty(name = "路段长度",notes = "")
-    private Double length ;
-    /** 交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知 */
-    @ApiModelProperty(name = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知",notes = "")
-    private Integer status ;
-    /** 交通指数 */
-    @ApiModelProperty(name = "交通指数",notes = "")
-    private Double trafficIndex ;
-    @ApiModelProperty(value = "开始时间：yyyy-MM-dd HH:mm:ss",notes = "")
-    private Date startTime ;
-    @ApiModelProperty(value = "通行能力（辆/某一时段内最大过车数）,通行能力=自然流量",notes = "")
-    private Integer capacity ;
-    @ApiModelProperty(value = "持续时间（单位：分钟）",notes = "")
-    private Integer duration ;
-    /** 交通流量（辆） */
-    @ApiModelProperty(name = "交通流量（辆）",notes = "")
-    private Integer flow ;
-    /** 平均速度（km/h） */
-    @ApiModelProperty(name = "平均速度（km/h）",notes = "")
-    private Double speed ;
-    /** 排队长度（米） */
-    @ApiModelProperty(name = "排队长度（米）",notes = "")
-    private Double queueLength ;
-    /** 停车次数（次） */
-    @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Double stopTimes ;
-    /** 延误时间（秒） */
-    @ApiModelProperty(name = "延误时间（秒）",notes = "")
-    private Integer delayTime ;
-    /** 饱和度 */
-    @ApiModelProperty(name = "饱和度",notes = "")
-    private Double sturation ;
-    /** 采集时间（10位时间戳） */
-    @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
-    private Integer batchTime ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-    @ApiModelProperty(name = "溢流时长，计算溢流率提供；溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
-    private Double effusionTime ;
-}

signal-optimize-service/src/main/java/net/wanji/opt/bo/CrossDirDataHistAvgBO.java → wj-databus/src/main/java/net/wanji/databus/bo/CrossDirDataHistAvgBO.java

-package net.wanji.opt.bo;
+package net.wanji.databus.bo;
 
 import lombok.Data;
 

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataHistMapper.java

@@ -17,4 +17,7 @@ import java.util.List;
 public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> {
     void insertBatch(@Param("list") List<CrossDataHistPO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
+
+    List<CrossDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds);
+
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataRealTimeMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataRealtimeMapper.java

 package net.wanji.databus.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.databus.po.CrossDataRealTimePO;
+import net.wanji.databus.po.CrossDataRealtimePO;
+import net.wanji.databus.vo.AbnormalCrossListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,8 +14,12 @@ import java.util.List;
  * @date 2023/03/10 20:06
  */
 @Mapper
-public interface CrossDataRealTimeMapper extends BaseMapper<CrossDataRealTimePO> {
-    void insertBatch(@Param("list") List<CrossDataRealTimePO> list);
+public interface CrossDataRealtimeMapper extends BaseMapper<CrossDataRealtimePO> {
+    void insertBatch(@Param("list") List<CrossDataRealtimePO> list);
 
     void deleteBatch(@Param("list") Collection<String> crossIds);
+
+    List<AbnormalCrossListVO> selectAbnormalCross(Integer status, String name, Integer type);
+
+    CrossDataRealtimePO selectByCrossId(String crossId);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDirDataHistMapper.java

 package net.wanji.databus.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import net.wanji.databus.bo.CrossDirDataHistAvgBO;
 import net.wanji.databus.po.CrossDirDataHistPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +18,9 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> {
     void insertBatch(@Param("list")List<CrossDirDataHistPO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
 
+    List<CrossDirDataHistPO> selectByCrossIdAndTimestamp(String crossId, long preSeconds);
+
+    List<CrossDirDataHistPO> selectByCrossIdDirAndTimestamp(String crossId, Integer dir, long preSeconds);
+
+    List<CrossDirDataHistAvgBO> selectByCrossIdInOutTimestamp(String crossId, Integer inOutType, long preSeconds);
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDirDataRealTimeMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDirDataRealtimeMapper.java

 package net.wanji.databus.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.databus.po.CrossDirDataRealTimePO;
+import net.wanji.databus.po.CrossDirDataRealtimePO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,8 +13,12 @@ import java.util.List;
  * @date 2023/03/10 21:09
  */
 @Mapper
-public interface CrossDirDataRealTimeMapper extends BaseMapper<CrossDirDataRealTimePO> {
-    void insertBatch(@Param("list")List<CrossDirDataRealTimePO> list);
+public interface CrossDirDataRealtimeMapper extends BaseMapper<CrossDirDataRealtimePO> {
+    void insertBatch(@Param("list")List<CrossDirDataRealtimePO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
 
+    CrossDirDataRealtimePO selectByCrossIdAndDirType(String crossId, Integer key);
+
+    List<CrossDirDataRealtimePO> selectByCrossIdAndInOutType(String crossId, Integer inOutType);
+
 }

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossTurnDataRealTimeMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossTurnDataRealtimeMapper.java

 package net.wanji.databus.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.databus.po.CrossTurnDataRealTimePO;
+import net.wanji.databus.po.CrossTurnDataRealtimePO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,8 +13,10 @@ import java.util.List;
  * @date 2023/03/10 21:11
  */
 @Mapper
-public interface CrossTurnDataRealTimeMapper extends BaseMapper<CrossTurnDataRealTimePO> {
-    void insertBatch(@Param("list") List<CrossTurnDataRealTimePO> list);
+public interface CrossTurnDataRealtimeMapper extends BaseMapper<CrossTurnDataRealtimePO> {
+    void insertBatch(@Param("list") List<CrossTurnDataRealtimePO> list);
     void deleteBatch(@Param("list") Collection<String> crossIds);
 
+    List<CrossTurnDataRealtimePO> selectByCrossId(String crossId);
+
 }

signal-optimize-service/src/main/java/net/wanji/opt/dto/CrossDirInfoDTO.java → wj-databus/src/main/java/net/wanji/databus/dto/CrossDirInfoDTO.java

-package net.wanji.opt.dto;
+package net.wanji.databus.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-optimize-service/src/main/java/net/wanji/opt/dto/CrossTurnInfoDTO.java → wj-databus/src/main/java/net/wanji/databus/dto/CrossTurnInfoDTO.java

-package net.wanji.opt.dto;
+package net.wanji.databus.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

wj-databus/src/main/java/net/wanji/databus/po/CrossDataHistPO.java

@@ -11,5 +11,5 @@ import lombok.Data;
 @Data
 @TableName("t_cross_data_hist")
 @ApiModel(value = "CrossDataHistPO", description = "路口实时数据历史")
-public class CrossDataHistPO extends CrossDataRealTimePO{
+public class CrossDataHistPO extends CrossDataRealtimePO {
 }

wj-databus/src/main/java/net/wanji/databus/po/CrossDataRealTimePO.java

-package net.wanji.databus.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author duanruiming
- * @date 2023/03/10 19:02
- */
-@Data
-@TableName("t_cross_data_realtime")
-@ApiModel(value = "CrossDataRealTimePO", description = "路口实时数据")
-public class CrossDataRealTimePO {
-    @ApiModelProperty(name = "路口编号",notes = "")
-    private String crossId;
-    @ApiModelProperty(name = "路口状态：0正常 1失衡 2拥堵 3溢出 4死锁",notes = "")
-    private Integer status;
-    @ApiModelProperty(name = "拥堵类型 1常规 2异常",notes = "")
-    private Integer type;
-    @ApiModelProperty(name = "交通指数（1-10）",notes = "")
-    private Double trafficIndex;
-    @ApiModelProperty(name = "开始时间 yyyy-MM-dd HH:mm:sss",notes = "")
-    private Date startTime;
-    @ApiModelProperty(name = "持续时间(分钟)",notes = "")
-    private Integer duration;
-    @ApiModelProperty(name = "是否失衡 0否 1是",notes = "")
-    private Integer unbalanceStatus;
-    @ApiModelProperty(name = "是否溢出 0否 1是",notes = "")
-    private Integer spilloverStatus;
-    @ApiModelProperty(name = "是否拥堵 0否 1是",notes = "")
-    private Integer congestionStatus;
-    @ApiModelProperty(name = "失衡指数",notes = "")
-    private Double unbalanceIndex;
-    @ApiModelProperty(name = "溢出指数",notes = "")
-    private Double spilloverIndex;
-    @ApiModelProperty(name = "拥堵指数",notes = "")
-    private Double congestionIndex;
-    @ApiModelProperty(name = "路口失衡方向：1，2，3...",notes = "")
-    private String unbalanceDirs;
-    @ApiModelProperty(name = "溢出方向",notes = "")
-    private String spilloverDirs;
-    @ApiModelProperty(name = "拥堵方向",notes = "")
-    private String congestionDirs;
-    @ApiModelProperty(name = "交通流量(辆)",notes = "")
-    private Integer flow;
-    @ApiModelProperty(name = "交通流率/h",notes = "")
-    private Double flowRate;
-    @ApiModelProperty(name = "平均速度",notes = "")
-    private Double speed;
-    @ApiModelProperty(name = "最大排队长度",notes = "")
-    private Double queueLength;
-    @ApiModelProperty(name = "停车次数",notes = "")
-    private Integer stopTimes;
-    @ApiModelProperty(name = "延误时间",notes = "")
-    private Integer delayTime;
-    @ApiModelProperty(name = "饱和度：欠饱和：<0.6；近饱和：>=0.6 & < 0.8；过饱和：>0.8",notes = "")
-    private Double sturation;
-    @ApiModelProperty(name = "数据批次 十位日期int",notes = "")
-    private Integer batchTime;
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-optimize-service/src/main/java/net/wanji/opt/po/trend/CrossDataRealtimePO.java → wj-databus/src/main/java/net/wanji/databus/po/CrossDataRealtimePO.java

-package net.wanji.opt.po.trend;
+package net.wanji.databus.po;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.wanji.opt.dto.CrossDirInfoDTO;
-import net.wanji.opt.dto.CrossTurnInfoDTO;
+import net.wanji.databus.dto.CrossDirInfoDTO;
+import net.wanji.databus.dto.CrossTurnInfoDTO;
 
 import java.util.Date;
 import java.util.List;
 
 /**
- * @author hfx
- * @date 2023/1/10 16:36
+ * @author duanruiming
+ * @date 2023/03/10 19:02
  */
 @Data
+@TableName("t_cross_data_realtime")
+@ApiModel(value = "CrossDataRealtimePO", description = "路口实时数据")
 public class CrossDataRealtimePO {
     /** 路口编号 */
     @ApiModelProperty(value = "路口编号",notes = "")

wj-databus/src/main/java/net/wanji/databus/po/CrossDirDataHistPO.java

@@ -11,5 +11,5 @@ import lombok.Data;
 @Data
 @TableName("t_cross_dir_data_hist")
 @ApiModel(value = "CrossDirDataHistPO", description = "路口转向实时数据历史")
-public class CrossDirDataHistPO extends CrossDirDataRealTimePO{
+public class CrossDirDataHistPO extends CrossDirDataRealtimePO {
 }

wj-databus/src/main/java/net/wanji/databus/po/CrossDirDataRealTimePO.java → wj-databus/src/main/java/net/wanji/databus/po/CrossDirDataRealtimePO.java

@@ -13,8 +13,8 @@ import java.util.Date;
  */
 @Data
 @TableName("t_cross_dir_data_realtime")
-@ApiModel(value = "CrossDirDataRealTimePO", description = "路口转向实时数据")
-public class CrossDirDataRealTimePO {
+@ApiModel(value = "CrossDirDataRealtimePO", description = "路口转向实时数据")
+public class CrossDirDataRealtimePO {
     @ApiModelProperty(name = "路口方向ID（路口ID_方向_进出口_主辅路序号）",notes = "")
     private String id;
     @ApiModelProperty(name = "路口方向类型：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
@@ -42,7 +42,7 @@ public class CrossDirDataRealTimePO {
     @ApiModelProperty(name = "排队长(米)",notes = "")
     private Double queueLength;
     @ApiModelProperty(name = "停车次数",notes = "")
-    private Integer stopTimes;
+    private Double stopTimes;
     @ApiModelProperty(name = "延误时间",notes = "")
     private Integer delayTime;
     @ApiModelProperty(name = "饱和度",notes = "")

wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataHistPO.java

@@ -11,5 +11,5 @@ import lombok.Data;
 @Data
 @TableName("t_lane_data_hist")
 @ApiModel(value = "CrossTurnDataHistPO", description = "路口转向实时数据历史")
-public class CrossTurnDataHistPO extends CrossTurnDataRealTimePO{
+public class CrossTurnDataHistPO extends CrossTurnDataRealtimePO {
 }

wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataRealTimePO.java → wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataRealtimePO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 @TableName("t_lane_data_realtime")
 @ApiModel(value = "CrossTurnDataRealtimePO", description = "路口转向实时数据")
-public class CrossTurnDataRealTimePO {
+public class CrossTurnDataRealtimePO {
     /** 转向ID（路口ID_驶入方向_转向类型） */
     @ApiModelProperty(name = "转向ID（路口ID_驶入方向_转向类型）",notes = "")
     private String id ;
@@ -52,7 +52,7 @@ public class CrossTurnDataRealTimePO {
     private Double queueLength ;
     /** 停车次数（次） */
     @ApiModelProperty(name = "停车次数（次）",notes = "")
-    private Integer stopTimes ;
+    private Double stopTimes ;
     /** 延误时间（秒） */
     @ApiModelProperty(name = "延误时间（秒）",notes = "")
     private Integer delayTime ;

signal-optimize-service/src/main/java/net/wanji/opt/vo/AbnormalCrossListVO.java → wj-databus/src/main/java/net/wanji/databus/vo/AbnormalCrossListVO.java

-package net.wanji.opt.vo;
+package net.wanji.databus.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml

@@ -9,9 +9,9 @@
         <result column="traffic_index" property="trafficIndex"></result>
         <result column="start_time" property="startTime"></result>
         <result column="duration" property="duration"></result>
-        <result column="is_unbalance" property="unbalanceStatus"></result>
-        <result column="is_spillover" property="spilloverStatus"></result>
-        <result column="is_congestion" property="congestionStatus"></result>
+        <result column="is_unbalance" property="isUnbalance"></result>
+        <result column="is_spillover" property="isSpillover"></result>
+        <result column="is_congestion" property="isCongestion"></result>
         <result column="unbalance_index" property="unbalanceIndex"></result>
         <result column="spillover_index" property="spilloverIndex"></result>
         <result column="congestion_index" property="congestionIndex"></result>
@@ -54,4 +54,12 @@
             (#{crossId})
         </foreach>
     </delete>
+
+    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.databus.po.CrossDataHistPO">
+        select <include refid="Base_Column_List"></include>
+        from t_cross_data_hist
+        where cross_id = #{crossId}
+          and batch_time <![CDATA[ >= ]]> #{preSeconds}
+        order by batch_time
+    </select>
 </mapper>
\ No newline at end of file

wj-databus/src/main/resources/mapper/CrossDataRealTimeMapper.xml → wj-databus/src/main/resources/mapper/CrossDataRealtimeMapper.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.databus.dao.mapper.CrossDataRealTimeMapper">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossDataRealtimeMapper">
 
-    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDataRealTimePO">
+    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDataRealtimePO">
         <result column="cross_id" property="crossId"></result>
         <result column="status" property="status"></result>
         <result column="type" property="type"></result>
         <result column="traffic_index" property="trafficIndex"></result>
         <result column="start_time" property="startTime"></result>
         <result column="duration" property="duration"></result>
-        <result column="is_unbalance" property="unbalanceStatus"></result>
-        <result column="is_spillover" property="spilloverStatus"></result>
-        <result column="is_congestion" property="congestionStatus"></result>
+        <result column="is_unbalance" property="isUnbalance"></result>
+        <result column="is_spillover" property="isSpillover"></result>
+        <result column="is_congestion" property="isCongestion"></result>
         <result column="unbalance_index" property="unbalanceIndex"></result>
         <result column="spillover_index" property="spilloverIndex"></result>
         <result column="congestion_index" property="congestionIndex"></result>
@@ -36,7 +36,7 @@
         flow, flow_rate, speed, queue_length, stop_times, delay_time, sturation, batch_time, gmt_create, gmt_modified
     </sql>
 
-    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataRealTimePO">
+    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataRealtimePO">
         insert into t_cross_data_realtime
              (<include refid="Base_Column_List"></include>)
         values
@@ -54,4 +54,37 @@
             (#{crossId})
         </foreach>
     </delete>
+
+
+    <select id="selectAbnormalCross" resultType="net.wanji.databus.vo.AbnormalCrossListVO">
+        select
+        t2.id, t2.name, t1.unbalance_dirs, t1.congestion_dirs, t1.spillover_dirs, t1.status as realtimeStatus,
+        t1.start_time, t1.duration, t2.location as locationStr, t1.is_unbalance, t1.is_spillover, t1.is_congestion
+        from t_cross_data_realtime t1 JOIN t_base_cross_info t2
+        ON t1.cross_id = t2.id
+        <where>
+            <if test="status != null">
+                and (t1.status = #{status}
+                <if test="status == 1"> or t1.is_unbalance = 1 </if>
+                <if test="status == 2"> or t1.is_congestion = 1 </if>
+                <if test="status == 3"> or t1.is_spillover = 1 </if>)
+            </if>
+            <if test="name != null and name != ''">
+                and t2.name like concat('%',#{name},'%')
+            </if>
+            <if test="type != null">
+                and t1.type = #{type}
+            </if>
+            <if test="status == null">
+                and t1.status in (0, 1, 2, 3)
+            </if>
+            and t2.is_signal = 1
+        </where>
+    </select>
+
+    <select id="selectByCrossId" resultType="net.wanji.databus.po.CrossDataRealtimePO">
+        select <include refid="Base_Column_List"></include>
+        from t_cross_data_realtime
+        where cross_id = #{crossId}
+    </select>
 </mapper>
\ No newline at end of file

wj-databus/src/main/resources/mapper/CrossDirDataHistMapper.xml

@@ -26,8 +26,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, dir_type, in_out_type, cross_id, length, status, traffic_index, start_time, capacity, duration, flow,
-        speed, queue_length, stop_times, delay_time, sturation, batch_time, gmt_create, gmt_modified, effusion_time
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,flow,speed,queue_length,stop_times,
+        delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataHistPO">
@@ -47,4 +47,31 @@
             (#{crossId})
         </foreach>
     </delete>
+
+    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_dir_data_hist
+        where cross_id = #{crossId} and in_out_type = 1
+        and batch_time <![CDATA[ >= ]]> #{preSeconds}
+        order by batch_time
+    </select>
+
+    <select id="selectByCrossIdDirAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_dir_data_hist
+        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
+        and batch_time <![CDATA[ >= ]]> #{preSeconds}
+        order by batch_time
+    </select>
+
+    <select id="selectByCrossIdInOutTimestamp" resultType="net.wanji.databus.bo.CrossDirDataHistAvgBO">
+        SELECT dir_type as dirType, avg(capacity) as avgCapacity, avg(flow) as avgFlow,
+               avg(queue_length) as avgQueueLength, avg(traffic_index) as avgIndex,
+               avg(effusion_time) as avgEffusionTime
+        FROM t_cross_dir_data_hist
+        WHERE cross_id = #{crossId}
+          AND in_out_type = #{inOutType}
+          AND batch_time <![CDATA[ >= ]]> #{preSeconds}
+        GROUP BY dir_type
+    </select>
 </mapper>
\ No newline at end of file

wj-databus/src/main/resources/mapper/CrossDirDataRealTimeMapper.xml → wj-databus/src/main/resources/mapper/CrossDirDataRealtimeMapper.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.databus.dao.mapper.CrossDirDataRealTimeMapper">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper">
 
-    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDirDataRealTimePO">
+    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDirDataRealtimePO">
         <result column="id" property="id"></result>
         <result column="dir_type" property="dirType"></result>
         <result column="in_out_type" property="inOutType"></result>
@@ -26,11 +26,11 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, dir_type, in_out_type, cross_id, length, status, traffic_index, start_time, capacity, duration, flow,
-        speed, queue_length, stop_times, delay_time, sturation, batch_time, gmt_create, gmt_modified, effusion_time
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,duration,flow,speed,queue_length,
+        stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,effusion_time
     </sql>
 
-    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataRealTimePO">
+    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataRealtimePO">
         insert into t_cross_dir_data_realtime
             (<include refid="Base_Column_List"></include>)
         values
@@ -47,4 +47,17 @@
             (#{crossId})
         </foreach>
     </delete>
+
+    <select id="selectByCrossIdAndDirType" resultType="net.wanji.databus.po.CrossDirDataRealtimePO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_dir_data_realtime
+        where cross_id = #{crossId} and dir_type = #{key} and in_out_type = 1
+    </select>
+
+    <select id="selectByCrossIdAndInOutType" resultType="net.wanji.databus.po.CrossDirDataRealtimePO">
+        select <include refid="Base_Column_List"/>
+        from t_cross_dir_data_realtime
+        where cross_id = #{crossId} and in_out_type = #{inOutType}
+    </select>
+
 </mapper>
\ No newline at end of file

wj-databus/src/main/resources/mapper/CrossTurnDataHistMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="net.wanji.databus.dao.mapper.CrossTurnDataHistMapper">
 
-    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossTurnDataRealTimePO">
+    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossTurnDataRealtimePO">
         <result column="id" property="id"></result>
         <result column="turn_type" property="turnType"></result>
         <result column="in_dir" property="inDir"></result>
@@ -31,7 +31,7 @@
         stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified
     </sql>
 
-    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealTimePO">
+    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
         insert into t_cross_turn_data_hist
         (<include refid="Base_Column_List"></include>)
         values

wj-databus/src/main/resources/mapper/CrossTurnDataRealTimeMapper.xml → wj-databus/src/main/resources/mapper/CrossTurnDataRealtimeMapper.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.databus.dao.mapper.CrossTurnDataRealTimeMapper">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossTurnDataRealtimeMapper">
 
-    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossTurnDataRealTimePO">
+    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossTurnDataRealtimePO">
         <result column="id" property="id"></result>
         <result column="turn_type" property="turnType"></result>
         <result column="in_dir" property="inDir"></result>
@@ -31,7 +31,7 @@
         stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified
     </sql>
 
-    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealTimePO">
+    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
         insert into t_cross_turn_data_realtime
         (<include refid="Base_Column_List"></include>)
         values
@@ -48,4 +48,10 @@
             (#{crossId})
         </foreach>
     </delete>
+
+    <select id="selectByCrossId" resultType="net.wanji.databus.po.CrossTurnDataRealtimePO">
+        select <include refid="Base_Column_List"></include>
+        from t_cross_turn_data_realtime
+        where cross_id = #{crossId}
+    </select>
 </mapper>
\ No newline at end of file