[update] 策略管理-加入分页

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

 package net.wanji.opt.controller.strategy;
 
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -16,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.core.MediaType;
-import java.util.List;
 
 /**
  * 策略管理-方法库
@@ -70,7 +70,7 @@ public class IdeaController {
             @ApiResponse(code = 200, message = "OK", response = IdeaPO.class),
     })
     public JsonViewObject queryIdea(@RequestBody QueryIdeaDTO queryIdeaDTO) {
-        List<IdeaPO> ideaPOList = ideaService.queryIdea(queryIdeaDTO);
+        PageInfo<IdeaPO> ideaPOList = ideaService.queryIdea(queryIdeaDTO);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
 
         return jsonViewObject.success(ideaPOList);

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

 package net.wanji.opt.controller.strategy;
 
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.core.MediaType;
-import java.util.List;
 
 /**
  * 策略管理-场景库
@@ -69,7 +69,7 @@ public class SceneController {
             @ApiResponse(code = 200, message = "OK", response = AddOrUpdateSceneDTO.class),
     })
     public JsonViewObject queryScene(@RequestBody QuerySceneDTO querySceneDTO) {
-        List<AddOrUpdateSceneDTO> sceneList = sceneService.queryScene(querySceneDTO);
+        PageInfo<AddOrUpdateSceneDTO> sceneList = sceneService.queryScene(querySceneDTO);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
 
         return jsonViewObject.success(sceneList);

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

 package net.wanji.opt.controller.strategy;
 
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -70,7 +71,7 @@ public class StrategyController {
             @ApiResponse(code = 200, message = "OK", response = StrategyPO.class),
     })
     public JsonViewObject queryStrategy(@RequestBody QueryStrategyDTO queryStrategyDTO) {
-        List<StrategyPO> strategyPOList = strategyService.queryStrategy(queryStrategyDTO);
+        PageInfo<StrategyPO> strategyPOList = strategyService.queryStrategy(queryStrategyDTO);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
 
         return jsonViewObject.success(strategyPOList);

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

@@ -15,4 +15,8 @@ public class QueryIdeaDTO {
     private String ideaName ;
     @ApiModelProperty(value = "应用对象 1路口；2干线；3区域",notes = "")
     private Integer ideaTarget;
+    @ApiModelProperty(value = "页码", required = true, notes = "")
+    private Integer pageNum;
+    @ApiModelProperty(value = "每页记录条数", required = true, notes = "")
+    private Integer pageSize;
 }

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

@@ -15,4 +15,8 @@ public class QuerySceneDTO {
     private String sceneName ;
     @ApiModelProperty(value = "应用对象 1路口；2干线；3区域",required = true,notes = "")
     private Integer sceneTarget;
+    @ApiModelProperty(value = "页码", required = true, notes = "")
+    private Integer pageNum;
+    @ApiModelProperty(value = "每页记录条数", required = true, notes = "")
+    private Integer pageSize;
 }

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

@@ -15,4 +15,8 @@ public class QueryStrategyDTO {
     private String strategyName ;
     @ApiModelProperty(value = "应用对象 1路口；2干线；3区域",notes = "")
     private Integer strategyTarget;
+    @ApiModelProperty(value = "页码", required = true, notes = "")
+    private Integer pageNum;
+    @ApiModelProperty(value = "每页记录条数", required = true, notes = "")
+    private Integer pageSize;
 }

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

 package net.wanji.opt.service.strategy;
 
+import com.github.pagehelper.PageInfo;
 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 java.util.List;
-
 /**
  * @author hanbing
  * @date 2023/1/12 15:12
@@ -19,5 +18,5 @@ public interface IdeaService {
 
     void deleteIdea(IntegerIdsDTO integerIdsDTO);
 
-    List<IdeaPO> queryIdea(QueryIdeaDTO queryIdeaDTO);
+    PageInfo<IdeaPO> queryIdea(QueryIdeaDTO queryIdeaDTO);
 }

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

 package net.wanji.opt.service.strategy;
 
+import com.github.pagehelper.PageInfo;
 import net.wanji.opt.dto.IntegerIdsDTO;
 import net.wanji.opt.dto.strategy.AddOrUpdateSceneDTO;
 import net.wanji.opt.dto.strategy.QuerySceneDTO;
 
-import java.util.List;
-
 /**
  * @author hanbing
  * @date 2023/1/12 15:12
@@ -17,5 +16,5 @@ public interface SceneService {
 
     void deleteScene(IntegerIdsDTO integerIdsDTO);
 
-    List<AddOrUpdateSceneDTO> queryScene(QuerySceneDTO querySceneDTO);
+    PageInfo<AddOrUpdateSceneDTO> queryScene(QuerySceneDTO querySceneDTO);
 }

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

 package net.wanji.opt.service.strategy;
 
+import com.github.pagehelper.PageInfo;
 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 java.util.List;
-
 /**
  * @author hanbing
  * @date 2023/1/12 15:12
@@ -19,5 +18,5 @@ public interface StrategyService {
 
     void deleteStrategy(IntegerIdsDTO integerIdsDTO);
 
-    List<StrategyPO> queryStrategy(QueryStrategyDTO queryStrategyDTO);
+    PageInfo<StrategyPO> queryStrategy(QueryStrategyDTO queryStrategyDTO);
 }

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

 package net.wanji.opt.service.strategy.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import net.wanji.opt.dao.mapper.strategy.IdeaMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyIdeaMapper;
 import net.wanji.opt.dto.IntegerIdsDTO;
@@ -60,8 +62,12 @@ public class IdeaServiceImpl implements IdeaService {
     }
 
     @Override
-    public List<IdeaPO> queryIdea(QueryIdeaDTO queryIdeaDTO) {
+    public PageInfo<IdeaPO> queryIdea(QueryIdeaDTO queryIdeaDTO) {
+        Integer pageNum = queryIdeaDTO.getPageNum();
+        Integer pageSize = queryIdeaDTO.getPageSize();
+        PageHelper.startPage(pageNum, pageSize);
         List<IdeaPO> ideaPOList = ideaMapper.selectByIdeaNameAndIdeaTarget(queryIdeaDTO);
-        return ideaPOList;
+        PageInfo<IdeaPO> ideaPOPageInfo = new PageInfo<>(ideaPOList);
+        return ideaPOPageInfo;
     }
 }

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

 package net.wanji.opt.service.strategy.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import net.wanji.opt.dao.mapper.strategy.IdeaMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyIdeaMapper;
@@ -15,6 +17,7 @@ import net.wanji.opt.po.strategy.SceneStrategyIdeaPO;
 import net.wanji.opt.po.strategy.SceneStrategyPO;
 import net.wanji.opt.po.strategy.StrategyPO;
 import net.wanji.opt.service.strategy.SceneService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -113,11 +116,15 @@ public class SceneServiceImpl implements SceneService {
     }
 
     @Override
-    public List<AddOrUpdateSceneDTO> queryScene(QuerySceneDTO querySceneDTO) {
+    public PageInfo<AddOrUpdateSceneDTO> queryScene(QuerySceneDTO querySceneDTO) {
         List<AddOrUpdateSceneDTO> res = new ArrayList<>();
         String sceneName = querySceneDTO.getSceneName();
         Integer sceneTarget = querySceneDTO.getSceneTarget();
+        Integer pageNum = querySceneDTO.getPageNum();
+        Integer pageSize = querySceneDTO.getPageSize();
+        PageHelper.startPage(pageNum, pageSize);
         List<ScenePO> scenePOList = sceneMapper.selectByNameAndTarget(sceneName, sceneTarget);
+        PageInfo<ScenePO> scenePOPageInfo = new PageInfo<>(scenePOList);
         for (ScenePO scenePO : scenePOList) {
             AddOrUpdateSceneDTO addOrUpdateSceneDTO = new AddOrUpdateSceneDTO();
             Integer id = scenePO.getId();
@@ -133,7 +140,10 @@ public class SceneServiceImpl implements SceneService {
             addOrUpdateSceneDTO.setStrategyList(strategyList);
             res.add(addOrUpdateSceneDTO);
         }
-        return res;
+        PageInfo<AddOrUpdateSceneDTO> resPageInfo = new PageInfo<>();
+        BeanUtils.copyProperties(scenePOPageInfo, resPageInfo);
+        resPageInfo.setList(res);
+        return resPageInfo;
     }
 
     private List<AddOrUpdateSceneDTO.StrategyListElement> buildStrategyList(Integer sceneId) {

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

 package net.wanji.opt.service.strategy.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyIdeaMapper;
 import net.wanji.opt.dao.mapper.strategy.SceneStrategyMapper;
 import net.wanji.opt.dao.mapper.strategy.StrategyMapper;
@@ -64,8 +66,12 @@ public class StrategyServiceImpl implements StrategyService {
     }
 
     @Override
-    public List<StrategyPO> queryStrategy(QueryStrategyDTO queryStrategyDTO) {
+    public PageInfo<StrategyPO> queryStrategy(QueryStrategyDTO queryStrategyDTO) {
+        Integer pageNum = queryStrategyDTO.getPageNum();
+        Integer pageSize = queryStrategyDTO.getPageSize();
+        PageHelper.startPage(pageNum, pageSize);
         List<StrategyPO> strategyPOList = strategyMapper.selectByStrategyNameAndTarget(queryStrategyDTO);
-        return strategyPOList;
+        PageInfo<StrategyPO> strategyPOPageInfo = new PageInfo<>(strategyPOList);
+        return strategyPOPageInfo;
     }
 }