[update] 场景列表增加方法排序

signal-optimize-service/src/main/java/net/wanji/opt/controller/strategy/IdeaController.java

@@ -10,7 +10,7 @@ import net.wanji.opt.dto.IntegerIdsDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateIdeaDTO;
 import net.wanji.opt.dto.strategy.QueryIdeaDTO;
 import net.wanji.opt.po.strategy.IdeaPO;
-import net.wanji.opt.service.strategy.impl.IdeaServiceImpl;
+import net.wanji.opt.service.strategy.IdeaService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,9 +28,9 @@ import javax.ws.rs.core.MediaType;
 @RequestMapping("/idea")
 @RestController
 public class IdeaController {
-    private final IdeaServiceImpl ideaService;
+    private final IdeaService ideaService;
 
-    public IdeaController(IdeaServiceImpl ideaService) {
+    public IdeaController(IdeaService ideaService) {
         this.ideaService = ideaService;
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/controller/strategy/SceneController.java

@@ -9,7 +9,7 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.opt.dto.IntegerIdsDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.dto.strategy.QuerySceneDTO;
-import net.wanji.opt.service.strategy.impl.SceneServiceImpl;
+import net.wanji.opt.service.strategy.SceneService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,9 +27,9 @@ import javax.ws.rs.core.MediaType;
 @RequestMapping("/scene")
 @RestController
 public class SceneController {
-    private final SceneServiceImpl sceneService;
+    private final SceneService sceneService;
 
-    public SceneController(SceneServiceImpl sceneService) {
+    public SceneController(SceneService sceneService) {
         this.sceneService = sceneService;
     }
 

signal-optimize-service/src/main/java/net/wanji/opt/controller/strategy/StrategyController.java

@@ -10,7 +10,7 @@ import net.wanji.opt.dto.IntegerIdsDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateStrategyDTO;
 import net.wanji.opt.dto.strategy.QueryStrategyDTO;
 import net.wanji.opt.po.strategy.StrategyPO;
-import net.wanji.opt.service.strategy.impl.StrategyServiceImpl;
+import net.wanji.opt.service.strategy.StrategyService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,9 +28,9 @@ import javax.ws.rs.core.MediaType;
 @RequestMapping("/strategy")
 @RestController
 public class StrategyController {
-    private final StrategyServiceImpl strategyService;
+    private final StrategyService strategyService;
 
-    public StrategyController(StrategyServiceImpl strategyService) {
+    public StrategyController(StrategyService strategyService) {
         this.strategyService = strategyService;
     }
 

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

@@ -46,5 +46,7 @@ public class AddOrUpdateSceneDTO {
         private Integer ideaId;
         @ApiModelProperty(value = "方法名称",required = true,notes = "")
         private String ideaName;
+        @ApiModelProperty(value = "返回顺序",required = true,notes = "")
+        private Integer order;
     }
 }

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

@@ -19,6 +19,8 @@ public class SceneStrategyIdeaPO {
     private Integer strategyId ;
     @ApiModelProperty(name = "方法ID",notes = "")
     private Integer ideaId ;
+    @ApiModelProperty(name = "返回顺序",notes = "")
+    private Integer ideaOrder;
     @ApiModelProperty(name = "创建时间",notes = "")
     private Date gmtCreate ;
     @ApiModelProperty(name = "修改时间",notes = "")

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -92,6 +93,7 @@ public class SceneServiceImpl implements SceneService {
                 sceneStrategyIdeaPO.setStrategyId(strategyId);
                 Integer ideaId = idea.getIdeaId();
                 sceneStrategyIdeaPO.setIdeaId(ideaId);
+                sceneStrategyIdeaPO.setIdeaOrder(idea.getOrder());
                 sceneStrategyIdeaMapper.insertOne(sceneStrategyIdeaPO);
             }
         }
@@ -174,8 +176,11 @@ public class SceneServiceImpl implements SceneService {
             IdeaPO ideaPO = ideaMapper.selectById(ideaId);
             ideaListElement.setIdeaId(ideaId);
             ideaListElement.setIdeaName(ideaPO.getIdeaName());
+            Integer order = sceneStrategyIdeaPO.getIdeaOrder();
+            ideaListElement.setOrder(order);
             ideaList.add(ideaListElement);
         }
+        ideaList.sort(Comparator.comparing(AddOrUpdateSceneDTO.IdeaListElement::getOrder));
         return ideaList;
     }
 }

signal-optimize-service/src/main/resources/mapper/strategy/SceneStrategyIdeaMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="net.wanji.opt.dao.mapper.strategy.SceneStrategyIdeaMapper">
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_strategy_scene_strategy_idea(scene_id,strategy_id,idea_id)
-        values (#{sceneId},#{strategyId},#{ideaId})
+        insert into t_strategy_scene_strategy_idea(scene_id,strategy_id,idea_id,idea_order)
+        values (#{sceneId},#{strategyId},#{ideaId},#{ideaOrder})
     </insert>
 
     <delete id="deleteBySceneIds">
@@ -33,7 +33,7 @@
 
     <select id="selectBySceneIdAndStrategyId" resultType="net.wanji.opt.po.strategy.SceneStrategyIdeaPO">
         select
-            id,scene_id,strategy_id,idea_id,gmt_create,gmt_modified
+            id,scene_id,strategy_id,idea_id,idea_order,gmt_create,gmt_modified
         from t_strategy_scene_strategy_idea
         where scene_id = #{sceneId} and strategy_id = #{strategyId}
     </select>