Merge branch 'master' into feignClients

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

@@ -16,7 +16,7 @@ public class CrossLaneLightsPO {
     private Integer id ;
     /** 灯组ID */
     @ApiModelProperty(name = "灯组ID",notes = "")
-    private Integer lightsId ;
+    private Integer lightsId = 0 ;
     /** 车道ID */
     @ApiModelProperty(name = "车道ID",notes = "")
     private String laneId ;

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

@@ -19,7 +19,7 @@ public class CrossPhasePO {
     private String phaseNo ;
     /** 相位名称 */
     @ApiModelProperty(name = "相位名称",notes = "")
-    private String name ;
+    private String name = "";
     /** 相位序号 */
     @ApiModelProperty(name = "相位序号",notes = "")
     private Integer sort ;
@@ -49,7 +49,7 @@ public class CrossPhasePO {
     private Integer greenFlashTime ;
     /** 行闪时间 */
     @ApiModelProperty(name = "行闪时间",notes = "")
-    private Integer pedFlashTime ;
+    private Integer pedFlashTime = 0;
     /** 黄灯时间 */
     @ApiModelProperty(name = "黄灯时间",notes = "")
     private Integer yellowTime ;

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

@@ -28,7 +28,7 @@ public class CrossSchemePO {
     private Integer cycle ;
     /** 协调相位ID */
     @ApiModelProperty(name = "协调相位ID",notes = "")
-    private Integer coordPhase ;
+    private Integer coordPhase = 0 ;
     /** 相位差 */
     @ApiModelProperty(name = "相位差",notes = "")
     private Integer offset ;

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

@@ -53,7 +53,7 @@ public class LaneInfoPO {
      * 路段编号
      */
     @ApiModelProperty(name = "路段编号", notes = "")
-    private String rid;
+    private String rid = "";
     /**
      * 车道长度
      */

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

@@ -102,14 +102,19 @@ public class CrossConfigServiceImpl implements CrossConfigService {
             // 保存渠化数据
             handleLaneData(saveLaneInfoDTO);
         } else {
+            // 前端传过来的所有灯组代码列表
+            List<String> lightCodeList = new ArrayList<>();
             // 保存灯组设置
-            handleLightsData(saveLaneInfoDTO, ledConfigList);
+            handleLightsData(saveLaneInfoDTO, ledConfigList, lightCodeList);
             // 保存车道配置（灯组-车道关系表）
-            handleLaneConfig(saveLaneInfoDTO);
+            handleLaneConfig(saveLaneInfoDTO, lightCodeList);
+            if (lightCodeList.size() != 0) {
+                throw new RuntimeException("存在未配置的灯组号");
+            }
         }
     }
 
-    private void handleLaneConfig(SaveLaneInfoDTO saveLaneInfoDTO) {
+    private void handleLaneConfig(SaveLaneInfoDTO saveLaneInfoDTO, List<String> lightCodeList) {
         String crossId = saveLaneInfoDTO.getCrossId();
         List<DirListElement> dirList = saveLaneInfoDTO.getDirList();
         List<CrossLaneLightsPO> crossLaneLightsPOList = new ArrayList<>();
@@ -130,6 +135,8 @@ public class CrossConfigServiceImpl implements CrossConfigService {
                     CrossLightsPO crossLightsPO = crossLightsMapper.selectByCrossIdAndLedNum(crossId, ledNum);
                     Integer lightsId = crossLightsPO.getId();
                     crossLaneLightsPO.setLightsId(lightsId);
+                    // 用于判断灯组号是否都配置完成
+                    lightCodeList.remove(ledNum);
                 }
                 crossLaneLightsPOList.add(crossLaneLightsPO);
             }
@@ -138,12 +145,15 @@ public class CrossConfigServiceImpl implements CrossConfigService {
         crossLaneLightsMapper.insertBatch(crossLaneLightsPOList);
     }
 
-    private void handleLightsData(SaveLaneInfoDTO saveLaneInfoDTO, List<LedConfigListElement> ledConfigList) {
+    private void handleLightsData(SaveLaneInfoDTO saveLaneInfoDTO, List<LedConfigListElement> ledConfigList,
+                                  List<String> lightCodeList) {
         String crossId = saveLaneInfoDTO.getCrossId();
         List<CrossLightsPO> crossLightsPOList = new ArrayList<>();
         for (LedConfigListElement ledConfigListElement : ledConfigList) {
+            String lightCode = ledConfigListElement.getCode();
+            lightCodeList.add(lightCode);
             CrossLightsPO crossLightsPO = new CrossLightsPO();
-            crossLightsPO.setLightsNo(ledConfigListElement.getCode());
+            crossLightsPO.setLightsNo(lightCode);
             // 灯组类型
             setType(ledConfigListElement, crossLightsPO);
             // 灯组放行方向