方案管理，增加判空逻辑

signal-control-service/src/main/java/net/wanji/web/dto/SaveSchemeConfigDTO.java

@@ -25,9 +25,9 @@ public class SaveSchemeConfigDTO {
         @ApiModelProperty(value = "方案名称", required = true)
         private String name;
         @ApiModelProperty(value = "协调相位号", required = true)
-        private String coordPhaseNo;
+        private String coordPhaseNo = "";
         @ApiModelProperty(value = "周期", required = true)
-        private Integer cycle;
+        private Integer cycle = 0;
         @ApiModelProperty(value = "相位差", required = true)
         private Integer offset;
         private List<RingListElement> ringList; // 环列表
@@ -57,21 +57,21 @@ public class SaveSchemeConfigDTO {
         @ApiModelProperty(value = "相位类型 1实相位 2虚相位 3伴随相位", required = true)
         private Integer phaseType;
         @ApiModelProperty(value = "最小绿灯时间", required = true)
-        private Integer minGreenTime;
+        private Integer minGreenTime = 0;
         @ApiModelProperty(value = "最大绿灯时间", required = true)
-        private Integer maxGreenTime;
+        private Integer maxGreenTime = 0;
         @ApiModelProperty(value = "绿灯时间", required = true)
-        private Integer greenTime;
+        private Integer greenTime = 0;
         @ApiModelProperty(value = "绿闪时间", required = true)
-        private Integer greenFlashTime;
+        private Integer greenFlashTime = 0;
         @ApiModelProperty(value = "黄闪时间", required = true)
-        private Integer yellowFlashTime;
+        private Integer yellowFlashTime = 0;
         @ApiModelProperty(value = "红闪时间", required = true)
-        private Integer redFlashTime;
+        private Integer redFlashTime = 0;
         @ApiModelProperty(value = "黄灯时间", required = true)
-        private Integer yellowTime;
+        private Integer yellowTime = 0;
         @ApiModelProperty(value = "红灯时间", required = true)
-        private Integer redTime;
+        private Integer redTime = 0;
         @ApiModelProperty(value = "是否黄闪 0否 1是", required = true)
         private Integer yellowFlash = 0;
         @ApiModelProperty(value = "是否红灯 0否 1是", required = true)

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

@@ -133,8 +133,12 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
             phaseScheme.setName(crossSchemePO.getName());
             // 获取协调相位号
             Integer coordPhaseId = crossSchemePO.getCoordPhase();
-            CrossPhasePO crossPhasePO = crossPhaseMapper.selectById(coordPhaseId);
-            phaseScheme.setCoordPhaseNo(crossPhasePO.getPhaseNo());
+            if (coordPhaseId != null) {
+                CrossPhasePO crossPhasePO = crossPhaseMapper.selectById(coordPhaseId);
+                if (crossPhasePO != null) {
+                    phaseScheme.setCoordPhaseNo(crossPhasePO.getPhaseNo());
+                }
+            }
             phaseScheme.setCycle(crossSchemePO.getCycle());
             phaseScheme.setOffset(crossSchemePO.getOffset());
             // 构造环列表
@@ -426,7 +430,9 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
             Integer schemeId = crossSchemeMapper.selectIdByCrossIdAndSchemeNo(crossId, schemeNo);
             String coordPhaseNo = phaseScheme.getCoordPhaseNo();
             Integer phaseId = crossPhaseMapper.selectIdByCrossIdAndPhaseNo(crossId, schemeId, coordPhaseNo);
-            crossSchemeMapper.updateCoordPhase(crossId, schemeNo, phaseId);
+            if (phaseId != null) {
+                crossSchemeMapper.updateCoordPhase(crossId, schemeNo, phaseId);
+            }
         }
     }