方案管理-方案下发，强制方案下发

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.web.dto.ScheduleIdDTO;
+import net.wanji.web.dto.SchemeIdDTO;
 import net.wanji.web.service.impl.SchemeSendServiceImpl;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,4 +32,11 @@ public class PlanSendController {
         JsonViewObject jsonViewObject = schemeSendService.scheduleSend(scheduleIdDTO);
         return jsonViewObject;
     }
+
+    @ApiOperation(value = "强制方案", notes = "强制方案")
+    @PostMapping("/schemeSend")
+    public JsonViewObject schemeSend(@RequestBody SchemeIdDTO schemeIdDTO) {
+        JsonViewObject jsonViewObject = schemeSendService.schemeSend(schemeIdDTO);
+        return jsonViewObject;
+    }
 }

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

@@ -20,6 +20,8 @@ public class SaveSchemeConfigDTO {
     private List<PhaseScheme> phaseSchemeList; // 方案列表
     @Data
     public static class PhaseScheme {
+        @ApiModelProperty(value = "方案ID", required = true)
+        private Integer schemeId;
         @ApiModelProperty(value = "方案号", required = true)
         private String schemeNo;
         @ApiModelProperty(value = "方案名称", required = true)

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

+package net.wanji.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 方案下发-强制方案输入参数
+ *
+ * @author Kent HAN
+ * @date 2022/12/20 10:17
+ */
+@Data
+public class SchemeIdDTO {
+    @ApiModelProperty(value = "路口ID，如：c7e7b1f352dd4acab4a60088eb391cca", required = true)
+    private String crossId;
+    @ApiModelProperty(value = "方案ID", required = true)
+    private Integer schemeId;
+}

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

 package net.wanji.web.mapper.scheme;
 
-import io.lettuce.core.dynamic.annotation.Param;
 import net.wanji.web.po.scheme.CrossSchemePO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -31,4 +31,6 @@ public interface CrossSchemeMapper {
 
     CrossSchemePO selectByCrossIdAndSchemeName(@Param("crossId") String crossId,
                                                @Param("schemeName") String schemeName);
+
+    CrossSchemePO selectById(@Param("id") Integer id);
 }

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

@@ -2,6 +2,7 @@ package net.wanji.web.service;
 
 import net.wanji.feign.pojo.result.JsonViewObject;
 import net.wanji.web.dto.ScheduleIdDTO;
+import net.wanji.web.dto.SchemeIdDTO;
 
 /**
  * @author Kent HAN
@@ -9,4 +10,6 @@ import net.wanji.web.dto.ScheduleIdDTO;
  */
 public interface SchemeSendService {
     JsonViewObject scheduleSend(ScheduleIdDTO scheduleIdDTO);
+
+    JsonViewObject schemeSend(SchemeIdDTO schemeIdDTO);
 }

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

@@ -118,6 +118,7 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
             SaveSchemeConfigDTO.PhaseScheme phaseScheme = new SaveSchemeConfigDTO.PhaseScheme();
             phaseScheme.setSchemeNo(crossSchemePO.getSchemeNo());
             phaseScheme.setName(crossSchemePO.getName());
+            phaseScheme.setSchemeId(crossSchemePO.getId());
             // 获取协调相位号
             Integer coordPhaseId = crossSchemePO.getCoordPhase();
             if (coordPhaseId != null) {

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

@@ -60,5 +60,12 @@
         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
+        from t_base_cross_scheme
+        where id = #{id}
+    </select>
+
 
 </mapper>