[update] 策略管理代码提交

signal-optimize-service/src/main/java/net/wanji/opt/controller/signalcontrol/SignalCommandOptController.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiResponses;
 import net.wanji.common.annotation.aspect.AspectLog;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.opt.service.signalcontrol.FeignProxyService;
-import net.wanji.opt.vo.SchemeOptSendVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +37,7 @@ public class SignalCommandOptController {
     @PostMapping(value = "/schemeOptSend",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = JsonViewObject.class)})
-    public JsonViewObject schemeOptSend(@RequestBody @Validated SchemeOptSendVO schemeOptSendVO) throws Exception{
+    public JsonViewObject schemeOptSend(@RequestBody @Validated SchemeOptSendVO schemeOptSendVO) throws Exception {
         JsonViewObject jsonViewObject = feignProxyService.schemeOptSend(schemeOptSendVO);
         return jsonViewObject;
     }
@@ -48,7 +48,7 @@ public class SignalCommandOptController {
     @PostMapping(value = "/schemeOptRestore",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = JsonViewObject.class)})
-    public JsonViewObject schemeOptRestore(@RequestBody @NotBlank String crossId) throws Exception{
+    public JsonViewObject schemeOptRestore(@RequestBody @NotBlank String crossId) throws Exception {
         JsonViewObject jsonViewObject = feignProxyService.schemeOptRestore(crossId);
         return jsonViewObject;
     }

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/DiagnoServiceImpl.java

@@ -29,7 +29,7 @@ import net.wanji.opt.service.signalcontrol.FeignProxyService;
 import net.wanji.opt.service.strategy.SceneService;
 import net.wanji.opt.vo.CrossIdAndLocationVO;
 import net.wanji.opt.vo.OptEffectVO;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.opt.vo.SchemeOptVO;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

signal-optimize-service/src/main/java/net/wanji/opt/service/signalcontrol/FeignProxyService.java

 package net.wanji.opt.service.signalcontrol;
 
 import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 
 /**
  * @author duanruiming

signal-optimize-service/src/main/java/net/wanji/opt/service/signalcontrol/impl/FeignProxyServiceImpl.java

@@ -13,7 +13,7 @@ import net.wanji.opt.dto.CrossPhaseDTO;
 import net.wanji.opt.po.base.CrossSchemeOptLogPO;
 import net.wanji.opt.service.impl.CrossOptimizeServiceImpl;
 import net.wanji.opt.service.signalcontrol.FeignProxyService;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/controller/StrategyControlController.java

@@ -77,6 +77,18 @@ public class StrategyControlController {
         return strategyControlService.strategyPlanDetail(crossId);
     }
 
+    @ApiOperation(value = "策略管理计划详情下发", notes = "策略管理计划详情下发",
+            response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @PostMapping(value = "/strategyPush",
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = StrategyControlDetailList.class),
+    })
+    public JsonViewObject strategyPush(@RequestBody @Validated StrategyControlDetailList list) throws Exception {
+        return strategyControlService.strategyPush(list);
+    }
+
     @ApiOperation(value = "策略管理计划保存", notes = "策略管理计划列表查询",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyControlDataEntity.java

@@ -38,4 +38,6 @@ public class StrategyControlDataEntity extends PageVO {
     private Integer frequency;
     /** value = 状态（1=开启，0=停止） */ 
     private Integer status;
+    @TableField(exist = false)
+    private String crossName;
 }

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyControlDetailList.java

@@ -25,6 +25,7 @@ public class StrategyControlDetailList {
         private Integer type;
         private Integer planId;
         private String company;
+        private Integer status;
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
         private Date startTime;
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyPlanDTO.java

@@ -19,5 +19,6 @@ public class StrategyPlanDTO {
     private List<Integer> weeks;
     private Date startTime;
     private Date endTime;
-
+    private Integer status;
+    private Integer freq;
 }

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyPlanInfoEntity.java

@@ -37,6 +37,7 @@ public class StrategyPlanInfoEntity {
     @ApiModelProperty("endTime")
     @TableField("end_time")
     private Date endTime;
+    private Integer status;
     private String company;
     @ApiModelProperty("planDetails")
     @TableField("plan_details")

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/StrategyControlService.java

@@ -16,5 +16,6 @@ public interface StrategyControlService {
     JsonViewObject crossStrategyInfoList(Integer type) throws Exception;
 
     JsonViewObject strategyPlanDetail(String crossId) throws Exception;
+    JsonViewObject strategyPush(StrategyControlDetailList list) throws Exception;
     JsonViewObject strategyPlanSave(StrategyControlDetailList list) throws Exception;
 }