增加路段名称

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

@@ -9,6 +9,8 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class DirListElement {
+    @ApiModelProperty(value = "路段名称", required = true)
+    private String roadName;
     @ApiModelProperty(value = "车道进口方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北", required = true)
     private Integer dir;
     @ApiModelProperty(value = "交通状态：1畅通；2缓行；3拥堵；4严重拥堵；5未知", required = true)

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

@@ -3,6 +3,7 @@ package net.wanji.opt.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
@@ -24,10 +25,12 @@ import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.databus.vo.SchemeSendVO;
 import net.wanji.feign.service.UtcFeignClients;
 import net.wanji.opt.dao.mapper.CrossSchemeOptLogMapper;
+import net.wanji.opt.dao.mapper.base.BaseRidInfoMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneMapper;
 import net.wanji.opt.dto.*;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.dto.strategy.QuerySceneDTO;
+import net.wanji.opt.po.base.BaseRidInfo;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
 import net.wanji.opt.po.strategy.ScenePO;
 import net.wanji.opt.service.DiagnoService;
@@ -68,6 +71,9 @@ public class DiagnoServiceImpl implements DiagnoService {
     private final CrossDirDataRealtimeMapper crossDirDataRealtimeMapper;
     private final BaseCrossLaneLightsMapper baseCrossLaneLightsMapper;
     private final BaseCrossLightsMapper baseCrossLightsMapper;
+    @Resource
+    BaseRidInfoMapper baseRidInfoMapper;
+
     @Resource
     private UtcFeignClients utcFeignClients;
     private Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
@@ -564,13 +570,23 @@ public class DiagnoServiceImpl implements DiagnoService {
 
     private void buildDirList(String crossId, SaveLaneInfoDTO saveLaneInfoDTO) {
         saveLaneInfoDTO.setDirList(new ArrayList<>());
+
+        QueryWrapper<BaseRidInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("end_cross_id", crossId);
+        List<BaseRidInfo> ridList = baseRidInfoMapper.selectList(queryWrapper);
+        Map<Integer, String> roadNameMap = ridList.stream().collect(Collectors.toMap(o->o.getInDir(),o->o.getName()));
+
+
         List<LaneInfoPO> laneInfoPOList = laneInfoMapper.selectBycrossId(crossId);
         Map<Integer, List<LaneInfoPO>> collect = laneInfoPOList.stream()
                 .collect(Collectors.groupingBy(LaneInfoPO::getDir));
+
         for (Map.Entry<Integer, List<LaneInfoPO>> entry : collect.entrySet()) {
             Integer key = entry.getKey();
             DirListElement dirListElement = new DirListElement();
             dirListElement.setDir(key);
+            dirListElement.setRoadName(roadNameMap.get(key));
+
             // 查询拥堵状态、排队长度和指数
             CrossDirDataRealtimePO crossDirDataRealtimePO =
                     crossDirDataRealtimeMapper.selectByCrossIdAndDirType(crossId, key);
@@ -751,4 +767,8 @@ public class DiagnoServiceImpl implements DiagnoService {
             phaseOptTimeList.add(phaseOptTime);
         }
     }
+
+    public static void main(String[] args) {
+        System.out.println(UUID.randomUUID().toString());
+    }
 }