[add] 策略管理路口状态优化

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

@@ -14,9 +14,10 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.common.utils.tool.JacksonUtils;
 import net.wanji.databus.dao.entity.GreenwaveInfoPO;
 import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
+import net.wanji.databus.dao.mapper.CrossDataRealtimeMapper;
 import net.wanji.databus.dao.mapper.GreenwaveInfoMapper;
 import net.wanji.databus.po.BaseCrossInfoPO;
-import net.wanji.databus.po.TBaseCrossInfo;
+import net.wanji.databus.vo.AbnormalCrossListVO;
 import net.wanji.opt.cache.BaseCrossInfoCache;
 import net.wanji.opt.cache.GreenWaveInfoCache;
 import net.wanji.opt.common.enums.StrategyControlEnum;
@@ -73,6 +74,8 @@ public class StrategyControlServiceImpl implements StrategyControlService {
     private StrategyCrossResultMapper strategyCrossResultMapper;
     @Resource
     private BaseCrossInfoCache baseCrossInfoCache;
+    @Resource
+    private CrossDataRealtimeMapper crossDataRealtimeMapper;
 
 
     @Override
@@ -255,25 +258,21 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             Map<String, StrategyControlDataEntity> map = runList.stream().collect(Collectors.toMap(StrategyControlDataEntity::getBizId, entity -> entity));
             // 路口
             if (Objects.equals(0, type)) {
-                LambdaQueryWrapper<TBaseCrossInfo> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(TBaseCrossInfo::getIsSignal, 1);
-                List<TBaseCrossInfo> baseCrossInfoPOS = baseCrossInfoMapper.selectList(queryWrapper);
-                if (!CollectionUtils.isEmpty(baseCrossInfoPOS)) {
-                    for (TBaseCrossInfo baseCrossInfoPO : baseCrossInfoPOS) {
+                List<AbnormalCrossListVO> abnormalCrossListVOS = crossDataRealtimeMapper.selectAbnormalCross(null, null, null);
+                if (!CollectionUtils.isEmpty(abnormalCrossListVOS)) {
+                    for (AbnormalCrossListVO baseCrossInfoPO : abnormalCrossListVOS) {
                         StrategyControlDataEntity strategyControlDataEntity = new StrategyControlDataEntity();
                         String crossId = baseCrossInfoPO.getId();
                         strategyControlDataEntity.setBizType(0);
-                        strategyControlDataEntity.setBizId(baseCrossInfoPO.getId());
+                        strategyControlDataEntity.setBizId(crossId);
                         // 转化成 0 畅通 1失衡 2拥堵 3溢出 4死锁 5空放 6干线拥堵 7干线缓行 8干线畅通
-                        strategyControlDataEntity.setStrategy(0);
-                        strategyControlDataEntity.setOptMethod("均衡调控");
+                        Integer status = baseCrossInfoPO.getRealtimeStatus();
+                        strategyControlDataEntity.setStrategy(status);
+                        strategyControlDataEntity.setOptMethod(Objects.equals(1, status) ? "均衡调控" : "效率提升");
                         strategyControlDataEntity.setTime(null);
-                        strategyControlDataEntity.setStatus(0);
-                        if (map.containsKey(crossId)) {
-                            strategyControlDataEntity = map.get(crossId);
-                        }
+                        strategyControlDataEntity.setStatus(status);
                         strategyControlDataEntity.setCrossName(baseCrossInfoPO.getName());
-                        String location = baseCrossInfoPO.getLocation();
+                        String location = baseCrossInfoPO.getLocationStr();
                         location = location.replace("POINT(", "").replace(" ", ",").replace(")", "");
                         strategyControlDataEntity.setWkt(location);
                         results.add(strategyControlDataEntity);