信号控制-控制状态保存

signal-control-service/src/main/java/net/wanji/web/controller/SignalCommandController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.feign.pojo.vo.*;
 import net.wanji.feign.service.UtcFeignClients;
+import net.wanji.web.mapper.ControlHistMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,9 @@ public class SignalCommandController {
     @Autowired
     private UtcFeignClients utcFeignClients;
 
+    @Autowired
+    private ControlHistMapper controlHistMapper;
+
     @ApiOperation(value = "信号机方案下发-基础方案下发", notes = "信号机方案下发-基础方案下发")
     @PostMapping("/schemeSend")
     public JsonViewObject schemeSend(@RequestBody @Validated SchemeSendVO schemeSendVO) {
@@ -37,7 +41,7 @@ public class SignalCommandController {
 
     @ApiOperation(value = "计划下发-计划信息、时段信息", notes = "计划下发-计划信息、时段信息")
     @PostMapping("/planSend")
-    public JsonViewObject planSend(@RequestBody @Validated PlanSendVO planSendVO) throws Exception {
+    public JsonViewObject planSend(@RequestBody @Validated PlanSendVO planSendVO) {
         JsonViewObject jsonViewObject = utcFeignClients.planSend(planSendVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("计划下发-计划信息、时段信息UTC服务调用异常");
@@ -47,7 +51,7 @@ public class SignalCommandController {
 
     @ApiOperation(value = "时间表下发-时间表信息", notes = "时间表下发-时间表信息")
     @PostMapping("/scheduleSend")
-    public JsonViewObject scheduleSend(@RequestBody @Validated ScheduleSendVO scheduleSendVO) throws Exception {
+    public JsonViewObject scheduleSend(@RequestBody @Validated ScheduleSendVO scheduleSendVO) {
         JsonViewObject jsonViewObject = utcFeignClients.scheduleSend(scheduleSendVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("时间表下发-时间表信息UTC服务调用异常");
@@ -57,7 +61,7 @@ public class SignalCommandController {
 
     @ApiOperation(value = "相位配时下发-（下发相位参数）", notes = "相位配时下发-（下发相位参数）")
     @PostMapping("/phaseTimingSend")
-    public JsonViewObject phaseTimingSend(@RequestBody @Validated PhaseTimingSendVO phaseTimingSendVO) throws Exception {
+    public JsonViewObject phaseTimingSend(@RequestBody @Validated PhaseTimingSendVO phaseTimingSendVO) {
         JsonViewObject jsonViewObject = utcFeignClients.phaseTimingSend(phaseTimingSendVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("相位配时下发-（下发相位参数）UTC服务调用异常");
@@ -67,7 +71,7 @@ public class SignalCommandController {
 
     @ApiOperation(value = "灯态控制-路口全红/黄闪/关灯控制/恢复", notes = "灯态控制-路口全红/黄闪/关灯控制/恢复")
     @PostMapping("/lampStateControl")
-    public JsonViewObject allRedControl(@RequestBody @Validated ControlCommandVO commandVO) throws Exception {
+    public JsonViewObject allRedControl(@RequestBody @Validated ControlCommandVO commandVO) {
         Integer controlType = commandVO.getControlType();
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         if (1 == controlType) {
@@ -82,17 +86,19 @@ public class SignalCommandController {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("灯态控制UTC服务调用异常");
         }
+        controlHistMapper.insertOne(commandVO.getCrossCode(), controlType + 1);
         return jsonViewObject;
     }
 
 
     @ApiOperation(value = "步进控制-步进控制/恢复", notes = "步进控制-步进控制/恢复")
     @PostMapping("/stepControl")
-    public JsonViewObject stepControl(@RequestBody @Validated StepControlVO stepControlVO) throws Exception {
+    public JsonViewObject stepControl(@RequestBody @Validated StepControlVO stepControlVO) {
         JsonViewObject jsonViewObject = utcFeignClients.stepControl(stepControlVO.getCode(), stepControlVO.getCommand(), stepControlVO.getStepNum());
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("步进控制-步进控制/恢复UTC服务调用异常");
         }
+        controlHistMapper.insertOne(stepControlVO.getCode(), 7);
         return jsonViewObject;
     }
 
@@ -104,16 +110,18 @@ public class SignalCommandController {
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("恢复时间表-恢复路口时间表执行UTC服务调用异常");
         }
+        controlHistMapper.insertOne(code, 1);
         return jsonViewObject;
     }
 
     @ApiOperation(value = "锁定控制-相位锁定/解锁", notes = "锁定控制-相位锁定/解锁")
     @PostMapping(value = "/lockControl")
-    public JsonViewObject lockControl(@RequestBody @Validated ControlCommandVO commandVO) throws Exception {
+    public JsonViewObject lockControl(@RequestBody @Validated ControlCommandVO commandVO) {
         JsonViewObject jsonViewObject = utcFeignClients.lockControl(commandVO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             return jsonViewObject.fail("锁定控制-相位锁定/解锁UTC服务调用异常");
         }
+        controlHistMapper.insertOne(commandVO.getCrossCode(), 4);
         return jsonViewObject;
     }
 

signal-control-service/src/main/java/net/wanji/web/entity/TCrossControlHist.java

+package net.wanji.web.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author duanruiming
+ * @date 2023/01/29 11:18
+ */
+@Data
+@NoArgsConstructor
+public class TCrossControlHist {
+    /**
+     * id
+     */
+    @ApiModelProperty(name = "id", notes = "")
+    private int id;
+    /**
+     * 路口编号
+     */
+    @ApiModelProperty(name = "路口编号", notes = "")
+    private String crossId;
+    /**
+     * 控制类型
+     */
+    @ApiModelProperty(name = "控制类型：1时间表；2全红；3黄闪；4锁定；5中心优化；6MEC优化；7现场手动", notes = "")
+    private int type;
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(name = "开始时间", notes = "")
+    private Date startTime;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "创建时间", notes = "")
+    private Date gmtCreate;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(name = "修改时间", notes = "")
+    private Date gmtModified;
+}

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

 package net.wanji.web.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import net.wanji.web.po.ControlHistPO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -14,7 +13,8 @@ import java.util.List;
  * @date 2022/10/27 14:25
  */
 @Repository
-@DS("webService")
 public interface ControlHistMapper {
     List<ControlHistPO> selectByCrossId(@Param("crossId") String crossId, @Param("todayDate") Date todayDate);
+
+    int insertOne(@Param("crossId") String crossId, @Param("type") Integer type);
 }

signal-control-service/src/main/resources/mapper/ControlHistMapper.xml

@@ -9,6 +9,19 @@
         <result property="typeCount" column="typeCount"/>
     </resultMap>
 
+    <resultMap id="tCrossControlHist" type="net.wanji.web.entity.TCrossControlHist">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="crossId" column="cross_id" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="TINYINT"/>
+        <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+        <result property="gmtCreate" column="gmt_create" jdbcType="TIMESTAMP"/>
+        <result property="gmtModified" column="gmt_modified" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, crossId, type, startTime, gmt_create, gmt_modified
+    </sql>
+
     <select id="selectByCrossId" resultMap="BaseResultMap">
         select  concat(hour(start_time), ':', floor(minute(start_time)/30)*30) as controlTime,
                 type as controlType,
@@ -19,4 +32,8 @@
         order by controlTime
     </select>
 
+    <insert id="insertOne">
+        insert into t_cross_control_hist (cross_id, type, start_time, gmt_create, gmt_modified)
+        values (#{crossId}, #{type}, now(), now(), now())
+    </insert>
 </mapper>