Merge remote-tracking branch 'origin/master'

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

@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.util.List;
@@ -32,6 +34,7 @@ public class AddOrUpdateSceneDTO {
     private Integer secneTarget;
     @ApiModelProperty(value = "应用策略",required = true,notes = "")
     @Valid
+    @NotEmpty(message = "策略不可为空")
     private List<StrategyListElement> strategyList;
 
     @NoArgsConstructor
@@ -43,8 +46,10 @@ public class AddOrUpdateSceneDTO {
         private String strategyName;
         @ApiModelProperty(value = "优先级",required = true,notes = "")
         @NotNull(message = "优先级不可为空")
+        @Range(min = 1, max = 99, message = "优先级为1至99数字")
         private Integer priority;
         @ApiModelProperty(value = "优化方法",required = true,notes = "")
+        @NotEmpty(message = "方法不可为空")
         private List<IdeaListElement> ideaList;
 
     }

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

@@ -78,7 +78,8 @@ public class DiagnoServiceImpl implements DiagnoService {
                              SceneService sceneService, SceneMapper sceneMapper, CrossDirInfoMapper crossDirInfoMapper,
                              RidInfoMapper ridInfoMapper, CrossSchemeOptLogMapper crossSchemeOptLogMapper,
                              CrossSchemeMapper crossSchemeMapper, CrossPhaseMapper crossPhaseMapper,
-                             FeignProxyService feignProxyService, CrossDataHistMapper crossDataHistMapper, CrossDirDataHistMapper crossDirDataHistMapper) {
+                             FeignProxyService feignProxyService, CrossDataHistMapper crossDataHistMapper,
+                             CrossDirDataHistMapper crossDirDataHistMapper) {
         this.crossInfoMapper = crossInfoMapper;
         this.crossDataRealtimeMapper = crossDataRealtimeMapper;
         this.sceneService = sceneService;

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

@@ -36,23 +36,24 @@ public class IdeaServiceImpl implements IdeaService {
         if (ObjectUtil.isEmpty(id) || id == 0) {
             // 不传ID为新增
             IdeaPO ideaPO = new IdeaPO();
-            ideaPO.setIdeaCode(addOrUpdateIdeaDTO.getIdeaCode());
-            ideaPO.setIdeaName(addOrUpdateIdeaDTO.getIdeaName());
-            ideaPO.setIdeaTarget(addOrUpdateIdeaDTO.getIdeaTarget());
-            ideaPO.setIdeaDetail(addOrUpdateIdeaDTO.getIdeaDetail());
+            fillData(addOrUpdateIdeaDTO, ideaPO);
             ideaMapper.insertOne(ideaPO);
         } else {
             // 传ID为修改
             IdeaPO ideaPO = new IdeaPO();
             ideaPO.setId(id);
-            ideaPO.setIdeaCode(addOrUpdateIdeaDTO.getIdeaCode());
-            ideaPO.setIdeaName(addOrUpdateIdeaDTO.getIdeaName());
-            ideaPO.setIdeaTarget(addOrUpdateIdeaDTO.getIdeaTarget());
-            ideaPO.setIdeaDetail(addOrUpdateIdeaDTO.getIdeaDetail());
+            fillData(addOrUpdateIdeaDTO, ideaPO);
             ideaMapper.updateOne(ideaPO);
         }
     }
 
+    private void fillData(AddOrUpdateIdeaDTO addOrUpdateIdeaDTO, IdeaPO ideaPO) {
+        ideaPO.setIdeaCode(addOrUpdateIdeaDTO.getIdeaCode());
+        ideaPO.setIdeaName(addOrUpdateIdeaDTO.getIdeaName());
+        ideaPO.setIdeaTarget(addOrUpdateIdeaDTO.getIdeaTarget());
+        ideaPO.setIdeaDetail(addOrUpdateIdeaDTO.getIdeaDetail());
+    }
+
     @Override
     public void deleteIdea(IntegerIdsDTO integerIdsDTO) {
         List<Integer> ids = integerIdsDTO.getIds();