[update] 修改场景列表ID字段名

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

@@ -30,7 +30,7 @@ public class AddOrUpdateSceneDTO {
     @Data
     public static class StrategyListElement {
         @ApiModelProperty(value = "策略ID",required = true,notes = "")
-        private Integer strategyId;
+        private Integer id;
         @ApiModelProperty(value = "策略名称",required = true,notes = "")
         private String strategyName;
         @ApiModelProperty(value = "优先级",required = true,notes = "")
@@ -43,7 +43,7 @@ public class AddOrUpdateSceneDTO {
     @Data
     public static class IdeaListElement {
         @ApiModelProperty(value = "方法ID",required = true,notes = "")
-        private Integer ideaId;
+        private Integer id;
         @ApiModelProperty(value = "方法名称",required = true,notes = "")
         private String ideaName;
         @ApiModelProperty(value = "返回顺序",required = true,notes = "")

signal-optimize-service/src/main/java/net/wanji/opt/po/strategy/IdeaPO.java

 package net.wanji.opt.po.strategy;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,7 +14,6 @@ import java.util.Date;
 public class IdeaPO {
     /** 方法ID */
     @ApiModelProperty(value = "方法ID",notes = "")
-    @JsonProperty("ideaId")
     private Integer id ;
     /** 编号 */
     @ApiModelProperty(value = "编号",notes = "")

signal-optimize-service/src/main/java/net/wanji/opt/po/strategy/StrategyPO.java

 package net.wanji.opt.po.strategy;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +13,6 @@ import java.util.Date;
 @Data
 public class StrategyPO {
     @ApiModelProperty(value = "策略ID",notes = "")
-    @JsonProperty("strategyId")
     private Integer id ;
     /** 编号 */
     @ApiModelProperty(value = "编号",notes = "")

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

@@ -80,7 +80,7 @@ public class SceneServiceImpl implements SceneService {
         for (AddOrUpdateSceneDTO.StrategyListElement strategy : strategyList) {
             SceneStrategyPO sceneStrategyPO = new SceneStrategyPO();
             sceneStrategyPO.setSceneId(id);
-            Integer strategyId = strategy.getStrategyId();
+            Integer strategyId = strategy.getId();
             sceneStrategyPO.setStrategyId(strategyId);
             Integer priority = strategy.getPriority();
             sceneStrategyPO.setSceneStrategyPriority(priority);
@@ -91,7 +91,7 @@ public class SceneServiceImpl implements SceneService {
                 SceneStrategyIdeaPO sceneStrategyIdeaPO = new SceneStrategyIdeaPO();
                 sceneStrategyIdeaPO.setSceneId(id);
                 sceneStrategyIdeaPO.setStrategyId(strategyId);
-                Integer ideaId = idea.getIdeaId();
+                Integer ideaId = idea.getId();
                 sceneStrategyIdeaPO.setIdeaId(ideaId);
                 sceneStrategyIdeaPO.setIdeaOrder(idea.getOrder());
                 sceneStrategyIdeaMapper.insertOne(sceneStrategyIdeaPO);
@@ -154,7 +154,7 @@ public class SceneServiceImpl implements SceneService {
         for (SceneStrategyPO sceneStrategyPO : sceneStrategyPOList) {
             AddOrUpdateSceneDTO.StrategyListElement strategyListElement = new AddOrUpdateSceneDTO.StrategyListElement();
             Integer strategyId = sceneStrategyPO.getStrategyId();
-            strategyListElement.setStrategyId(strategyId);
+            strategyListElement.setId(strategyId);
             StrategyPO strategyPO = strategyMapper.selectById(strategyId);
             strategyListElement.setStrategyName(strategyPO.getStrategyName());
             strategyListElement.setPriority(sceneStrategyPO.getSceneStrategyPriority());
@@ -174,7 +174,7 @@ public class SceneServiceImpl implements SceneService {
             AddOrUpdateSceneDTO.IdeaListElement ideaListElement = new AddOrUpdateSceneDTO.IdeaListElement();
             Integer ideaId = sceneStrategyIdeaPO.getIdeaId();
             IdeaPO ideaPO = ideaMapper.selectById(ideaId);
-            ideaListElement.setIdeaId(ideaId);
+            ideaListElement.setId(ideaId);
             ideaListElement.setIdeaName(ideaPO.getIdeaName());
             Integer order = sceneStrategyIdeaPO.getIdeaOrder();
             ideaListElement.setOrder(order);