灯态优化

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

@@ -295,16 +295,6 @@ public class ControlCommandServiceImpl implements ControlCommandService {
         messageContent.addElement(HttpConstants.SPOT).setText(crossInfoPOExt.getCode());
         messageContent.addElement(HttpConstants.PATTERN).setText(tempSchemeSendVO.getPattern());
         messageContent.addElement(HttpConstants.CYCLE).setText(tempSchemeSendVO.getCycle());
-        //如果为空赋值神思的默认值
-        if (ObjectUtils.isEmpty(tempSchemeSendVO.getOffset())) {
-            tempSchemeSendVO.setOffset("0");
-        }
-        if (ObjectUtils.isEmpty(tempSchemeSendVO.getType())) {
-            tempSchemeSendVO.setType("1");
-        }
-        if (ObjectUtils.isEmpty(tempSchemeSendVO.getSplit())) {
-            tempSchemeSendVO.setSplit("40,0,0,40,50,50,0,0,0,0,0,0,0,0,0,0");
-        }
         messageContent.addElement(HttpConstants.OFFSET).setText(tempSchemeSendVO.getOffset());
         messageContent.addElement(HttpConstants.TYPE).setText(tempSchemeSendVO.getType());
         messageContent.addElement(HttpConstants.SPLIT).setText(tempSchemeSendVO.getSplit());

wj-common/src/main/java/net/wanji/common/utils/tool/LocalDateTimeUtil.java

@@ -175,6 +175,7 @@ public class LocalDateTimeUtil {
         LocalDateTime localDateTime = parseStringToDateTimeTwo(nowStageStartTime, LocalDateTimeUtil.TIMEFORMATTERTILT);
         String time = nowStageStartTime.isEmpty() ? "0" : Long.toString(LocalDateTimeUtil.betweenTwoTime(localDateTime, LocalDateTime.now(), ChronoUnit.SECONDS));
         System.out.println(time);
+        System.out.println(new Date().getTime());
     }
 
     /**

wj-databus/src/main/java/net/wanji/databus/vo/TempSchemeSendVO.java

@@ -32,8 +32,7 @@ public class TempSchemeSendVO {
     @NotBlank(message = "offset不能为空")
     private String offset;
 
-    @ApiModelProperty(value = "优化模式", notes = "目前支持 Type=1（预案模式，按时间调整），Type=15（瓶颈模式，\n" +
-            "按比例调整）")
+    @ApiModelProperty(value = "优化模式", notes = "目前支持 Type=1（预案模式，按时间调整），Type=1 时为协调模式，Type=15（瓶颈模式，按比例调整）")
     @NotBlank(message = "type不能为空")
     private String type;