[add] 策略库优化;

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/controller/StrategyControlController.java

@@ -141,14 +141,26 @@ public class StrategyControlController {
     @ApiOperation(value = "策略库分页查询列表", notes = "策略库分页查询列表",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
-    @PostMapping(value = "/strategyFactoryList")
+    @PostMapping(value = "/strategyFactoryPageList",
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = StrategyFactoryEntity.class),
     })
-    public JsonViewObject strategyFactoryList(@RequestBody StrategyFactoryQueryVO vo) throws Exception {
+    public JsonViewObject strategyFactoryPageList(@RequestBody StrategyFactoryQueryVO vo) throws Exception {
         return strategyControlService.strategyFactoryList(vo);
     }
 
+    @ApiOperation(value = "策略库查询列表", notes = "策略库分页查询列表",
+            response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @GetMapping(value = "/strategyFactoryList")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = StrategyFactoryEntity.class),
+    })
+    public JsonViewObject strategyFactoryList() throws Exception {
+        return strategyControlService.strategyFactoryList(null);
+    }
+
     @ApiOperation(value = "策略管理计划保存", notes = "策略管理计划列表查询",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)

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

@@ -186,7 +186,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             }
 //            LocalDateTime localDateTime = Objects.equals(0, groupType) ? DateUtil.getPlusHour(-1) : DateUtil.getMidNight();
             LocalDateTime localDateTime = null;
-            switch(groupType){
+            switch (groupType) {
                 case 0:
                     localDateTime = DateUtil.getPlusHour(-1);
                     break;
@@ -868,26 +868,31 @@ public class StrategyControlServiceImpl implements StrategyControlService {
 
     @Override
     public JsonViewObject strategyFactoryList(StrategyFactoryQueryVO vo) throws Exception {
-        Page<StrategyFactoryEntity> page = new Page<>(vo.getCurrentPage(), vo.getPageSize());
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         LambdaQueryWrapper<StrategyFactoryEntity> queryWrapper = new LambdaQueryWrapper<>();
-        if (Objects.nonNull(vo.getType())) {
-            queryWrapper.eq(StrategyFactoryEntity::getType, vo.getType());
-        }
-        if (Objects.nonNull(vo.getScene())) {
-            queryWrapper.eq(StrategyFactoryEntity::getScene, vo.getScene());
-        }
-        if (StringUtils.isNotBlank(vo.getStrategyName())) {
-            queryWrapper.eq(StrategyFactoryEntity::getStrategyName, vo.getStrategyName());
-        }
-        if (StringUtils.isNotBlank(vo.getStrategyNo())) {
-            queryWrapper.eq(StrategyFactoryEntity::getStrategyNo, vo.getStrategyNo());
-        }
-        if (StringUtils.isNotBlank(vo.getCompany())) {
-            queryWrapper.eq(StrategyFactoryEntity::getCompany, vo.getCompany());
+        if (Objects.isNull(vo)) {
+            List<StrategyFactoryEntity> result = strategyFactoryMapper.selectList(queryWrapper);
+            jsonViewObject.success(result);
+        } else {
+            Page<StrategyFactoryEntity> page = new Page<>(vo.getCurrentPage(), vo.getPageSize());
+            if (Objects.nonNull(vo.getType())) {
+                queryWrapper.eq(StrategyFactoryEntity::getType, vo.getType());
+            }
+            if (Objects.nonNull(vo.getScene())) {
+                queryWrapper.eq(StrategyFactoryEntity::getScene, vo.getScene());
+            }
+            if (StringUtils.isNotBlank(vo.getStrategyName())) {
+                queryWrapper.eq(StrategyFactoryEntity::getStrategyName, vo.getStrategyName());
+            }
+            if (StringUtils.isNotBlank(vo.getStrategyNo())) {
+                queryWrapper.eq(StrategyFactoryEntity::getStrategyNo, vo.getStrategyNo());
+            }
+            if (StringUtils.isNotBlank(vo.getCompany())) {
+                queryWrapper.eq(StrategyFactoryEntity::getCompany, vo.getCompany());
+            }
+            Page<StrategyFactoryEntity> result = strategyFactoryMapper.selectPage(page, queryWrapper);
+            jsonViewObject.success(result);
         }
-        Page<StrategyFactoryEntity> strategyFactoryEntityPage = strategyFactoryMapper.selectPage(page, queryWrapper);
-        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-        jsonViewObject.success(strategyFactoryEntityPage);
         return jsonViewObject;
     }