Commit 0f23fc8a authored by hanbing's avatar hanbing

方案管理-运行计划,返回运行计划ID

parent 00668107
...@@ -46,6 +46,8 @@ public class RunningPlanDTO { ...@@ -46,6 +46,8 @@ public class RunningPlanDTO {
@NoArgsConstructor @NoArgsConstructor
@Data @Data
public static class SchedulesPlanListElement { public static class SchedulesPlanListElement {
@ApiModelProperty(value = "运行计划ID", required = true)
private Integer id;
@ApiModelProperty(value = "运行计划编号", required = true) @ApiModelProperty(value = "运行计划编号", required = true)
private String scheduleNo; private String scheduleNo;
@ApiModelProperty(value = "运行计划名", required = true) @ApiModelProperty(value = "运行计划名", required = true)
......
...@@ -247,7 +247,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -247,7 +247,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
String crossId = specialServiceCrossPO.getCrossId(); String crossId = specialServiceCrossPO.getCrossId();
// 发送请求 // 发送请求
String url = "http://10.100.1.87/utc/controlCommand/lockControl"; String url = "http://10.100.1.59/utc/controlCommand/lockControl";
String s = gson.toJson(enableDisableSpecialServiceOutVO); String s = gson.toJson(enableDisableSpecialServiceOutVO);
String response = HttpUtil.post(url, s); String response = HttpUtil.post(url, s);
EnableDisableSpecialServiceResponseVO enableDisableSpecialServiceResponseVO = EnableDisableSpecialServiceResponseVO enableDisableSpecialServiceResponseVO =
...@@ -287,7 +287,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -287,7 +287,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
String crossId = specialServiceCrossPO.getCrossId(); String crossId = specialServiceCrossPO.getCrossId();
// 发送请求 // 发送请求
String url = "http://10.100.1.87/utc/controlCommand/lockControl"; String url = "http://10.100.1.59/utc/controlCommand/lockControl";
String s = gson.toJson(enableDisableSpecialServiceOutVO); String s = gson.toJson(enableDisableSpecialServiceOutVO);
String response = HttpUtil.post(url, s); String response = HttpUtil.post(url, s);
EnableDisableSpecialServiceResponseVO enableDisableSpecialServiceResponseVO = EnableDisableSpecialServiceResponseVO enableDisableSpecialServiceResponseVO =
......
...@@ -86,9 +86,11 @@ public class RunningPlanServiceImpl implements RunningPlanService { ...@@ -86,9 +86,11 @@ public class RunningPlanServiceImpl implements RunningPlanService {
for (CrossSchedulesPO crossSchedulesPO : crossSchedulesPOList) { for (CrossSchedulesPO crossSchedulesPO : crossSchedulesPOList) {
String scheduleNo = crossSchedulesPO.getScheduleNo(); String scheduleNo = crossSchedulesPO.getScheduleNo();
String name = crossSchedulesPO.getName(); String name = crossSchedulesPO.getName();
Integer crossSchedulesPOId = crossSchedulesPO.getId();
RunningPlanDTO.SchedulesPlanListElement schedulesPlan = new RunningPlanDTO.SchedulesPlanListElement(); RunningPlanDTO.SchedulesPlanListElement schedulesPlan = new RunningPlanDTO.SchedulesPlanListElement();
schedulesPlan.setScheduleNo(scheduleNo); schedulesPlan.setScheduleNo(scheduleNo);
schedulesPlan.setName(name); schedulesPlan.setName(name);
schedulesPlan.setId(crossSchedulesPOId);
// 构造execList // 构造execList
List<RunningPlanDTO.ExecListElement> execList = buildExecList(crossId, scheduleNo); List<RunningPlanDTO.ExecListElement> execList = buildExecList(crossId, scheduleNo);
schedulesPlan.setExecList(execList); schedulesPlan.setExecList(execList);
......
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