[add] 策略日计划保存优化

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

 package net.wanji.opt.controllerv2.strategy;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.i18n.I18nResourceBundle;
 import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.opt.entity.eventoptimize.TEventOptimizeInfo;
 import net.wanji.opt.entity.strategy.StrategyParameterConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
 
@@ -14,19 +11,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroup;
+import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroupVO;
 import net.wanji.opt.servicev2.strategy.StrategyPriorityService;
 import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import net.wanji.opt.api.ResultGenerator;
 
 
-
-import javax.validation.Valid;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
-import java.util.Map;
 
 /**
 * <p>
@@ -115,7 +108,7 @@ public class StrategyPriorityController {
            @ApiImplicitParam(name = "dataList", value = "优先级配置数据", required = false, dataType = "String"),
     })
     @PostMapping("/savePriority")
-    public JsonViewObject savePriority(@RequestBody List<StrategyPriorityGroup>dataList){
+    public JsonViewObject savePriority(@RequestBody List<StrategyPriorityGroupVO>dataList){
         JsonViewObject jsonView = JsonViewObject.newInstance();
         try {
                strategyPriorityService.savePriority(dataList);
@@ -152,7 +145,7 @@ public class StrategyPriorityController {
             @ApiImplicitParam(name = "dailyPlanDetails", value = "日计划配置数据", required = false, dataType = "String"),
     })
     @PostMapping("/savePlanConfig")
-    public JsonViewObject savePlanConfig(@RequestBody List<StrategyPriorityGroup>dailyPlanDetails){
+    public JsonViewObject savePlanConfig(@RequestBody List<StrategyPriorityGroupVO>dailyPlanDetails){
         JsonViewObject jsonView = JsonViewObject.newInstance();
         try {
             strategyPriorityService.savePlanConfig(dailyPlanDetails);
@@ -189,10 +182,10 @@ public class StrategyPriorityController {
             @ApiImplicitParam(name = "strategyPriorityGroup", value = "参数配置数据", required = false, dataType = "String"),
     })
     @PostMapping("/saveParamterConfig")
-    public JsonViewObject saveParamterConfig(@RequestBody StrategyPriorityGroup strategyPriorityGroup){
+    public JsonViewObject saveParamterConfig(@RequestBody StrategyPriorityGroupVO strategyPriorityGroupVO){
         JsonViewObject jsonView = JsonViewObject.newInstance();
         try {
-            strategyPriorityService.saveParamterConfig(strategyPriorityGroup);
+            strategyPriorityService.saveParamterConfig(strategyPriorityGroupVO);
             jsonView.success();
         } catch (Exception e) {
             jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/strategy/StrategyPriorityMapper.java

 package net.wanji.opt.dao.mapper.strategy;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import net.wanji.opt.entity.strategy.StrategyParameterConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
-import java.util.List;
-import java.util.Map;
-
-import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroup;
 import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-public interface StrategyPriorityMapper extends BaseMapper<StrategyPriorityDailyInfo>{
-	
-	 /**
-	  *  查询表t_strategy_priority_daily_info所有信息
-	  */
-	 List<StrategyPriorityDailyInfo> findAllStrategyPriorityDailyInfo();
-	  
-	 /**
-	  *  根据主键id查询表t_strategy_priority_daily_info信息
-	  *  @param id
-	  */
-	 StrategyPriorityDailyInfo findStrategyPriorityDailyInfoByid(@Param("id") Long id);
+import java.util.List;
+
+public interface StrategyPriorityMapper extends BaseMapper<StrategyPriorityDailyInfo> {
+
+    /**
+     * 查询表t_strategy_priority_daily_info所有信息
+     */
+    List<StrategyPriorityDailyInfo> findAllStrategyPriorityDailyInfo();
+
+    /**
+     * 根据主键id查询表t_strategy_priority_daily_info信息
+     *
+     * @param id
+     */
+    StrategyPriorityDailyInfo findStrategyPriorityDailyInfoByid(@Param("id") Long id);
+
+    /**
+     * 根据条件查询表t_strategy_priority_daily_info信息
+     *
+     * @param strategyPriorityDailyInfo
+     */
+    List<StrategyPriorityDailyInfo> findStrategyPriorityDailyInfoByCondition(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
+
+    /**
+     * 根据主键id查询表t_strategy_priority_daily_info信息
+     *
+     * @param id
+     */
+    Integer deleteStrategyPriorityDailyInfoByid(@Param("id") Long id);
 
-	/**
-	*  根据条件查询表t_strategy_priority_daily_info信息
-	*  @param strategyPriorityDailyInfo
-	*/
-	List<StrategyPriorityDailyInfo> findStrategyPriorityDailyInfoByCondition(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
+    /**
+     * 根据主键id更新表t_strategy_priority_daily_info信息
+     *
+     * @param strategyPriorityDailyInfo
+     */
+    Integer updateStrategyPriorityDailyInfoByid(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
 
-	 /**
-	  *  根据主键id查询表t_strategy_priority_daily_info信息
-	  *  @param id
-	  */
-	 Integer deleteStrategyPriorityDailyInfoByid(@Param("id") Long id);
-	
-	 /**
-	  *  根据主键id更新表t_strategy_priority_daily_info信息
-	  *  @param strategyPriorityDailyInfo
-	  */
-	 Integer updateStrategyPriorityDailyInfoByid(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
-	
-	 /**
-	  *  新增表t_strategy_priority_daily_info信息
-	  *  @param strategyPriorityDailyInfo
-	  */
-	 Integer addStrategyPriorityDailyInfo(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
+    /**
+     * 新增表t_strategy_priority_daily_info信息
+     *
+     * @param strategyPriorityDailyInfo
+     */
+    Integer addStrategyPriorityDailyInfo(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
 
 
-	List<StrategyPriorityDailyInfo> pageStrategyCrossList();
+    List<StrategyPriorityDailyInfo> pageStrategyCrossList();
 
 
-	List<StrategyFactoryEntity> getStrategyList();
+    List<StrategyFactoryEntity> getStrategyList();
 
-	List<StrategyFactoryEntity> getSceneList(Integer type);
+    List<StrategyFactoryEntity> getSceneList(Integer type);
 
-	List<StrategyFactoryEntity> getCompanyList();
+    List<StrategyFactoryEntity> getCompanyList();
 
 
-	void savePriorityInsert(List<StrategyPriorityConfig> saveList);
+    void savePriorityInsert(List<StrategyPriorityConfig> saveList);
 
 
-	List<StrategyPriorityConfig> selectPriorityTable(String crossId);
+    List<StrategyPriorityConfig> selectPriorityTable(String crossId);
 
-	void deletePriorityConfig(String crossId);
+    void deletePriorityConfig(String crossId);
 
 
+    List<String> getstrategyNo(@Param("crossId") String crossId, @Param("type") Integer type);
 
-	List<String> getstrategyNo(@Param("crossId") String crossId,@Param("type") Integer type);
+    List<StrategyFactoryEntity> getPriorityConfigData(@Param("strategyNo") List<String> strategyNo, @Param("crossId") String crossId, @Param("type") Integer type);
 
-	List<StrategyFactoryEntity> getPriorityConfigData(@Param("strategyNo") List<String> strategyNo,@Param("crossId") String crossId,@Param("type") Integer type);
+    void savePlanConfig(@Param("savePlanList") List<StrategyPriorityDailyInfo> savePlanList);
 
-	void savePlanConfig(@Param("savePlanList") List<StrategyPriorityDailyInfo> savePlanList);
+    List<StrategyPriorityDailyInfo> selectPlanTable(String crossId);
 
-	List<StrategyPriorityDailyInfo> selectPlanTable(String crossId);
+    void deletePlanConfig(String crossId);
 
-	void deletePlanConfig(String crossId);
 
+    List<StrategyPriorityDailyInfo> getPlanConfigData(@Param("crossId") String crossId, @Param("type") Integer type);
 
-	List<StrategyPriorityDailyInfo> getPlanConfigData(@Param("crossId") String crossId,@Param("type")Integer type);
+    List<StrategyParameterConfig> paramterConfigTable(String crossId);
 
-	List<StrategyParameterConfig> paramterConfigTable(String crossId);
 
+    void deleteParamterConfig(String crossId);
 
-	void deleteParamterConfig(String crossId);
+    void saveParamConfig(@Param("savePlanList") List<StrategyParameterConfig> savePlanList);
 
-	void saveParamConfig(@Param("savePlanList") List<StrategyParameterConfig> savePlanList);
+    List<StrategyParameterConfig> getParamConfigData(@Param("crossId") String crossId, @Param("type") Integer type, @Param("strategyNo") String strategyNo);
 
-	List<StrategyParameterConfig> getParamConfigData(@Param("crossId") String crossId,@Param("type")Integer type,@Param("strategyNo") String strategyNo);
+    List<StrategyPriorityDailyInfo> getStrategyGreenWave();
 
-	List<StrategyPriorityDailyInfo> getStrategyGreenWave();
+    List<StrategyPriorityConfig> selectGreenPriorityTable(Integer greenId);
 
-	List<StrategyPriorityConfig> selectGreenPriorityTable(Integer greenId);
+    void deleteGreenPriorityConfig(Integer greenId);
 
-	void deleteGreenPriorityConfig(Integer greenId);
+    List<String> getGreenstrategyNo(@Param("greenId") Integer greenId, @Param("type") Integer type);
 
-	List<String> getGreenstrategyNo(@Param("greenId") Integer greenId,@Param("type") Integer type);
+    List<StrategyFactoryEntity> getGreenPriorityConfigData(@Param("strategyNo") List<String> strategyNo, @Param("greenId") Integer greenId, @Param("type") Integer type);
 
-	List<StrategyFactoryEntity> getGreenPriorityConfigData(@Param("strategyNo") List<String> strategyNo, @Param("greenId") Integer greenId,@Param("type") Integer type);
+    List<StrategyPriorityDailyInfo> selectGreenPlanTable(Integer greenId);
 
-	List<StrategyPriorityDailyInfo> selectGreenPlanTable(Integer greenId);
+    void deleteGreenPlanConfig(Integer greenId);
 
-	void deleteGreenPlanConfig(Integer greenId);
+    List<StrategyPriorityDailyInfo> getGreenPlanConfigData(@Param("greenId") Integer greenId, @Param("type") Integer type);
 
-	List<StrategyPriorityDailyInfo> getGreenPlanConfigData(@Param("greenId") Integer greenId,@Param("type")Integer type);
+    List<StrategyParameterConfig> paramterGreenConfigTable(Integer greenId);
 
-	List<StrategyParameterConfig> paramterGreenConfigTable(Integer greenId);
+    void deleteGreenParamterConfig(Integer greenId);
 
-	void deleteGreenParamterConfig(Integer greenId);
+    List<StrategyParameterConfig> getGreenParamConfigData(@Param("greenId") Integer greenId, @Param("type") Integer type, @Param("strategyNo") String strategyNo);
 
-	List<StrategyParameterConfig> getGreenParamConfigData(@Param("greenId") Integer greenId, @Param("type") Integer type,@Param("strategyNo") String strategyNo);
+    /**
+     * 通过路口编号，分组编号查询策略详情
+     * @param crossId
+     * @param greenId
+     * @param groupId
+     * @return
+     */
+    List<StrategyFactoryEntity> selectCrossGroupStrategyList(@Param("crossId") String crossId, @Param("greenId") Integer greenId, @Param("groupId") Integer groupId);
 }
 

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

 package net.wanji.opt.entity.strategy;
 
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.List;
-
-import io.swagger.models.auth.In;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.baomidou.mybatisplus.annotation.TableName;
-import net.wanji.opt.entity.comprehensivequery.CrossEntity;
+
+import java.io.Serializable;
 
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("t_strategy_priority_daily_info")
 public class StrategyPriorityDailyInfo implements Serializable {
 
@@ -68,5 +66,4 @@ public class StrategyPriorityDailyInfo implements Serializable {
     private Integer type;
 
 
-
 }

signal-optimize-service/src/main/java/net/wanji/opt/entity/strategy/dto/StrategyPriorityGroup.java → signal-optimize-service/src/main/java/net/wanji/opt/entity/strategy/dto/StrategyPriorityGroupVO.java

 package net.wanji.opt.entity.strategy.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.models.auth.In;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import net.wanji.opt.entity.strategy.*;
+import net.wanji.opt.entity.strategy.StrategyPriorityConfig;
+import net.wanji.opt.entity.strategy.StrategyPriorityParamter;
+import net.wanji.opt.entity.strategy.StrategyPriorityPlanDetails;
+import net.wanji.opt.entity.strategy.StrategySchedulingParam;
 
 import java.util.List;
 
-
+/**
+ * @author
+ * @date
+ */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @AllArgsConstructor
-public class StrategyPriorityGroup {
-    //分组ID
-    private Integer labelCode;
-    //分组名称
-    private String label;
-    //路口Id
-    private String crossId;
-    //路口Id
+public class StrategyPriorityGroupVO {
+    @ApiModelProperty("分组ID")
+    private Integer groupId;
+    @ApiModelProperty("分组名称")
+    private String groupName;
+    @ApiModelProperty("路口编号列表")
     private List<String> crossIds;
-    //执行时间
+    @ApiModelProperty("执行时间")
     private String weekExecute;
-    //日计划编号
+    @ApiModelProperty("日计划编号")
     private Integer dailyPlanId;
-    //策略编号
+    @ApiModelProperty("策略编号")
     private String strategyNo;
-    //优先级的配置信息
+    @ApiModelProperty("优先级的配置信息")
     private List<StrategyPriorityConfig> data;
-    //计划表的配置信息日计划详情
+    @ApiModelProperty("计划表的配置信息日计划详情")
     private List<StrategyPriorityPlanDetails> dailyPlanDetails;
-    // 参数配置表的配置信息
-   private List<StrategyPriorityParamter> parameterConfigList;
-    // 调度配置表的配置信息
+    @ApiModelProperty("参数配置表的配置信息")
+    private List<StrategyPriorityParamter> parameterConfigList;
+    @ApiModelProperty("调度配置表的配置信息")
     private StrategySchedulingParam schedulingParamters;
-    //1:路口，2干线
+    @ApiModelProperty("类型：1:路口，2干线")
     private Integer type;
-    //干线 ID
-    private Integer  greenId;
-    //干线 IDs
+    @ApiModelProperty("干线编号列表")
     private List<Integer> greenIds;
-
-    //策略名称 参数配置神思用
+    /**
+     * 策略名称 参数配置神思用
+     */
     private String strategyName;
-    //场景 参数配置神思用
+    /**
+     * 场景 参数配置神思用
+     */
     private String method;
-    //场景code 参数配置神思用
+    /**
+     * 场景code 参数配置神思用
+     */
     private Integer scene;
 
-
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/TrendServiceV2Impl.java

@@ -366,7 +366,9 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
                             stringBuilder.append(GreenBeltDirEnum.getCode(Integer.valueOf(dir))).append(",");
                         }
                     }
-                    result.setGreenDir(stringBuilder.toString());
+                    int length = stringBuilder.length();
+                    String substring = stringBuilder.substring(0, length - 1);
+                    result.setGreenDir(substring);
                 }
             }
         });

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

 package net.wanji.opt.servicev2.strategy;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import io.swagger.models.auth.In;
-import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.opt.entity.strategy.StrategyParameterConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroup;
+import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroupVO;
 import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
 * <p>
@@ -33,16 +27,16 @@ public interface StrategyPriorityService extends IService<StrategyPriorityDailyI
     List<StrategyFactoryEntity> getCompanyList();
 
 
-    void savePriority(List<StrategyPriorityGroup> dataList) throws Exception;
+    void savePriority(List<StrategyPriorityGroupVO> dataList) throws Exception;
 
     List<StrategyFactoryEntity> getPriorityData(String crossId,Integer greenId, Integer type) throws Exception;
 
-    void savePlanConfig(List<StrategyPriorityGroup> dailyPlanDetails) throws Exception;
+    void savePlanConfig(List<StrategyPriorityGroupVO> dailyPlanDetails) throws Exception;
 
 
     List<StrategyPriorityDailyInfo> getPlanConfigData(String crossId, Integer greenId,Integer type);
 
-    void saveParamterConfig(StrategyPriorityGroup strategyPriorityGroup) throws Exception;
+    void saveParamterConfig(StrategyPriorityGroupVO strategyPriorityGroupVO) throws Exception;
 
     List<StrategyParameterConfig> getParamConfigData(String crossId,Integer greenId, Integer type,String strategyNo);
 

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyFactoryEntity.java

@@ -61,10 +61,10 @@ public class StrategyFactoryEntity {
      * 分组名称
      */
     @TableField(exist = false)
-    private String label;
+    private String groupName;
     /**
      * 分组ID
      */
     @TableField(exist = false)
-    private Integer labelCode;
+    private Integer groupId;
 }

signal-optimize-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
     active: test
-logging:
-  level:
-    org.apache.ibatis: DEBUG
\ No newline at end of file