[add] 策略库管理保存添加策略编号唯一校验

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

@@ -163,7 +163,7 @@ public class StrategyControlController {
         return strategyControlService.strategyFactoryList(null);
     }
 
-    @ApiOperation(value = "策略管理计划保存", notes = "策略管理计划列表查询",
+    @ApiOperation(value = "策略库管理保存", notes = "策略库管理保存",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/strategyFactorySave",

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

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.Constants;
 import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.common.utils.OkHttpClientUtil;
 import net.wanji.common.utils.tool.DateUtil;
 import net.wanji.common.utils.tool.JacksonUtils;
 import net.wanji.databus.dao.entity.GreenwaveInfoPO;
@@ -23,7 +22,6 @@ import net.wanji.opt.cache.GreenWaveInfoCache;
 import net.wanji.opt.common.enums.GreenBeltDirEnum;
 import net.wanji.opt.common.enums.StrategyControlEnum;
 import net.wanji.opt.dao.mapper.*;
-import net.wanji.opt.dto.StrategyOptTimesDTO;
 import net.wanji.opt.po.StrategyGreenOptHistEntity;
 import net.wanji.opt.synthesis.enums.StrategyCrossAlgoEnum;
 import net.wanji.opt.synthesis.pojo.*;
@@ -782,23 +780,23 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 }
 
                 List<StrategyControlDetailList.DailyPlan> dailyPlans = list.getDailyPlans();
-               if (!CollectionUtils.isEmpty(dailyPlans)) {
-                   StrategyControlDetailList.DailyPlan dailyPlan1 = dailyPlans.get(0);
-                   LambdaQueryWrapper<StrategyDailyPlanInfoEntity> delete = new LambdaQueryWrapper<>();
-                   delete.eq(StrategyDailyPlanInfoEntity::getCrossId, dailyPlan1.getCrossId());
-                   strategyDailyPlanInfoMapper.delete(delete);
-                   for (StrategyControlDetailList.DailyPlan dailyPlan : dailyPlans) {
-                       Integer dailyPlanId = dailyPlan.getDailyPlanId();
-                       String crossId = dailyPlan.getCrossId();
-                       List<StrategyControlDetailList.DailyPlan.DailyPlanDetail> dailyPlanDetails = dailyPlan.getDailyPlanDetails();
-                       StrategyDailyPlanInfoEntity dailyPlanInfoEntity = new StrategyDailyPlanInfoEntity();
-                       dailyPlanInfoEntity.setCrossId(crossId);
-                       dailyPlanInfoEntity.setDailyPlanId(dailyPlanId);
-                       dailyPlanInfoEntity.setName(dailyPlan.getName());
-                       dailyPlanInfoEntity.setDailyPlanDetails(mapper.writeValueAsString(dailyPlanDetails));
-                       strategyDailyPlanInfoMapper.insert(dailyPlanInfoEntity);
-                   }
-               }
+                if (!CollectionUtils.isEmpty(dailyPlans)) {
+                    StrategyControlDetailList.DailyPlan dailyPlan1 = dailyPlans.get(0);
+                    LambdaQueryWrapper<StrategyDailyPlanInfoEntity> delete = new LambdaQueryWrapper<>();
+                    delete.eq(StrategyDailyPlanInfoEntity::getCrossId, dailyPlan1.getCrossId());
+                    strategyDailyPlanInfoMapper.delete(delete);
+                    for (StrategyControlDetailList.DailyPlan dailyPlan : dailyPlans) {
+                        Integer dailyPlanId = dailyPlan.getDailyPlanId();
+                        String crossId = dailyPlan.getCrossId();
+                        List<StrategyControlDetailList.DailyPlan.DailyPlanDetail> dailyPlanDetails = dailyPlan.getDailyPlanDetails();
+                        StrategyDailyPlanInfoEntity dailyPlanInfoEntity = new StrategyDailyPlanInfoEntity();
+                        dailyPlanInfoEntity.setCrossId(crossId);
+                        dailyPlanInfoEntity.setDailyPlanId(dailyPlanId);
+                        dailyPlanInfoEntity.setName(dailyPlan.getName());
+                        dailyPlanInfoEntity.setDailyPlanDetails(mapper.writeValueAsString(dailyPlanDetails));
+                        strategyDailyPlanInfoMapper.insert(dailyPlanInfoEntity);
+                    }
+                }
             }
             StrategyControlVO strategyControlVO = convertDataList(list);
             StrategyControlReq req = convertReq(strategyControlVO);
@@ -1074,6 +1072,12 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             if (Objects.nonNull(entity.getId())) {
                 strategyFactoryMapper.updateById(entity);
             } else {
+                LambdaQueryWrapper<StrategyFactoryEntity> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(StrategyFactoryEntity::getStrategyNo, entity.getStrategyNo());
+                List<StrategyFactoryEntity> entities = strategyFactoryMapper.selectList(queryWrapper);
+                if (Objects.nonNull(entities) && entities.size() > 0) {
+                    return jsonViewObject.fail("策略编号重复");
+                }
                 strategyFactoryMapper.insert(entity);
             }
         } catch (Exception e) {