diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java index 486c3e36d..d9b5f3e59 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java @@ -113,7 +113,7 @@ public class SupervisionGeneralSurveyPlanVO extends BaseEntity { @ApiModelProperty(value="流程实例的编号") private String processInstanceId; - @ApiModelProperty(value="流程实例的编号") + @ApiModelProperty(value="计划下变电站详情") private List supervisionGeneralSurveyPlanDetailPOS ; } \ No newline at end of file diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java index 23d74b17f..839d61328 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -10,10 +10,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; -import com.njcn.supervision.pojo.param.user.UserReportParam; import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; -import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.supervision.service.device.IQuitRunningDeviceService; +import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -23,10 +22,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; - -import javax.validation.Valid; - /** *

* 前端控制器 @@ -67,7 +62,7 @@ public class QuitRunningDeviceController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/update") @ApiOperation("更新设备退运") - @ApiImplicitParam(name = "quitRunningDeviceParam", value = "实体参数", required = true) + @ApiImplicitParam(name = "quitRunningDeviceUpdateParam", value = "实体参数", required = true) public HttpResult quitRunningDeviceUpdate(@RequestBody @Validated QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam) { String methodDescribe = getMethodDescribe("quitRunningDeviceUpdateParam"); String runningDeviceId = quitRunningDeviceService.quitRunningDeviceUpdate(quitRunningDeviceUpdateParam); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java index ca89c9974..27f6fd3f8 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java @@ -214,7 +214,7 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl list1 = commTerminalGeneralClient.tagOrIdGetSub(param).getData(); List children = deptSubstationVO.getChildren(); List collect = list1.stream().map(statationStat -> {