方案下发时间表和强制方案回显

signal-control-service/src/main/java/net/wanji/web/dto/RunningPlanDTO.java

@@ -54,6 +54,8 @@ public class RunningPlanDTO {
         private String scheduleNo;
         @ApiModelProperty(value = "运行计划名", required = true)
         private String name;
+        @ApiModelProperty(value = "状态 0执行 1未执行", required = true)
+        private Integer status;
         @ApiModelProperty(value = "执行的日计划列表", required = true)
         private List<ExecListElement> execList;
     }

signal-control-service/src/main/java/net/wanji/web/dto/SaveSchemeConfigDTO.java

@@ -32,6 +32,8 @@ public class SaveSchemeConfigDTO {
         private Integer cycle = 0;
         @ApiModelProperty(value = "相位差", required = false)
         private Integer offset = 0;
+        @ApiModelProperty(value = "状态：1执行；0未执行", required = false)
+        private Integer status;
         private List<RingListElement> ringList; // 环列表
         private List<PhaseListElement> specialControlModeList; // 特殊控制相位列表
 

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossSchedulesMapper.java

@@ -23,4 +23,8 @@ public interface CrossSchedulesMapper {
 
     CrossSchedulesPO selectByCrossIdAndScheduleNo(@Param("crossId") String crossId,
                                                   @Param("scheduleNo") String scheduleNo);
+
+    void resetStatus(String crossId);
+
+    void updateStatus(Integer scheduleId);
 }

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossSchemeMapper.java

@@ -42,4 +42,8 @@ public interface CrossSchemeMapper {
     Set<Integer> selectIdsByCrossId(String crossId);
 
     void deleteByIds(Set<Integer> existedIds);
+
+    void resetStatus(String crossId);
+
+    void updateStatus(Integer schemeId);
 }

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossSchemePO.java

@@ -38,6 +38,8 @@ public class CrossSchemePO {
     /** 删除标识：1删除；0未删除 */
     @ApiModelProperty(name = "删除标识：1删除；0未删除",notes = "")
     private Integer isDeleted ;
+    @ApiModelProperty(name = "状态：1执行；0未执行",notes = "")
+    private Integer status ;
     /** 创建时间 */
     @ApiModelProperty(name = "创建时间",notes = "")
     private Date gmtCreate ;

signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java

@@ -23,6 +23,7 @@ import net.wanji.web.mapper.scheme.CrossLightsMapper;
 import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
 import net.wanji.web.mapper.scheme.CrossPhaseMapper;
 import net.wanji.web.mapper.scheme.CrossPlanMapper;
+import net.wanji.web.mapper.scheme.CrossSchedulesMapper;
 import net.wanji.web.mapper.scheme.CrossSchedulesPlanMapper;
 import net.wanji.web.mapper.scheme.CrossSchemeMapper;
 import net.wanji.web.po.scheme.CrossLightsPO;
@@ -65,13 +66,14 @@ public class PlanSendServiceImpl implements PlanSendService {
     private final CrossPhaseLightsMapper crossPhaseLightsMapper;
     private final RunningPlanServiceImpl runningPlanServiceImpl;
     private final SchemeConfigServiceImpl schemeConfigServiceImpl;
+    private final CrossSchedulesMapper crossSchedulesMapper;
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat hourMinuteSdf = new SimpleDateFormat("HH:mm");
 
     private Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
 
-    public PlanSendServiceImpl(@Qualifier("net.wanji.feign.service.UtcFeignClients") UtcFeignClients utcFeignClients, CrossSchedulesPlanMapper crossSchedulesPlanMapper, CrossPlanMapper crossPlanMapper, CrossSchemeMapper crossSchemeMapper, CrossPhaseMapper crossPhaseMapper, CrossLightsMapper crossLightsMapper, CrossPhaseLightsMapper crossPhaseLightsMapper, RunningPlanServiceImpl runningPlanServiceImpl, SchemeConfigServiceImpl schemeConfigServiceImpl) {
+    public PlanSendServiceImpl(@Qualifier("net.wanji.feign.service.UtcFeignClients") UtcFeignClients utcFeignClients, CrossSchedulesPlanMapper crossSchedulesPlanMapper, CrossPlanMapper crossPlanMapper, CrossSchemeMapper crossSchemeMapper, CrossPhaseMapper crossPhaseMapper, CrossLightsMapper crossLightsMapper, CrossPhaseLightsMapper crossPhaseLightsMapper, RunningPlanServiceImpl runningPlanServiceImpl, SchemeConfigServiceImpl schemeConfigServiceImpl, CrossSchedulesMapper crossSchedulesMapper) {
         this.utcFeignClients = utcFeignClients;
         this.crossSchedulesPlanMapper = crossSchedulesPlanMapper;
         this.crossPlanMapper = crossPlanMapper;
@@ -81,9 +83,11 @@ public class PlanSendServiceImpl implements PlanSendService {
         this.crossPhaseLightsMapper = crossPhaseLightsMapper;
         this.runningPlanServiceImpl = runningPlanServiceImpl;
         this.schemeConfigServiceImpl = schemeConfigServiceImpl;
+        this.crossSchedulesMapper = crossSchedulesMapper;
     }
 
     @Override
+    @Transactional
     public JsonViewObject scheduleSend(ScheduleIdDTO scheduleIdDTO) {
         String crossId = scheduleIdDTO.getCrossId();
         ScheduleSendVO scheduleSendVO = new ScheduleSendVO();
@@ -96,6 +100,10 @@ public class PlanSendServiceImpl implements PlanSendService {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("信号机方案下发-时间表下发UTC服务调用异常");
         }
+        // 更新时间表状态为已执行
+        Integer scheduleId = scheduleIdDTO.getScheduleId();
+        crossSchedulesMapper.resetStatus(crossId);
+        crossSchedulesMapper.updateStatus(scheduleId);
         return jsonViewObject.success();
     }
 
@@ -113,6 +121,9 @@ public class PlanSendServiceImpl implements PlanSendService {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("信号机方案下发-基础方案下发UTC服务调用异常");
         }
+        // 更新方案表状态为已执行
+        crossSchemeMapper.resetStatus(crossId);
+        crossSchemeMapper.updateStatus(schemeId);
         return jsonViewObject.success();
     }
 

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/RunningPlanServiceImpl.java

@@ -91,6 +91,7 @@ public class RunningPlanServiceImpl implements RunningPlanService {
             schedulesPlan.setScheduleNo(scheduleNo);
             schedulesPlan.setName(name);
             schedulesPlan.setId(crossSchedulesPOId);
+            schedulesPlan.setStatus(crossSchedulesPO.getStatus());
             // 构造execList
             List<RunningPlanDTO.ExecListElement> execList = buildExecList(crossId, scheduleNo);
             schedulesPlan.setExecList(execList);

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java

@@ -149,6 +149,7 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
             }
             phaseScheme.setCycle(crossSchemePO.getCycle());
             phaseScheme.setOffset(crossSchemePO.getOffset());
+            phaseScheme.setStatus(crossSchemePO.getStatus());
             // 构造环列表
             String schemeNo = phaseScheme.getSchemeNo();
             Integer schemeId = crossSchemeMapper.selectIdByCrossIdAndSchemeNo(crossId, schemeNo);

signal-control-service/src/main/resources/mapper/scheme/CrossSchedulesMapper.xml

@@ -18,6 +18,18 @@
         values (#{scheduleNo},#{name},#{status},#{crossId})
     </insert>
 
+    <update id="resetStatus">
+        UPDATE t_base_cross_schedules
+        SET status = 0
+        WHERE cross_id = #{crossId}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE t_base_cross_schedules
+        SET status = 1
+        WHERE id = #{scheduleId}
+    </update>
+
     <delete id="deleteByCrossId">
         DELETE FROM t_base_cross_schedules
         WHERE cross_id = #{crossId}

signal-control-service/src/main/resources/mapper/scheme/CrossSchemeMapper.xml

@@ -13,21 +13,22 @@
         <result property="offset" column="offset"/>
         <result property="source" column="source"/>
         <result property="isDeleted" column="is_deleted"/>
+        <result property="status" column="status"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
     </resultMap>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted)
+        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.schemeNo},#{entity.name},#{entity.crossId},#{entity.cycle},#{entity.coordPhase},#{entity.offset},#{entity.source},#{entity.isDeleted})
+            (#{entity.schemeNo},#{entity.name},#{entity.crossId},#{entity.cycle},#{entity.coordPhase},#{entity.offset},#{entity.source},#{entity.isDeleted},#{entity.status})
         </foreach>
     </insert>
 
     <insert id="insertOne">
-        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted)
-        values (#{schemeNo},#{name},#{crossId},#{cycle},#{coordPhase},#{offset},#{source},#{isDeleted})
+        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status)
+        values (#{schemeNo},#{name},#{crossId},#{cycle},#{coordPhase},#{offset},#{source},#{isDeleted},#{status})
     </insert>
 
     <update id="updateCoordPhase">
@@ -57,10 +58,25 @@
             <if test="isDeleted != null and isDeleted != ''">
                 is_deleted = #{isDeleted},
             </if>
+            <if test="status != null and isDeleted != ''">
+                status = #{status},
+            </if>
         </set>
         where id = #{id}
     </update>
 
+    <update id="resetStatus">
+        UPDATE t_base_cross_scheme
+        SET status = 0
+        WHERE cross_id = #{crossId}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE t_base_cross_schedules
+        SET status = 1
+        WHERE id = #{schemeId}
+    </update>
+
     <delete id="deleteByCrossId">
         delete from t_base_cross_scheme
         where cross_id = #{crossId}
@@ -73,7 +89,7 @@
 
     <select id="selectByCrossId" resultMap="BaseResultMap">
         select
-            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
+            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId}
     </select>
@@ -85,14 +101,14 @@
 
     <select id="selectByCrossIdAndSchemeName" resultMap="BaseResultMap">
         select
-            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
+            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId} and name = #{schemeName}
     </select>
 
     <select id="selectById" resultType="net.wanji.web.po.scheme.CrossSchemePO">
         select
-            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
+            id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where id = #{id}
     </select>