[update] 信号机方案同步-修改灯组数据

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossLightsPO.java

@@ -19,6 +19,7 @@ public class CrossLightsPO {
     private String lightsNo ;
     /** 灯组类型：机动车（1圆饼灯；2左转灯；3直行灯；4右转灯；5掉头灯；）；非机动车（10非机动车灯；11左转灯；12直行灯；13右转灯；14掉头灯）；20行人灯；21行人进口灯；22行人出口灯；30公交专用灯 */
     @ApiModelProperty(name = "灯组类型：机动车（1圆饼灯；2左转灯；3直行灯；4右转灯；5掉头灯；）；非机动车（10非机动车灯；11左转灯；12直行灯；13右转灯；14掉头灯）；20行人灯；21行人进口灯；22行人出口灯；30公交专用灯",notes = "")
+    // 来自UTC时，灯组类型：1箭头，2圆饼，3行人
     private Integer type ;
     /** 灯组放行方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北 */
     @ApiModelProperty(name = "灯组放行方向：1北；2东北；3东；4东南；5南；6西南；7西；8西北",notes = "")
@@ -29,6 +30,12 @@ public class CrossLightsPO {
     /** 路口ID */
     @ApiModelProperty(name = "路口ID",notes = "")
     private String crossId ;
+    /** 车道转向，用于接收UTC回传数据 */
+    @ApiModelProperty(name = "车道转向：1左转；2直行；3右转；4掉头；5直左；6直右；7左直右；8左右；9左转掉头；10直行掉头；11右转掉头；12左直掉头；13直右掉头；14左直右掉头；15左右掉头",notes = "")
+    private Integer turn ;
+    /** 行人进出口，用于接收UTC回传数据 */
+    @ApiModelProperty(name = "行人进出口：1进口，2出口，3进出口",notes = "")
+    private Integer inOutType ;
     /** 创建时间 */
     @ApiModelProperty(name = "创建时间",notes = "")
     private Date gmtCreate ;

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

@@ -286,6 +286,8 @@ public class PlanSendServiceImpl implements PlanSendService {
             crossLightsMapper.deleteByCrossId(crossId);
             // 保存旧灯组ID
             List<Integer> oldLightsIds = crossLightsList.stream().map(CrossLightsPO::getId).collect(Collectors.toList());
+            // 修改灯组数据内容
+            changeLightsData(crossLightsList);
             // 保存新灯组ID
             crossLightsMapper.insertBatch(crossLightsList);
             List<Integer> newLightsIds = crossLightsList.stream().map(CrossLightsPO::getId).collect(Collectors.toList());
@@ -309,6 +311,35 @@ public class PlanSendServiceImpl implements PlanSendService {
         return jsonViewObject.success();
     }
 
+    private static void changeLightsData(List<CrossLightsPO> crossLightsList) {
+        for (CrossLightsPO crossLightsPO : crossLightsList) {
+            Integer type = crossLightsPO.getType();
+            if (type == 2) {
+                crossLightsPO.setType(1);
+            } else if (type == 1) {
+                int turn = crossLightsPO.getTurn();
+                if (turn == 1) {
+                    crossLightsPO.setType(2);
+                } else if (turn == 2) {
+                    crossLightsPO.setType(3);
+                } else if (turn == 3) {
+                    crossLightsPO.setType(4);
+                } else if (turn == 4) {
+                    crossLightsPO.setType(5);
+                }
+            } else if (type == 3) {
+                Integer inOutType = crossLightsPO.getInOutType();
+                if (inOutType == 3) {
+                    crossLightsPO.setType(20);
+                } else if (inOutType == 1) {
+                    crossLightsPO.setType(21);
+                } else if (inOutType == 2) {
+                    crossLightsPO.setType(22);
+                }
+            }
+        }
+    }
+
     @Override
     public PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO) {
         PhaseListByTimeVO phaseListByTimeVO = new PhaseListByTimeVO();