控制指令接口-时间表下发

signal-utc-service/src/main/java/net/wanji/utc/controller/ControlCommandController.java

@@ -10,6 +10,7 @@ import net.wanji.utc.mapper.CrossInfoMapper;
 import net.wanji.utc.po.CrossInfoPO;
 import net.wanji.utc.service.ControlCommandService;
 import net.wanji.utc.vo.plansend.PlanSendVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,10 +36,11 @@ public class ControlCommandController {
     @Resource
     private CrossInfoMapper crossInfoMapper;
 
-    @Resource
+    @Autowired
     private ControlCommandService hkControlCommandService;
 
     /**
+     *
      */
     @ApiOperation(value = "方案下发-基础方案下发", notes = "方案下发-基础方案下发")
     @PostMapping("/schemeSend")
@@ -168,6 +170,25 @@ public class ControlCommandController {
         }
     }
 
+    /**
+     * 恢复时间表
+     *
+     * @param signalId 信号id
+     * @return {@link Result}<{@link T}>
+     */
+    @ApiOperation(value = "恢复时间表-恢复路口时间表执行", notes = "恢复时间表-恢复路口时间表执行")
+    @PostMapping("/scheduleSend")
+    public <T> Result<T> scheduleSend(@RequestParam String signalId) {
+        if (mock) return Result.success();
+        Integer manufacturerId = check(signalId);
+        if (manufacturerId.equals(BasicEnum.ManufacturerEnum.HK.getCode())) {
+            return hkControlCommandService.scheduleSend(signalId, null, null, null);
+        } else {
+            // todo else
+            return null;
+        }
+    }
+
     private Integer check(String signalId) {
         CrossInfoPO crossInfoPO = crossInfoMapper.selectByCode(signalId);
         if (crossInfoPO == null) {

signal-utc-service/src/main/java/net/wanji/utc/service/ControlCommandService.java

@@ -25,7 +25,7 @@ public interface ControlCommandService {
     /**
      * 时间表下发
      */
-    <T> Result<T> scheduleSend();
+    <T> Result<T> scheduleSend(String signalId, String sourceType, String signalType, Integer command);
 
     /**
      * 锁定控制

signal-utc-service/src/main/java/net/wanji/utc/service/impl/HKControlCommandServiceImpl.java

@@ -62,8 +62,8 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
     }
 
     @Override
-    public <T> Result<T> scheduleSend() {
-        return null;
+    public <T> Result<T> scheduleSend(String signalId, String sourceType, String signalType, Integer command) {
+        return controlSignal(signalId, NORMAL_RUNNING_CONTROL);
     }
 
     @Override
@@ -74,25 +74,25 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
     @Override
     public <T> Result<T> stepControl(String signalId, String sourceType, String signalType, Integer command, Integer stepNum) {
         if (command.equals(TRUE)) return updateManualStep(signalId, STEP_CONTROL, stepNum);
-        else return updateManual(signalId, CANCEL_STEP_CONTROL);
+        else return controlSignal(signalId, CANCEL_STEP_CONTROL);
     }
 
     @Override
     public <T> Result<T> allRedControl(String signalId, String sourceType, String signalType, Integer command) {
         Integer runningMode = command.equals(TRUE) ? ALL_RED_CONTROL : NORMAL_RUNNING_CONTROL;
-        return updateManual(signalId, runningMode);
+        return controlSignal(signalId, runningMode);
     }
 
     @Override
     public <T> Result<T> yellowLightControl(String signalId, String sourceType, String signalType, Integer command) {
         Integer runningMode = command.equals(TRUE) ? YELLOW_LIGHT_CONTROL : NORMAL_RUNNING_CONTROL;
-        return updateManual(signalId, runningMode);
+        return controlSignal(signalId, runningMode);
     }
 
     @Override
     public <T> Result<T> closeLightControl(String signalId, String sourceType, String signalType, Integer command) {
         Integer runningMode = command.equals(TRUE) ? CLOSE_LIGHT_CONTROL : NORMAL_RUNNING_CONTROL;
-        return updateManual(signalId, runningMode);
+        return controlSignal(signalId, runningMode);
     }
 
     @Override
@@ -148,7 +148,7 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
      * @param signalId    信号机编号
      * @param runningMode 0-多时段控制模式 1-关灯、2-黄闪、3-全红、11-取消步进控制、12-灯态锁定、13-灯态解锁
      */
-    private <T> Result<T> updateManual(String signalId, Integer runningMode) {
+    private <T> Result<T> controlSignal(String signalId, Integer runningMode) {
         //执行恢复时间表方案命令
         if (NORMAL_RUNNING_CONTROL.equals(runningMode) || CANCEL_STEP_CONTROL.equals(runningMode)) {
             //根据实时灯态获取当前运行模式