[update] 问题路口添加优化状态

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

@@ -3,6 +3,7 @@ package net.wanji.opt.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import net.wanji.common.dto.CrossIdDTO;
 import net.wanji.common.enums.CrossStatusEnum;
 import net.wanji.common.enums.EventAlarmEnum;
@@ -17,10 +18,12 @@ import net.wanji.databus.po.CrossTurnDataRealtimePO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.AbnormalCrossListVO;
 import net.wanji.opt.dao.mapper.CrossDirInfoMapper;
+import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
 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.CrossSchemeOptLogPO;
 import net.wanji.opt.po.trend.EventAlarmPO;
 import net.wanji.opt.service.TrendService;
 import net.wanji.opt.vo.*;
@@ -45,6 +48,7 @@ public class TrendServiceImpl implements TrendService {
     private final EventAlarmMapper eventAlarmMapper;
     private final RidInfoMapper ridInfoMapper;
     private final CrossDirInfoMapper crossDirInfoMapper;
+    private final CrossSchemeOptLogMapper crossSchemeOptLogMapper;
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -52,7 +56,8 @@ public class TrendServiceImpl implements TrendService {
                             CrossDataRealtimeMapper crossDataRealtimeMapper,
                             CrossTurnDataRealtimeMapper crossTurnDataRealtimeMapper,
                             CrossDirDataHistMapper crossDirDataHistMapper, EventAlarmMapper eventAlarmMapper,
-                            RidInfoMapper ridInfoMapper, CrossDirInfoMapper crossDirInfoMapper) {
+                            RidInfoMapper ridInfoMapper, CrossDirInfoMapper crossDirInfoMapper,
+                            CrossSchemeOptLogMapper crossSchemeOptLogMapper) {
         this.greenwaveInfoMapper = greenwaveInfoMapper;
         this.crossInfoMapper = crossInfoMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;
@@ -61,6 +66,7 @@ public class TrendServiceImpl implements TrendService {
         this.eventAlarmMapper = eventAlarmMapper;
         this.ridInfoMapper = ridInfoMapper;
         this.crossDirInfoMapper = crossDirInfoMapper;
+        this.crossSchemeOptLogMapper = crossSchemeOptLogMapper;
     }
 
     @Override
@@ -117,6 +123,20 @@ public class TrendServiceImpl implements TrendService {
         Integer type = abnormalCrossListDTO.getType();
         List<AbnormalCrossListVO> abnormalCrossListVOList =
                 crossDataRealtimeMapper.selectAbnormalCross(status, name, type);
+        // 添加优化状态
+        for (AbnormalCrossListVO abnormalCrossListVO : abnormalCrossListVOList) {
+            abnormalCrossListVO.setOptStatus(2); // 2未优化
+            String crossId = abnormalCrossListVO.getId();
+            // 查询优化日志
+            List<CrossSchemeOptLogPO> crossSchemeOptLogPOS = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
+            if (CollectionUtil.isNotEmpty(crossSchemeOptLogPOS)) {
+                CrossSchemeOptLogPO crossSchemeOptLogPO = crossSchemeOptLogPOS.get(0);
+                Date endTime = crossSchemeOptLogPO.getEndTime();
+                if (ObjectUtil.isEmpty(endTime)) {
+                    abnormalCrossListVO.setOptStatus(1); // 1优化中
+                }
+            }
+        }
         // 坐标格式转换
         for (AbnormalCrossListVO abnormalCrossListVO : abnormalCrossListVOList) {
             String locationStr = abnormalCrossListVO.getLocationStr();

wj-databus/src/main/java/net/wanji/databus/vo/AbnormalCrossListVO.java

@@ -31,6 +31,8 @@ public class AbnormalCrossListVO {
     private Date startTime;
     @ApiModelProperty(value = "持续时长 分钟")
     private Long duration;
+    @ApiModelProperty(value = "优化状态 1优化中 2未优化")
+    private Integer optStatus;
     @JsonIgnore
     // 路口坐标字符串
     private String locationStr;