[update] 灯组列表展示

signal-control-service/src/main/java/net/wanji/web/common/enums/CrossLisghtsLaneDirEnum.java

@@ -20,6 +20,13 @@ public enum CrossLisghtsLaneDirEnum {
     private final int laneDir;
     private final String msg;
 
+
+    /**
+     * 通过灯组方向获取车道方向
+     *
+     * @param lightDir
+     * @return
+     */
     public static Integer getLaneDirByLightsDir(Integer lightDir) {
         CrossLisghtsLaneDirEnum[] values = CrossLisghtsLaneDirEnum.values();
         for (CrossLisghtsLaneDirEnum value : values) {
@@ -30,10 +37,17 @@ public enum CrossLisghtsLaneDirEnum {
         return null;
     }
 
-    public static Integer getBackByFront(Integer frontCode) {
-        for (CrossTurnEnum value : CrossTurnEnum.values()) {
-            if (value.getFrontCode() == frontCode) {
-                return value.getBackCode();
+    /**
+     * 通过车道方向获取灯组方向
+     *
+     * @param laneDir
+     * @return
+     */
+    public static Integer getLightsDirByLaneDir(Integer laneDir) {
+        CrossLisghtsLaneDirEnum[] values = CrossLisghtsLaneDirEnum.values();
+        for (CrossLisghtsLaneDirEnum value : values) {
+            if (Objects.equals(value.getLaneDir(), laneDir)) {
+                return  value.getLightDir();
             }
         }
         return null;

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

@@ -8,6 +8,7 @@ import net.wanji.databus.dao.mapper.CrossDirDataRealtimeMapper;
 import net.wanji.databus.dao.mapper.CrossTurnDataHistMapper;
 import net.wanji.databus.po.CrossDataRealtimePO;
 import net.wanji.databus.po.CrossDirDataRealtimePO;
+import net.wanji.web.common.enums.CrossLisghtsLaneDirEnum;
 import net.wanji.web.common.enums.LightsAddressEnum;
 import net.wanji.web.common.exception.LightLaneConflictException;
 import net.wanji.web.common.exception.RidInfoException;
@@ -341,8 +342,9 @@ public class CrossConfigServiceImpl implements CrossConfigService {
                 ledConfigListElement.setType(3);
                 ledConfigListElement.setSignalType(7);
             }
-            // 灯组放行方向
-            Integer dir = crossLightsPO.getDir();
+            // 灯组放行方向  转化为灯组方向
+            Integer laneDir = crossLightsPO.getDir();
+            Integer dir = CrossLisghtsLaneDirEnum.getLightsDirByLaneDir(laneDir);
             if (type < 20 || type >= 30) { // 非行人灯
                 String address = LightsAddressEnum.getMsgByCode(dir);
                 ledConfigListElement.setAddress(address);

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import net.wanji.common.dto.CrossIdDTO;
 import net.wanji.web.common.constant.ControlModeConst;
+import net.wanji.web.common.enums.CrossLisghtsLaneDirEnum;
 import net.wanji.web.common.exception.NoLanesException;
 import net.wanji.web.common.exception.PhaseNoNotUniqueException;
 import net.wanji.web.dto.LaneIdDTO;
@@ -333,8 +334,8 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
         for (Integer dir : dirSet) {
             SaveSchemeConfigDTO.DirListElement dirListElement = new SaveSchemeConfigDTO.DirListElement();
             // 前端灯组方向就是车道方向
-//            Integer laneDir = CrossLisghtsLaneDirEnum.getLaneDirByLightsDir(dir);
-            dirListElement.setDir(dir);
+            Integer laneDir = CrossLisghtsLaneDirEnum.getLaneDirByLightsDir(dir);
+            dirListElement.setDir(laneDir);
             // 是否有行人相位
             List<CrossLightsPO> crossLightsPOList = crossLightsMapper.selectByCrossIdAndDir(crossId, dir);
             for (CrossLightsPO crossLightsPO : crossLightsPOList) {