Merge remote-tracking branch 'origin/master'

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

@@ -41,4 +41,10 @@ public class StrategyParameterConfig implements Serializable {
      */
     private String paramDetails;
 
+    /**
+     * 调度配置执行详情
+     */
+    private String schedulingParam;
+
+
 }

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

+package net.wanji.opt.entity.strategy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+/*
+策略参数场景参数配置
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StrategyPriorityParamter {
+
+
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 参数中文名
+     */
+    private String paramCN;
+
+    /**
+     * 参数英文名
+     */
+    private String paramEN;
+
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+
+    /**
+     * 参数说明
+     */
+    private String description;
+
+    /**
+     * 阈值范围
+     */
+    private String threshold;
+    /**
+     * 参数值
+     */
+    private String value;
+
+    /**
+     * 参数场景配置选择的数组ID
+     */
+    private String arrayId;
+
+    /**
+     * type:1：参数配置，2：场景配置
+     */
+    private String type;
+
+
+}

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

+package net.wanji.opt.entity.strategy;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+/*
+策略调度参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+public class StrategySchedulingItem {
+
+    /**
+     * 参数中文名
+     */
+    private String paramCN;
+
+    /**
+     * 参数英文名
+     */
+    private String paramEN;
+
+    /**
+     * 阈值范围
+     */
+    private String threshold;
+
+    /**
+     * 运算符
+     */
+    private String operator;
+
+
+    /**
+     * 逻辑关系 ||,&&
+     */
+    private String logical;
+
+    /**
+     * 参数值
+     */
+    private String paramValue;
+
+}

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

+package net.wanji.opt.entity.strategy;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+/*
+策略调度启动停止参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+public class StrategySchedulingParam {
+    /*
+     * 策略启动控制参数
+     * */
+    private List<StrategySchedulingItem> start;
+    /*
+     * 策略停止控制参数
+     * */
+    private List<StrategySchedulingItem> end;
+}

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

@@ -6,13 +6,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import net.wanji.opt.entity.strategy.StrategyParameterConfig;
-import net.wanji.opt.entity.strategy.StrategyPriorityConfig;
-import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
+import net.wanji.opt.entity.strategy.*;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+
 
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -37,5 +34,7 @@ public class StrategyPriorityGroup {
     //计划表的配置信息
     private Object dailyPlanDetails;
     // 参数配置表的配置信息
-   private List<Object> parameterConfigList;
+   private List<StrategyPriorityParamter> parameterConfigList;
+    // 调度配置表的配置信息
+    private StrategySchedulingParam schedulingParamters;
 }

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

@@ -76,7 +76,7 @@ public interface StrategyPriorityService extends IService<StrategyPriorityDailyI
 
     List<StrategyPriorityDailyInfo> getPlanConfigData(String crossId);
 
-    void saveParamterConfig(StrategyPriorityGroup strategyPriorityGroup);
+    void saveParamterConfig(StrategyPriorityGroup strategyPriorityGroup) throws JsonProcessingException;
 
     List<StrategyParameterConfig> getParamConfigData(String crossId);
 }

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

@@ -7,9 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.opt.dao.mapper.strategy.StrategyPriorityMapper;
-import net.wanji.opt.entity.strategy.StrategyParameterConfig;
-import net.wanji.opt.entity.strategy.StrategyPriorityConfig;
-import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
+import net.wanji.opt.entity.strategy.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.wanji.opt.entity.strategy.dto.StrategyPriorityGroup;
 import net.wanji.opt.servicev2.strategy.StrategyPriorityService;
@@ -250,25 +248,32 @@ import java.util.*;
 * */
 	@Override
 	@Transactional
-	public void saveParamterConfig(StrategyPriorityGroup group) {
+	public void saveParamterConfig(StrategyPriorityGroup group) throws JsonProcessingException {
 
 		try {
 			List<StrategyParameterConfig> savePlanList = new ArrayList<>();
 			StrategyParameterConfig strategyParameterConfig = new StrategyParameterConfig();
 				//策略编号
-				String strategyNo = group.getStrategyNo();
+			String strategyNo = group.getStrategyNo();
 			strategyParameterConfig.setStrategyNo(strategyNo);
 				//路口id
-				String crossId = group.getCrossId();
+			String crossId = group.getCrossId();
 			strategyParameterConfig.setCrossId(crossId);
-				//先判断表里有没有数据，有的话删除t_strategy_parameter_config
+				//先判断表里有没有数据，有的话删除t_strategy_priority_parameter
 				List<StrategyParameterConfig> paramterConfig = strategyPriorityMapper.paramterConfigTable(crossId);
 				if (paramterConfig.size() > 0) {
 					strategyPriorityMapper.deleteParamterConfig(crossId);
 				}
-			List<Object> parameterConfigList = group.getParameterConfigList();
+				//参数 场景配置
+			List<StrategyPriorityParamter> parameterConfigList = group.getParameterConfigList();
 			String jsonString = JSON.toJSONString(parameterConfigList);
 			strategyParameterConfig.setParamDetails(jsonString);
+			//策略调度参数配置
+			StrategySchedulingParam schedulingParamters = group.getSchedulingParamters();
+			ObjectMapper objectMapper = new ObjectMapper();
+			String schedulingParamter = objectMapper.writeValueAsString(schedulingParamters);
+			strategyParameterConfig.setSchedulingParam(schedulingParamter);
+			//添加到最终数据
 			savePlanList.add(strategyParameterConfig);
 			strategyPriorityMapper.saveParamConfig(savePlanList);
 		}catch (Exception e){
@@ -281,7 +286,7 @@ import java.util.*;
 	 * */
 	@Override
 	public List<StrategyParameterConfig> getParamConfigData(String crossId) {
-        try {
+         try {
 			List<StrategyParameterConfig> paraterConfigList = strategyPriorityMapper.getParamConfigData(crossId);
 			return paraterConfigList;
 		}catch (Exception e){

signal-optimize-service/src/main/resources/mapper/strategy/StrategyPriorityMapper.xml

@@ -239,7 +239,7 @@
     <select id="paramterConfigTable"  parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
         SELECT
             id,cross_id
-        FROM  t_strategy_parameter_config
+        FROM  t_strategy_priority_parameter
         WHERE
             1=1
         <if test="crossId!=null">
@@ -248,15 +248,15 @@
     </select>
     <delete id="deleteParamterConfig">
         DELETE
-        FROM t_strategy_parameter_config
+        FROM t_strategy_priority_parameter
         WHERE cross_id =#{crossId}
     </delete>
     <insert id="saveParamConfig" parameterType="list" >
-        INSERT INTO
-            t_strategy_parameter_config(cross_id,strategy_no,param_details)
+        INSERT INTO t_strategy_priority_parameter
+             (cross_id,strategy_no,param_details,scheduling_param)
              VALUES
          <foreach collection="savePlanList"  item="item" separator=",">
-             (#{item.crossId},#{item.strategyNo},#{item.paramDetails})
+             (#{item.crossId},#{item.strategyNo},#{item.paramDetails},#{item.schedulingParam})
          </foreach>
     </insert>
 
@@ -264,7 +264,7 @@
         SELECT
             id,strategy_no,cross_id,param_details
       FROM
-          t_strategy_parameter_config
+        t_strategy_priority_parameter
         WHERE
             1=1
           <if test="crossId!=null">