Commit 196d0ef4 authored by duanruiming's avatar duanruiming

锁定控制-相位锁定增加持续时间

parent d09849fc
...@@ -15,7 +15,6 @@ import net.wanji.utc.common.typeenum.DateStyle; ...@@ -15,7 +15,6 @@ import net.wanji.utc.common.typeenum.DateStyle;
import net.wanji.utc.dto.hk.DownloadPlanSpandsDTO; import net.wanji.utc.dto.hk.DownloadPlanSpandsDTO;
import net.wanji.utc.dto.hk.DownloadScheduleDTO; import net.wanji.utc.dto.hk.DownloadScheduleDTO;
import net.wanji.utc.dto.hk.DownloadTimeSpandsDTO; import net.wanji.utc.dto.hk.DownloadTimeSpandsDTO;
import net.wanji.utc.entity.SignalRunring;
import net.wanji.utc.mapper.*; import net.wanji.utc.mapper.*;
import net.wanji.utc.po.*; import net.wanji.utc.po.*;
import net.wanji.utc.service.control.ControlCommandService; import net.wanji.utc.service.control.ControlCommandService;
...@@ -410,7 +409,7 @@ public class HKControlCommandServiceImpl implements ControlCommandService { ...@@ -410,7 +409,7 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
param.put("laneInfos", laneList); param.put("laneInfos", laneList);
param.put("controlNo", 0); param.put("controlNo", 0);
// 控制时长,单位 s,0 则持续控制 // 控制时长,单位 s,0 则持续控制
param.put("duration", 0); param.put("duration", Objects.isNull(commandVO.getDuration()) ? 999 : commandVO.getDuration());
String strResult = ArtemisHttpUtil.doPostStringArtemis(artemisConfig, String strResult = ArtemisHttpUtil.doPostStringArtemis(artemisConfig,
PathUtil.getPathMapByApiCode("setSignalControl"), PathUtil.getPathMapByApiCode("setSignalControl"),
JSON.toJSONString(param), null, null, "application/json", null); JSON.toJSONString(param), null, null, "application/json", null);
......
...@@ -30,4 +30,8 @@ public class ControlCommandVO{ ...@@ -30,4 +30,8 @@ public class ControlCommandVO{
@Max(value = 1, message = "控制类型:1是;0否") @Max(value = 1, message = "控制类型:1是;0否")
@Min(value = 0, message = "控制类型:1是;0否") @Min(value = 0, message = "控制类型:1是;0否")
private Integer command; private Integer command;
@ApiModelProperty(value = "持续时间")
private Integer duration;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment