Skip to content

T
traffic-signal-platform
Commit 3de6c327 authored by duanruiming's avatar duanruiming
Browse files
Options

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

parent 93b08e28
Hide whitespace changes
Inline Side-by-side
Showing with 402 additions and 284 deletions
signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/strategy/StrategyPriorityController.java
View file @ 3de6c327
package net.wanji.opt.controllerv2.strategy; 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 lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.i18n.I18nResourceBundle; import net.wanji.common.framework.i18n.I18nResourceBundle;
import net.wanji.common.framework.rest.JsonViewObject; 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.StrategyParameterConfig;
import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo; import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
...@@ -14,19 +11,15 @@ import io.swagger.annotations.Api; ...@@ -14,19 +11,15 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; 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.servicev2.strategy.StrategyPriorityService;
import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity; import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import net.wanji.opt.api.ResultGenerator;
import javax.validation.Valid;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -115,7 +108,7 @@ public class StrategyPriorityController { ...@@ -115,7 +108,7 @@ public class StrategyPriorityController {
@ApiImplicitParam(name = "dataList", value = "优先级配置数据", required = false, dataType = "String"), @ApiImplicitParam(name = "dataList", value = "优先级配置数据", required = false, dataType = "String"),
}) })
@PostMapping("/savePriority") @PostMapping("/savePriority")
public JsonViewObject savePriority(@RequestBody List<StrategyPriorityGroup>dataList){ public JsonViewObject savePriority(@RequestBody List<StrategyPriorityGroupVO>dataList){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
try { try {
strategyPriorityService.savePriority(dataList); strategyPriorityService.savePriority(dataList);
...@@ -152,7 +145,7 @@ public class StrategyPriorityController { ...@@ -152,7 +145,7 @@ public class StrategyPriorityController {
@ApiImplicitParam(name = "dailyPlanDetails", value = "日计划配置数据", required = false, dataType = "String"), @ApiImplicitParam(name = "dailyPlanDetails", value = "日计划配置数据", required = false, dataType = "String"),
}) })
@PostMapping("/savePlanConfig") @PostMapping("/savePlanConfig")
public JsonViewObject savePlanConfig(@RequestBody List<StrategyPriorityGroup>dailyPlanDetails){ public JsonViewObject savePlanConfig(@RequestBody List<StrategyPriorityGroupVO>dailyPlanDetails){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
try { try {
strategyPriorityService.savePlanConfig(dailyPlanDetails); strategyPriorityService.savePlanConfig(dailyPlanDetails);
...@@ -189,10 +182,10 @@ public class StrategyPriorityController { ...@@ -189,10 +182,10 @@ public class StrategyPriorityController {
@ApiImplicitParam(name = "strategyPriorityGroup", value = "参数配置数据", required = false, dataType = "String"), @ApiImplicitParam(name = "strategyPriorityGroup", value = "参数配置数据", required = false, dataType = "String"),
}) })
@PostMapping("/saveParamterConfig") @PostMapping("/saveParamterConfig")
public JsonViewObject saveParamterConfig(@RequestBody StrategyPriorityGroup strategyPriorityGroup){ public JsonViewObject saveParamterConfig(@RequestBody StrategyPriorityGroupVO strategyPriorityGroupVO){
JsonViewObject jsonView = JsonViewObject.newInstance(); JsonViewObject jsonView = JsonViewObject.newInstance();
try { try {
strategyPriorityService.saveParamterConfig(strategyPriorityGroup); strategyPriorityService.saveParamterConfig(strategyPriorityGroupVO);
jsonView.success(); jsonView.success();
} catch (Exception e) { } catch (Exception e) {
jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG")); jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
......
signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/strategy/StrategyPriorityMapper.java
View file @ 3de6c327
package net.wanji.opt.dao.mapper.strategy; 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.StrategyParameterConfig;
import net.wanji.opt.entity.strategy.StrategyPriorityConfig; import net.wanji.opt.entity.strategy.StrategyPriorityConfig;
import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo; 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 net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface StrategyPriorityMapper extends BaseMapper<StrategyPriorityDailyInfo>{ import java.util.List;
/** public interface StrategyPriorityMapper extends BaseMapper<StrategyPriorityDailyInfo> {
* 查询表t_strategy_priority_daily_info所有信息
*/ /**
List<StrategyPriorityDailyInfo> findAllStrategyPriorityDailyInfo(); * 查询表t_strategy_priority_daily_info所有信息
*/
/** List<StrategyPriorityDailyInfo> findAllStrategyPriorityDailyInfo();
* 根据主键id查询表t_strategy_priority_daily_info信息
* @param id /**
*/ * 根据主键id查询表t_strategy_priority_daily_info信息
StrategyPriorityDailyInfo findStrategyPriorityDailyInfoByid(@Param("id") Long id); *
* @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信息 * 根据主键id更新表t_strategy_priority_daily_info信息
* @param strategyPriorityDailyInfo *
*/ * @param strategyPriorityDailyInfo
List<StrategyPriorityDailyInfo> findStrategyPriorityDailyInfoByCondition(StrategyPriorityDailyInfo strategyPriorityDailyInfo); */
Integer updateStrategyPriorityDailyInfoByid(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
/** /**
* 根据主键id查询表t_strategy_priority_daily_info信息 * 新增表t_strategy_priority_daily_info信息
* @param id *
*/ * @param strategyPriorityDailyInfo
Integer deleteStrategyPriorityDailyInfoByid(@Param("id") Long id); */
Integer addStrategyPriorityDailyInfo(StrategyPriorityDailyInfo strategyPriorityDailyInfo);
/**
* 根据主键id更新表t_strategy_priority_daily_info信息
* @param strategyPriorityDailyInfo
*/
Integer updateStrategyPriorityDailyInfoByid(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
View file @ 3de6c327
package net.wanji.opt.entity.strategy; package net.wanji.opt.entity.strategy;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import com.baomidou.mybatisplus.annotation.TableId;
import java.util.List; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.models.auth.In;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
import net.wanji.opt.entity.comprehensivequery.CrossEntity; import java.io.Serializable;
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("t_strategy_priority_daily_info") @TableName("t_strategy_priority_daily_info")
public class StrategyPriorityDailyInfo implements Serializable { public class StrategyPriorityDailyInfo implements Serializable {
...@@ -68,5 +66,4 @@ public class StrategyPriorityDailyInfo implements Serializable { ...@@ -68,5 +66,4 @@ public class StrategyPriorityDailyInfo implements Serializable {
private Integer type; 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
View file @ 3de6c327
package net.wanji.opt.entity.strategy.dto; package net.wanji.opt.entity.strategy.dto;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; 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; import java.util.List;
/**
* @author
* @date
*/
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class StrategyPriorityGroup { public class StrategyPriorityGroupVO {
//分组ID @ApiModelProperty("分组ID")
private Integer labelCode; private Integer groupId;
//分组名称 @ApiModelProperty("分组名称")
private String label; private String groupName;
//路口Id @ApiModelProperty("路口编号列表")
private String crossId;
//路口Id
private List<String> crossIds; private List<String> crossIds;
//执行时间 @ApiModelProperty("执行时间")
private String weekExecute; private String weekExecute;
//日计划编号 @ApiModelProperty("日计划编号")
private Integer dailyPlanId; private Integer dailyPlanId;
//策略编号 @ApiModelProperty("策略编号")
private String strategyNo; private String strategyNo;
//优先级的配置信息 @ApiModelProperty("优先级的配置信息")
private List<StrategyPriorityConfig> data; private List<StrategyPriorityConfig> data;
//计划表的配置信息日计划详情 @ApiModelProperty("计划表的配置信息日计划详情")
private List<StrategyPriorityPlanDetails> dailyPlanDetails; private List<StrategyPriorityPlanDetails> dailyPlanDetails;
// 参数配置表的配置信息 @ApiModelProperty("参数配置表的配置信息")
private List<StrategyPriorityParamter> parameterConfigList; private List<StrategyPriorityParamter> parameterConfigList;
// 调度配置表的配置信息 @ApiModelProperty("调度配置表的配置信息")
private StrategySchedulingParam schedulingParamters; private StrategySchedulingParam schedulingParamters;
//1:路口，2干线 @ApiModelProperty("类型：1:路口，2干线")
private Integer type; private Integer type;
//干线 ID @ApiModelProperty("干线编号列表")
private Integer greenId;
//干线 IDs
private List<Integer> greenIds; private List<Integer> greenIds;
/**
//策略名称 参数配置神思用 * 策略名称 参数配置神思用
*/
private String strategyName; private String strategyName;
//场景 参数配置神思用 /**
* 场景 参数配置神思用
*/
private String method; private String method;
//场景code 参数配置神思用 /**
* 场景code 参数配置神思用
*/
private Integer scene; private Integer scene;
} }
signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/TrendServiceV2Impl.java
View file @ 3de6c327
...@@ -366,7 +366,9 @@ public class TrendServiceV2Impl implements TrendServiceV2 { ...@@ -366,7 +366,9 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
stringBuilder.append(GreenBeltDirEnum.getCode(Integer.valueOf(dir))).append(","); 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
View file @ 3de6c327
package net.wanji.opt.servicev2.strategy; 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.StrategyParameterConfig;
import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo; import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage; import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroupVO;
import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroup;
import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity; import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -33,16 +27,16 @@ public interface StrategyPriorityService extends IService<StrategyPriorityDailyI ...@@ -33,16 +27,16 @@ public interface StrategyPriorityService extends IService<StrategyPriorityDailyI
List<StrategyFactoryEntity> getCompanyList(); 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; 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); 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); List<StrategyParameterConfig> getParamConfigData(String crossId,Integer greenId, Integer type,String strategyNo);
......
signal-optimize-service/src/main/java/net/wanji/opt/servicev2/strategy/impl/StrategyPriorityServiceImpl.java
View file @ 3de6c327
...@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
import net.wanji.common.utils.tool.StringUtils; import net.wanji.common.utils.tool.StringUtils;
import net.wanji.opt.dao.mapper.strategy.StrategyPriorityMapper; import net.wanji.opt.dao.mapper.strategy.StrategyPriorityMapper;
import net.wanji.opt.entity.strategy.*; import net.wanji.opt.entity.strategy.*;
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.servicev2.strategy.StrategyPriorityService;
import net.wanji.opt.synthesis.pojo.Result; import net.wanji.opt.synthesis.pojo.Result;
import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity; import net.wanji.opt.synthesis.pojo.StrategyFactoryEntity;
...@@ -89,20 +89,23 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -89,20 +89,23 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
return strategyList; return strategyList;
} }
/* /**
* 策略优先级保存 路口 干线共用 * 策略优先级保存 路口 干线共用
* */ *
* @param dataList
* @throws Exception
*/
@Override @Override
@Transactional @Transactional
public void savePriority(List<StrategyPriorityGroup> dataList) throws Exception { public void savePriority(List<StrategyPriorityGroupVO> dataList) throws Exception {
try { try {
List<StrategyPriorityConfig> saveList = new ArrayList<>(); List<StrategyPriorityConfig> saveList = new ArrayList<>();
for (StrategyPriorityGroup group : dataList) { for (StrategyPriorityGroupVO group : dataList) {
//Type : 1;路口2：干线 //Type : 1;路口2：干线
Integer typePd = group.getType(); Integer typePd = group.getType();
if (typePd == 1) { if (typePd == 1) {
String label = group.getLabel(); String groupName = group.getGroupName();
Integer labelCode = group.getLabelCode(); Integer groupId = group.getGroupId();
//1；路口2干线 //1；路口2干线
Integer type = group.getType(); Integer type = group.getType();
//路口id //路口id
...@@ -120,9 +123,9 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -120,9 +123,9 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
StrategyPriorityConfig strategyPriorityConfig = new StrategyPriorityConfig(); StrategyPriorityConfig strategyPriorityConfig = new StrategyPriorityConfig();
strategyPriorityConfig.setCrossId(crossId); strategyPriorityConfig.setCrossId(crossId);
//分组id //分组id
strategyPriorityConfig.setGroupId(labelCode); strategyPriorityConfig.setGroupId(groupId);
//分组名称 //分组名称
strategyPriorityConfig.setGroupName(label); strategyPriorityConfig.setGroupName(groupName);
//策略编号 //策略编号
strategyPriorityConfig.setStrategyNo(item.getStrategyNo()); strategyPriorityConfig.setStrategyNo(item.getStrategyNo());
//优先级 //优先级
...@@ -134,8 +137,8 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -134,8 +137,8 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
} }
} }
} else if (typePd == 2) { } else if (typePd == 2) {
String label = group.getLabel(); String label = group.getGroupName();
Integer labelCode = group.getLabelCode(); Integer labelCode = group.getGroupId();
//1；路口2干线 //1；路口2干线
Integer type = group.getType(); Integer type = group.getType();
//干线id //干线id
...@@ -228,12 +231,12 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -228,12 +231,12 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
* */ * */
@Override @Override
@Transactional @Transactional
public void savePlanConfig(List<StrategyPriorityGroup> dailyPlanDetails) throws Exception { public void savePlanConfig(List<StrategyPriorityGroupVO> dailyPlanDetails) throws Exception {
try { try {
List<StrategyPriorityDailyInfo> savePlanList = new ArrayList<>(); List<StrategyPriorityDailyInfo> savePlanList = new ArrayList<>();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
for (StrategyPriorityGroup group : dailyPlanDetails) { for (StrategyPriorityGroupVO group : dailyPlanDetails) {
//Type : 1;路口2：干线 //Type : 1;路口2：干线
Integer typePd = group.getType(); Integer typePd = group.getType();
if (typePd == 1) { if (typePd == 1) {
...@@ -260,6 +263,19 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -260,6 +263,19 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
//取出日计划详情 //取出日计划详情
List<StrategyPriorityPlanDetails> dailyPlanDetails1 = group.getDailyPlanDetails(); List<StrategyPriorityPlanDetails> dailyPlanDetails1 = group.getDailyPlanDetails();
if (CollectionUtils.isNotEmpty(dailyPlanDetails1)) {
dailyPlanDetails1.forEach(item -> {
StringBuilder sb = new StringBuilder();
List<StrategyFactoryEntity> factoryList = strategyPriorityMapper.selectCrossGroupStrategyList(crossId, null, item.getGroupId());
if (CollectionUtils.isNotEmpty(factoryList)) {
for (StrategyFactoryEntity factory : factoryList) {
sb.append(factory.getMethod()).append(",");
}
String content = sb.substring(0, sb.length() - 1);
item.setContent(content);
}
});
}
String dailyPlanDetailsJson = JSON.toJSONString(dailyPlanDetails1); String dailyPlanDetailsJson = JSON.toJSONString(dailyPlanDetails1);
strategyPriorityDailyInfo.setDailyPlanDetails(dailyPlanDetailsJson); strategyPriorityDailyInfo.setDailyPlanDetails(dailyPlanDetailsJson);
...@@ -289,6 +305,19 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -289,6 +305,19 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
//取出日计划详情 //取出日计划详情
List<StrategyPriorityPlanDetails> dailyPlanDetails1 = group.getDailyPlanDetails(); List<StrategyPriorityPlanDetails> dailyPlanDetails1 = group.getDailyPlanDetails();
if (CollectionUtils.isNotEmpty(dailyPlanDetails1)) {
dailyPlanDetails1.forEach(item -> {
StringBuilder sb = new StringBuilder();
List<StrategyFactoryEntity> factoryList = strategyPriorityMapper.selectCrossGroupStrategyList(null, greenId, item.getGroupId());
if (CollectionUtils.isNotEmpty(factoryList)) {
for (StrategyFactoryEntity factory : factoryList) {
sb.append(factory.getMethod()).append(",");
}
String content = sb.substring(0, sb.length() - 1);
item.setContent(content);
}
});
}
String dailyPlanDetailsJson = JSON.toJSONString(dailyPlanDetails1); String dailyPlanDetailsJson = JSON.toJSONString(dailyPlanDetails1);
strategyPriorityDailyInfo.setDailyPlanDetails(dailyPlanDetailsJson); strategyPriorityDailyInfo.setDailyPlanDetails(dailyPlanDetailsJson);
...@@ -301,9 +330,9 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -301,9 +330,9 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
List<StrategyPriorityPlanPush> strategyPriorityPlanPush = pushStrategyPriorityPlan(dailyPlanDetails); List<StrategyPriorityPlanPush> strategyPriorityPlanPush = pushStrategyPriorityPlan(dailyPlanDetails);
//推送日计划配置到神思 //推送日计划配置到神思
StrategyPriorityPlanPushReq req = new StrategyPriorityPlanPushReq(); StrategyPriorityPlanPushReq req = new StrategyPriorityPlanPushReq();
req.setData(strategyPriorityPlanPush); req.setData(strategyPriorityPlanPush);
Result result = pushStrategyControlService.StartegyPriorityPlanPush(req); Result result = pushStrategyControlService.StartegyPriorityPlanPush(req);
} catch (Exception e) { } catch (Exception e) {
log.error("{} savePlanConfig", this.getClass().getSimpleName(), e); log.error("{} savePlanConfig", this.getClass().getSimpleName(), e);
throw e; throw e;
...@@ -338,7 +367,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -338,7 +367,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
* */ * */
@Override @Override
@Transactional @Transactional
public void saveParamterConfig(StrategyPriorityGroup group) throws Exception { public void saveParamterConfig(StrategyPriorityGroupVO group) throws Exception {
try { try {
List<StrategyParameterConfig> savePlanList = new ArrayList<>(); List<StrategyParameterConfig> savePlanList = new ArrayList<>();
...@@ -610,7 +639,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -610,7 +639,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
// return pushStrategyPriorityList; // return pushStrategyPriorityList;
// } // }
/*优先级配置神思推送*/ /*优先级配置神思推送*/
private List<StrategyPriorityConfigPush> pushStrategyPriorityConfig(List<StrategyPriorityGroup> dataList) { private List<StrategyPriorityConfigPush> pushStrategyPriorityConfig(List<StrategyPriorityGroupVO> dataList) {
// 最终优先级配置推送神思 // 最终优先级配置推送神思
List<StrategyPriorityConfigPush> pushStrategyPriorityList = new ArrayList<>(); List<StrategyPriorityConfigPush> pushStrategyPriorityList = new ArrayList<>();
...@@ -618,7 +647,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -618,7 +647,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
StrategyPriorityConfigPush strategyPriorityConfigPush = new StrategyPriorityConfigPush(); StrategyPriorityConfigPush strategyPriorityConfigPush = new StrategyPriorityConfigPush();
// 分组详情列表 // 分组详情列表
List<GroupIdDetails> groupIdDetailsList = new ArrayList<>(); List<GroupIdDetails> groupIdDetailsList = new ArrayList<>();
for (StrategyPriorityGroup group : dataList) { for (StrategyPriorityGroupVO group : dataList) {
// 设置基本信息 // 设置基本信息
Integer type = group.getType(); Integer type = group.getType();
...@@ -636,8 +665,8 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -636,8 +665,8 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
GroupIdDetails groupIdDetails = new GroupIdDetails(); GroupIdDetails groupIdDetails = new GroupIdDetails();
// 设置分组名称和编号 // 设置分组名称和编号
groupIdDetails.setGroupName(group.getLabel()); groupIdDetails.setGroupName(group.getGroupName());
groupIdDetails.setGroupId(group.getLabelCode()); groupIdDetails.setGroupId(group.getGroupId());
// 创建一个临时列表，用于存储所有策略详情数据 // 创建一个临时列表，用于存储所有策略详情数据
List<StrategyPriorityDetailsPush> detailsList = new ArrayList<>(); List<StrategyPriorityDetailsPush> detailsList = new ArrayList<>();
...@@ -678,14 +707,14 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -678,14 +707,14 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
} }
/*日计划配置神思推送*/ /*日计划配置神思推送*/
private List<StrategyPriorityPlanPush> pushStrategyPriorityPlan(List<StrategyPriorityGroup> dailyPlanDetails) { private List<StrategyPriorityPlanPush> pushStrategyPriorityPlan(List<StrategyPriorityGroupVO> dailyPlanDetails) {
//日计划推送到神思 //日计划推送到神思
List<StrategyPriorityPlanPush> strategyPriorityPlanPushList = new ArrayList<>(); List<StrategyPriorityPlanPush> strategyPriorityPlanPushList = new ArrayList<>();
StrategyPriorityPlanPush strategyPriorityPlanPush = new StrategyPriorityPlanPush(); StrategyPriorityPlanPush strategyPriorityPlanPush = new StrategyPriorityPlanPush();
// //
List<DailyPlanDetails> dailyPlanDetailsList = new ArrayList<>(); List<DailyPlanDetails> dailyPlanDetailsList = new ArrayList<>();
for (StrategyPriorityGroup group : dailyPlanDetails) { for (StrategyPriorityGroupVO group : dailyPlanDetails) {
Integer type = group.getType(); Integer type = group.getType();
strategyPriorityPlanPush.setType(type); strategyPriorityPlanPush.setType(type);
...@@ -742,7 +771,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap ...@@ -742,7 +771,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
} }
/*参数配置神思推送*/ /*参数配置神思推送*/
private List<StrategyParameterPush> pushStrategyPriorityParam(StrategyPriorityGroup group) { private List<StrategyParameterPush> pushStrategyPriorityParam(StrategyPriorityGroupVO group) {
List<StrategyParameterPush> StrategyParameterPushList = new ArrayList<>(); List<StrategyParameterPush> StrategyParameterPushList = new ArrayList<>();
//推送神思接口 //推送神思接口
StrategyParameterPush strategyParameterPush = new StrategyParameterPush(); StrategyParameterPush strategyParameterPush = new StrategyParameterPush();
......
signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyFactoryEntity.java
View file @ 3de6c327
...@@ -61,10 +61,10 @@ public class StrategyFactoryEntity { ...@@ -61,10 +61,10 @@ public class StrategyFactoryEntity {
* 分组名称 * 分组名称
*/ */
@TableField(exist = false) @TableField(exist = false)
private String label; private String groupName;
/** /**
* 分组ID * 分组ID
*/ */
@TableField(exist = false) @TableField(exist = false)
private Integer labelCode; private Integer groupId;
} }
signal-optimize-service/src/main/resources/bootstrap.yaml
View file @ 3de6c327
spring: spring:
profiles: profiles:
active: test active: test
logging:
level:
org.apache.ibatis: DEBUG
\ No newline at end of file
signal-optimize-service/src/main/resources/mapper/strategy/StrategyPriorityMapper.xml
View file @ 3de6c327
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.wanji.opt.dao.mapper.strategy.StrategyPriorityMapper"> <mapper namespace="net.wanji.opt.dao.mapper.strategy.StrategyPriorityMapper">
<!-- 通用设置 --> <!-- 通用设置 -->
<!-- 通用查询列 --> <!-- 通用查询列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, daily_plan_id, week_execute, daily_plan_details, cross_id id, daily_plan_id, week_execute, daily_plan_details, cross_id
...@@ -10,46 +10,46 @@ ...@@ -10,46 +10,46 @@
<!-- 通用条件列 --> <!-- 通用条件列 -->
<sql id="StrategyPriorityDailyInfoByCondition"> <sql id="StrategyPriorityDailyInfoByCondition">
<if test="id!=null and id!=''"> <if test="id!=null and id!=''">
AND id = #{id} AND id = #{id}
</if> </if>
<if test="dailyPlanId!=null and dailyPlanId!=''"> <if test="dailyPlanId!=null and dailyPlanId!=''">
AND daily_plan_id = #{dailyPlanId} AND daily_plan_id = #{dailyPlanId}
</if> </if>
<if test="weekExecute!=null and weekExecute!=''"> <if test="weekExecute!=null and weekExecute!=''">
AND week_execute = #{weekExecute} AND week_execute = #{weekExecute}
</if> </if>
<if test="dailyPlanDetails!=null and dailyPlanDetails!=''"> <if test="dailyPlanDetails!=null and dailyPlanDetails!=''">
AND daily_plan_details = #{dailyPlanDetails} AND daily_plan_details = #{dailyPlanDetails}
</if> </if>
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
AND cross_id = #{crossId} AND cross_id = #{crossId}
</if> </if>
</sql> </sql>
<!-- 通用设置列 --> <!-- 通用设置列 -->
<sql id="StrategyPriorityDailyInfoSetColumns"> <sql id="StrategyPriorityDailyInfoSetColumns">
<if test="dailyPlanId!=null and dailyPlanId!=''"> <if test="dailyPlanId!=null and dailyPlanId!=''">
daily_plan_id = #{dailyPlanId}, daily_plan_id = #{dailyPlanId},
</if> </if>
<if test="weekExecute!=null and weekExecute!=''"> <if test="weekExecute!=null and weekExecute!=''">
week_execute = #{weekExecute}, week_execute = #{weekExecute},
</if> </if>
<if test="dailyPlanDetails!=null and dailyPlanDetails!=''"> <if test="dailyPlanDetails!=null and dailyPlanDetails!=''">
daily_plan_details = #{dailyPlanDetails}, daily_plan_details = #{dailyPlanDetails},
</if> </if>
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
cross_id = #{crossId}, cross_id = #{crossId},
</if> </if>
</sql> </sql>
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="StrategyPriorityDailyInfoMap" type="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <resultMap id="StrategyPriorityDailyInfoMap" type="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="daily_plan_id" property="dailyPlanId"/> <result column="daily_plan_id" property="dailyPlanId"/>
<result column="week_execute" property="weekExecute"/> <result column="week_execute" property="weekExecute"/>
<result column="daily_plan_details" property="dailyPlanDetails"/> <result column="daily_plan_details" property="dailyPlanDetails"/>
<result column="cross_id" property="crossId"/> <result column="cross_id" property="crossId"/>
</resultMap> </resultMap>
<!-- 查询表t_strategy_priority_daily_info所有信息 --> <!-- 查询表t_strategy_priority_daily_info所有信息 -->
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_strategy_priority_daily_info FROM t_strategy_priority_daily_info
WHERE 1=1 WHERE 1=1
<include refid="StrategyPriorityDailyInfoByCondition" /> <include refid="StrategyPriorityDailyInfoByCondition"/>
</select> </select>
<!-- 根据主键id删除表t_strategy_priority_daily_info信息 --> <!-- 根据主键id删除表t_strategy_priority_daily_info信息 -->
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
</delete> </delete>
<!-- 根据主键id更新表t_strategy_priority_daily_info信息 --> <!-- 根据主键id更新表t_strategy_priority_daily_info信息 -->
<update id="updateStrategyPriorityDailyInfoByid" parameterType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <update id="updateStrategyPriorityDailyInfoByid"
parameterType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
UPDATE t_strategy_priority_daily_info UPDATE t_strategy_priority_daily_info
<set> <set>
<include refid="StrategyPriorityDailyInfoSetColumns"/> <include refid="StrategyPriorityDailyInfoSetColumns"/>
...@@ -96,60 +97,61 @@ ...@@ -96,60 +97,61 @@
<!-- 新增表t_strategy_priority_daily_info信息 --> <!-- 新增表t_strategy_priority_daily_info信息 -->
<insert id="addStrategyPriorityDailyInfo"> <insert id="addStrategyPriorityDailyInfo">
INSERT INTO t_strategy_priority_daily_info ( INSERT INTO t_strategy_priority_daily_info (
id id
,daily_plan_id ,daily_plan_id
,week_execute ,week_execute
,daily_plan_details ,daily_plan_details
,cross_id ,cross_id
) VALUES ( ) VALUES (
#{id} #{id}
,#{dailyPlanId} ,#{dailyPlanId}
,#{weekExecute} ,#{weekExecute}
,#{dailyPlanDetails} ,#{dailyPlanDetails}
,#{crossId} ,#{crossId}
) )
</insert> </insert>
<select id="pageStrategyCrossList" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="pageStrategyCrossList" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
SELECT SELECT
DISTINCT DISTINCT
t4.`name` as waveName, t3.`name` as crossName, t4.`name` as waveName, t3.`name` as crossName,
t3.id as crossId, t3.id as crossId,
GROUP_CONCAT(t2.daily_plan_details SEPARATOR ', ') AS dailyPlanDetails GROUP_CONCAT(t2.daily_plan_details SEPARATOR ', ') AS dailyPlanDetails
FROM FROM
t_base_cross_info t3 t_base_cross_info t3
LEFT join t_greenwave_cross t1 on t3.id =t1.cross_id LEFT join t_greenwave_cross t1 on t3.id =t1.cross_id
LEFT JOIN t_strategy_priority_daily_info t2 on t3.id = t2.cross_id and t2.type=1 LEFT JOIN t_strategy_priority_daily_info t2 on t3.id = t2.cross_id and t2.type=1
LEFT JOIN t_greenwave_info t4 on t4.id = t1.green_id LEFT JOIN t_greenwave_info t4 on t4.id = t1.green_id
WHERE t3.is_signal='1' WHERE t3.is_signal='1'
GROUP BY t3.id GROUP BY t3.id
</select> </select>
<select id="getStrategyList" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity"> <select id="getStrategyList" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
SELECT SELECT
Distinct Distinct
* *
FROM FROM
t_strategy_factory_info t_strategy_factory_info
WHERE status='1' WHERE status='1'
</select> </select>
<select id="getSceneList" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity"> <select id="getSceneList" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
SELECT SELECT
Distinct Distinct
* *
FROM FROM
t_strategy_factory_info t_strategy_factory_info
WHERE status='1' WHERE status='1'
<if test="type != null and type == 1"> <if test="type != null and type == 1">
AND type = 1 AND type = 1
</if> </if>
</select> </select>
<select id="getCompanyList" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity"> <select id="getCompanyList" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
SELECT SELECT
Distinct Distinct
* *
FROM FROM
t_strategy_factory_info t_strategy_factory_info
WHERE status='1' WHERE status='1'
</select> </select>
<insert id="savePriorityInsert" parameterType="java.util.List"> <insert id="savePriorityInsert" parameterType="java.util.List">
...@@ -162,52 +164,55 @@ ...@@ -162,52 +164,55 @@
</insert> </insert>
<select id="selectPriorityTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityConfig"> <select id="selectPriorityTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityConfig">
select select
id,group_id,cross_id id,group_id,cross_id
FROM FROM
t_strategy_priority_config t_strategy_priority_config
WHERE WHERE
1=1 1=1
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
and cross_id = #{crossId} and cross_id = #{crossId}
</if> </if>
</select> </select>
<delete id="deletePriorityConfig" parameterType="map"> <delete id="deletePriorityConfig" parameterType="map">
DELETE DELETE
FROM t_strategy_priority_config FROM t_strategy_priority_config
WHERE cross_id =#{crossId} WHERE cross_id =#{crossId}
</delete> </delete>
<select id="getPriorityConfigData" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity"> <select id="getPriorityConfigData" parameterType="map"
SELECT t2.status,t2.scene, resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
t2.method,t2.strategy_name,t2.strategy_no, SELECT t2.status,t2.scene,
t2.mark,t2.company,t1.priority as priority,t1.id, t2.method,t2.strategy_name,t2.strategy_no,
t1.group_id as labelCode ,t1.group_name as label,t1.cross_id as crossId t2.mark,t2.company,t1.priority as priority,t1.id,
FROM t1.group_id, t1.group_name, t1.cross_id as crossId
t_strategy_priority_config t1 FROM
LEFT JOIN t_strategy_factory_info t2 on t1.strategy_no=t2.strategy_no and t2.status='1' t_strategy_priority_config t1
WHERE LEFT JOIN t_strategy_factory_info t2 on t1.strategy_no=t2.strategy_no and t2.status='1'
1=1 WHERE
AND t1.strategy_no IN 1=1
<foreach item="item" collection="strategyNo" open="(" close=")" separator=","> AND t1.strategy_no IN
#{item} <foreach item="item" collection="strategyNo" open="(" close=")" separator=",">
</foreach> #{item}
</foreach>
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
AND t1.cross_id=#{crossId} AND t1.cross_id=#{crossId}
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
AND t1.type=#{type} AND t1.type=#{type}
</if> </if>
</select> </select>
<select id="getGreenPriorityConfigData" parameterType="map" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity"> <select id="getGreenPriorityConfigData" parameterType="map"
SELECT t2.status, resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
SELECT t2.status,
t2.method,t2.strategy_name,t2.strategy_no, t2.method,t2.strategy_name,t2.strategy_no,
t2.mark,t2.company,t1.priority as priority,t1.id, t2.mark,t2.company,t1.priority as priority,t1.id,
t1.group_id as labelCode ,t1.group_name as label,t1.cross_id as crossId t1.group_id as labelCode ,t1.group_name as label,t1.cross_id as crossId
FROM FROM
t_strategy_priority_config t1 t_strategy_priority_config t1
LEFT JOIN t_strategy_factory_info t2 on t1.strategy_no=t2.strategy_no and t2.status='1' LEFT JOIN t_strategy_factory_info t2 on t1.strategy_no=t2.strategy_no and t2.status='1'
WHERE WHERE
1=1 1=1
AND t1.strategy_no IN AND t1.strategy_no IN
...@@ -215,25 +220,25 @@ ...@@ -215,25 +220,25 @@
#{item} #{item}
</foreach> </foreach>
<if test="greenId!=null and greenId!=''"> <if test="greenId!=null and greenId!=''">
AND green_id=#{greenId} AND green_id=#{greenId}
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
AND t1.type=#{type} AND t1.type=#{type}
</if> </if>
</select> </select>
<select id="getstrategyNo" resultType="java.lang.String"> <select id="getstrategyNo" resultType="java.lang.String">
SELECT SELECT
strategy_no strategy_no
FROM FROM
t_strategy_priority_config t_strategy_priority_config
WHERE WHERE
1=1 1=1
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
AND cross_id=#{crossId} AND cross_id=#{crossId}
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
AND type=#{type} AND type=#{type}
</if> </if>
</select> </select>
<select id="getGreenstrategyNo" resultType="java.lang.String"> <select id="getGreenstrategyNo" resultType="java.lang.String">
...@@ -244,22 +249,23 @@ ...@@ -244,22 +249,23 @@
WHERE WHERE
1=1 1=1
<if test="greenId!=null and greenId!=''"> <if test="greenId!=null and greenId!=''">
AND green_id=#{greenId} AND green_id=#{greenId}
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
AND type=#{type} AND type=#{type}
</if> </if>
</select> </select>
<insert id="savePlanConfig" parameterType="java.util.List" > <insert id="savePlanConfig" parameterType="java.util.List">
INSERT INTO INSERT INTO
t_strategy_priority_daily_info (daily_plan_id,week_execute,daily_plan_details,cross_id,type,green_id) t_strategy_priority_daily_info (daily_plan_id,week_execute,daily_plan_details,cross_id,type,green_id)
VALUES VALUES
<foreach collection="savePlanList" item="item" separator=","> <foreach collection="savePlanList" item="item" separator=",">
(#{item.dailyPlanId},#{item.weekExecute},#{item.dailyPlanDetails},#{item.crossId},#{item.type},#{item.greenId}) (#{item.dailyPlanId},#{item.weekExecute},#{item.dailyPlanDetails},#{item.crossId},#{item.type},#{item.greenId})
</foreach> </foreach>
</insert> </insert>
<select id="selectPlanTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="selectPlanTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
select select
id,daily_plan_id,cross_id id,daily_plan_id,cross_id
FROM FROM
...@@ -270,7 +276,8 @@ ...@@ -270,7 +276,8 @@
and cross_id = #{crossId} and cross_id = #{crossId}
</if> </if>
</select> </select>
<select id="selectGreenPlanTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="selectGreenPlanTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
select select
id,daily_plan_id,cross_id id,daily_plan_id,cross_id
FROM FROM
...@@ -283,7 +290,7 @@ ...@@ -283,7 +290,7 @@
</select> </select>
<delete id="deletePlanConfig"> <delete id="deletePlanConfig">
DELETE DELETE
FROM t_strategy_priority_daily_info FROM t_strategy_priority_daily_info
WHERE cross_id =#{crossId} WHERE cross_id =#{crossId}
</delete> </delete>
<delete id="deleteGreenPlanConfig"> <delete id="deleteGreenPlanConfig">
...@@ -291,13 +298,14 @@ ...@@ -291,13 +298,14 @@
FROM t_strategy_priority_daily_info FROM t_strategy_priority_daily_info
WHERE green_id =#{greenId} WHERE green_id =#{greenId}
</delete> </delete>
<select id="getPlanConfigData" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="getPlanConfigData" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
SELECT SELECT
id,daily_plan_id,week_execute,daily_plan_details,cross_id id,daily_plan_id,week_execute,daily_plan_details,cross_id
FROM FROM
t_strategy_priority_daily_info t_strategy_priority_daily_info
WHERE WHERE
1=1 1=1
<if test="crossId!=null and crossId!=''"> <if test="crossId!=null and crossId!=''">
and cross_id = #{crossId} and cross_id = #{crossId}
</if> </if>
...@@ -305,7 +313,8 @@ ...@@ -305,7 +313,8 @@
and type = #{type} and type = #{type}
</if> </if>
</select> </select>
<select id="getGreenPlanConfigData" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="getGreenPlanConfigData" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
SELECT SELECT
id,daily_plan_id,week_execute,daily_plan_details,cross_id id,daily_plan_id,week_execute,daily_plan_details,cross_id
FROM FROM
...@@ -319,24 +328,26 @@ ...@@ -319,24 +328,26 @@
and type = #{type} and type = #{type}
</if> </if>
</select> </select>
<select id="paramterConfigTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig"> <select id="paramterConfigTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
SELECT SELECT
id,cross_id id,cross_id
FROM t_strategy_priority_parameter FROM t_strategy_priority_parameter
WHERE WHERE
1=1 1=1
<if test="crossId!=null"> <if test="crossId!=null">
AND cross_id =#{crossId} AND cross_id =#{crossId}
</if> </if>
</select> </select>
<select id="paramterGreenConfigTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig"> <select id="paramterGreenConfigTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
SELECT SELECT
id,cross_id id,cross_id
FROM t_strategy_priority_parameter FROM t_strategy_priority_parameter
WHERE WHERE
1=1 1=1
<if test="greenId!=null"> <if test="greenId!=null">
AND green_id =#{greenId} AND green_id =#{greenId}
</if> </if>
</select> </select>
...@@ -350,25 +361,26 @@ ...@@ -350,25 +361,26 @@
FROM t_strategy_priority_parameter FROM t_strategy_priority_parameter
WHERE green_id = #{greenId} WHERE green_id = #{greenId}
</delete> </delete>
<insert id="saveParamConfig" parameterType="list" > <insert id="saveParamConfig" parameterType="list">
INSERT INTO t_strategy_priority_parameter INSERT INTO t_strategy_priority_parameter
(cross_id,strategy_no,param_details,scheduling_param,type,green_id) (cross_id,strategy_no,param_details,scheduling_param,type,green_id)
VALUES VALUES
<foreach collection="savePlanList" item="item" separator=","> <foreach collection="savePlanList" item="item" separator=",">
(#{item.crossId},#{item.strategyNo},#{item.paramDetails},#{item.schedulingParam},#{item.type},#{item.greenId}) (#{item.crossId},#{item.strategyNo},#{item.paramDetails},#{item.schedulingParam},#{item.type},#{item.greenId})
</foreach> </foreach>
</insert> </insert>
<select id="getParamConfigData" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig"> <select id="getParamConfigData" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
SELECT SELECT
id,strategy_no,cross_id,param_details,scheduling_param,type id,strategy_no,cross_id,param_details,scheduling_param,type
FROM FROM
t_strategy_priority_parameter t_strategy_priority_parameter
WHERE WHERE
1=1 1=1
<if test="crossId!=null and crossId!=''" > <if test="crossId!=null and crossId!=''">
AND cross_id =#{crossId} AND cross_id =#{crossId}
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
and type = #{type} and type = #{type}
</if> </if>
...@@ -377,7 +389,8 @@ ...@@ -377,7 +389,8 @@
</if> </if>
</select> </select>
<select id="getGreenParamConfigData" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig"> <select id="getGreenParamConfigData" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
SELECT SELECT
id,strategy_no,cross_id,param_details,type id,strategy_no,cross_id,param_details,type
FROM FROM
...@@ -395,16 +408,18 @@ ...@@ -395,16 +408,18 @@
</if> </if>
</select> </select>
<select id="getStrategyGreenWave" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo"> <select id="getStrategyGreenWave" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">
SELECT t1.green_id as greenId, t4.name as waveName, t1.cross_id as crossId, SELECT t1.green_id as greenId, t4.name as waveName, t1.cross_id as crossId,
t3.name as crossName,t1.sort, t3.name as crossName,t1.sort,
t2.daily_plan_details as dailyPlanDetails t2.daily_plan_details as dailyPlanDetails
FROM t_greenwave_info t4 FROM t_greenwave_info t4
LEFT JOIN t_greenwave_cross t1 on t1.green_id = t4.id LEFT JOIN t_greenwave_cross t1 on t1.green_id = t4.id
LEFT JOIN t_strategy_priority_daily_info t2 on t1.green_id = t2.green_id and t2.type=2 LEFT JOIN t_strategy_priority_daily_info t2 on t1.green_id = t2.green_id and t2.type=2
LEFT JOIN t_base_cross_info t3 on t1.cross_id = t3.id LEFT JOIN t_base_cross_info t3 on t1.cross_id = t3.id
</select> </select>
<select id="selectGreenPriorityTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityConfig"> <select id="selectGreenPriorityTable" parameterType="map"
resultType="net.wanji.opt.entity.strategy.StrategyPriorityConfig">
select select
id,group_id,cross_id id,group_id,cross_id
FROM FROM
...@@ -421,4 +436,24 @@ ...@@ -421,4 +436,24 @@
WHERE green_id =#{greenId} WHERE green_id =#{greenId}
</delete> </delete>
<select id="selectCrossGroupStrategyList" resultType="net.wanji.opt.synthesis.pojo.StrategyFactoryEntity">
select t2.type, t2.scene, t2.strategy_name, t2.strategy_no, t2.method, t2.company,
t2.mark, t2.status, t2.opt_type, t2.create_time, t2.modify_time
from t_strategy_priority_config t1
left join t_strategy_factory_info t2 on t1.strategy_no = t2.strategy_no
<where>
<if test="crossId != null and crossId != ''">
and t1.cross_id = #{crossId}
</if>
<if test="greenId!=null and greenId!=''">
and t1.green_id = #{greenId}
</if>
<if test="groupId != null and groupId != ''">
and t1.group_id = #{groupId}
</if>
order by t1.priority
</where>
</select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment