策略管理日计划添加开关

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

@@ -5,7 +5,7 @@
 <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <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, switch_status
     </sql>
 
     <!-- 通用条件列 -->
@@ -41,6 +41,9 @@
             <if test="crossId!=null and crossId!=''">
                 cross_id = #{crossId},
             </if>
+            <if test="switchStatus!=null and switchStatus!=''">
+                switch_status = #{switchStatus},
+            </if>
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -50,6 +53,7 @@
             <result column="week_execute" property="weekExecute"/>
             <result column="daily_plan_details" property="dailyPlanDetails"/>
             <result column="cross_id" property="crossId"/>
+            <result column="switch_status" property="switchStatus"/>
     </resultMap>
 
     <!-- 查询表t_strategy_priority_daily_info所有信息 -->
@@ -101,12 +105,14 @@
             ,week_execute
             ,daily_plan_details
             ,cross_id
+            ,switch_status
         ) VALUES (
             #{id}
             ,#{dailyPlanId}
             ,#{weekExecute}
             ,#{dailyPlanDetails}
             ,#{crossId}
+            ,#{switchStatus}
         )
     </insert>
 
@@ -254,10 +260,10 @@
 
     <insert id="savePlanConfig" parameterType="java.util.List" >
           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, switch_status)
           VALUES
               <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}, #{item.switchStatus})
               </foreach>
     </insert>
     <select id="selectPlanTable" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo">

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

@@ -42,6 +42,11 @@ public class StrategyPriorityDailyInfo implements Serializable {
      */
     private String crossId;
 
+    /**
+     * 开关
+     */
+    private Integer switchStatus;
+
     //非数据库字段
     /**
      * 干线名称 (路由列表返回用)

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

@@ -43,6 +43,8 @@ public class StrategyPriorityGroupVO {
     private StrategySchedulingParam schedulingParamters;
     @ApiModelProperty("类型：1:路口，2干线")
     private Integer type;
+    @ApiModelProperty("开关状态：0:关闭，1开关")
+    private Integer switchStatus;
     @ApiModelProperty("干线编号列表")
     private List<Integer> greenIds;
     /**

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

@@ -294,6 +294,7 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
                         //执行时间
                         String weekExecute = group.getWeekExecute();
                         strategyPriorityDailyInfo.setWeekExecute(weekExecute);
+                        strategyPriorityDailyInfo.setSwitchStatus(group.getSwitchStatus());
                         //先判断表里有没有数据，有的话删除t_strategy_priority_daily_info
                         List<StrategyPriorityDailyInfo> planConfig = strategyPriorityMapper.selectPlanTable(crossId);
                         if (planConfig.size() > 0) {

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

@@ -258,10 +258,10 @@
 
     <insert id="savePlanConfig" parameterType="java.util.List">
         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,switch_status)
         VALUES
         <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},#{item.switchStatus})
         </foreach>
     </insert>
     <select id="selectPlanTable" parameterType="map"