diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmCategoryController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmCategoryController.java index 36ce1811e..c60ffe43d 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmCategoryController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmCategoryController.java @@ -77,7 +77,7 @@ public class BpmCategoryController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "获得流程分类") + @ApiOperation("获得流程分类") @Parameter(name = "id", description = "编号", required = true) public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); @@ -101,7 +101,7 @@ public class BpmCategoryController extends BaseController { @GetMapping("/simpleList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框") + @ApiOperation("获得动态表单的精简列表") public HttpResult> getCategorySimpleList() { String methodDescribe = getMethodDescribe("getCategorySimpleList"); List list = categoryService.getCategoryList(); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmFormController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmFormController.java index 25591c31d..86c45c1d5 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmFormController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmFormController.java @@ -91,7 +91,7 @@ public class BpmFormController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "获得动态表单") + @ApiOperation("获得动态表单") @Parameter(name = "id", description = "编号", required = true) public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); @@ -101,7 +101,7 @@ public class BpmFormController extends BaseController { @GetMapping("/simpleList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框") + @ApiOperation("获得动态表单的精简列表") public HttpResult> getFormSimpleList() { String methodDescribe = getMethodDescribe("getFormSimpleList"); List list = formService.getFormList(); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java index 779276bcf..f3e48af91 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java @@ -134,7 +134,7 @@ public class BpmModelController extends BaseController { // @PostMapping("/import") -// @Operation(summary = "导入模型") +// @ApiOperation("导入模型") // @PreAuthorize("@ss.hasPermission('bpm:model:import')") // public CommonResult importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException { // BpmModelCreateReqVO createReqVO = BeanUtils.toBean(importReqVO, BpmModelCreateReqVO.class); @@ -155,7 +155,7 @@ public class BpmModelController extends BaseController { // // @PutMapping("/update-state") -// @Operation(summary = "修改模型的状态", description = "实际更新的部署的流程定义的状态") +// @ApiOperation("修改模型的状态", description = "实际更新的部署的流程定义的状态") // @PreAuthorize("@ss.hasPermission('bpm:model:update')") // public CommonResult updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) { // modelService.updateModelState(reqVO.getId(), reqVO.getState()); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessDefinitionController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessDefinitionController.java index 666033c0a..8fd9d3c13 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessDefinitionController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessDefinitionController.java @@ -87,7 +87,7 @@ public class BpmProcessDefinitionController extends BaseController { } @GetMapping("/list") - @Operation(summary = "获得流程定义列表") + @ApiOperation("获得流程定义列表") @Parameter(name = "suspensionState", description = "挂起状态", required = true) // 参见 Flowable SuspensionState 枚举 public HttpResult> getProcessDefinitionList(Integer suspensionState) { String methodDescribe = getMethodDescribe("getProcessDefinitionList"); @@ -105,7 +105,7 @@ public class BpmProcessDefinitionController extends BaseController { } @GetMapping("/get") - @Operation(summary = "获得流程定义") + @ApiOperation("获得流程定义") @Parameter(name = "id", description = "流程编号", required = true, example = "1024") @Parameter(name = "key", description = "流程定义标识", required = true, example = "1024") public HttpResult getProcessDefinition( diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmSignController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmSignController.java index 99dd010a8..1d0a3589a 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmSignController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmSignController.java @@ -101,7 +101,7 @@ public class BpmSignController extends BaseController { @GetMapping("/simpleList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框") + @ApiOperation("获得动态表单的精简列表") public HttpResult> getSignSimpleList() { String methodDescribe = getMethodDescribe("getCategorySimpleList"); List list = bpmSignService.getSignSimpleList(); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java new file mode 100644 index 000000000..9164990e3 --- /dev/null +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java @@ -0,0 +1,27 @@ +package com.njcn.bpm.listener.business; + +import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; +import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; +import com.njcn.supervision.api.SurveyTestFeignClient; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + + +@Component +public class BpmSurveyTestStatusListener extends BpmProcessInstanceStatusEventListener { + + @Resource + private SurveyTestFeignClient surveyTestFeignClient; + + @Override + protected String getProcessDefinitionKey() { + return "survey_test"; + } + + @Override + protected void onEvent(BpmProcessInstanceStatusEvent event) { + surveyTestFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); + } + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java new file mode 100644 index 000000000..2efeda304 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java @@ -0,0 +1,23 @@ +package com.njcn.supervision.api; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.supervision.api.fallback.SurveyPlanFeignClientFallbackFactory; +import com.njcn.supervision.api.fallback.SurveyTestFeignClientFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + + +/** + * 流程实例 Api 接口 + * + * @author 芋道源码 + */ +@FeignClient(value = ServerInfo.SUPERVISION, path = "/surveyTest", fallbackFactory = SurveyTestFeignClientFallbackFactory.class) +public interface SurveyTestFeignClient { + + @GetMapping("/updateSurveyTestStatus") + HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java new file mode 100644 index 000000000..495a50f35 --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java @@ -0,0 +1,37 @@ +package com.njcn.supervision.api.fallback; + +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.supervision.api.SurveyTestFeignClient; +import com.njcn.supervision.utils.SupervisionEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @author denghuajun + * @version 1.0.0 + * @date 2022/3/16 + */ +@Slf4j +@Component +public class SurveyTestFeignClientFallbackFactory implements FallbackFactory { + @Override + public SurveyTestFeignClient create(Throwable throwable) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException) throwable.getCause(); + exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); + } + Enum finalExceptionEnum = exceptionEnum; + return new SurveyTestFeignClient() { + @Override + public HttpResult updateStatus(String businessKey, Integer status) { + log.error("{}异常，降级处理，异常为：{}", "更新退运装置数据流程状态", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java index a1f2f3947..3f2562208 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java @@ -14,7 +14,8 @@ public enum FlowStatusEnum { APPROVE(2, "审批通过"), OPPOSE(3, "审批不通过"), CANCEL(4, "已取消"), - NO_FEEDBACK(5, "未反馈"); + NO_FEEDBACK(5, "未反馈"), + UN_TEST(6, "待测试"); private final Integer code; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java index 046263578..9680c018f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java @@ -23,6 +23,9 @@ public class SurveyTestParam extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty("id") + @NotBlank(message = "索引不能为空") + private String Id; /** * 普测计划表id @@ -88,10 +91,6 @@ public class SurveyTestParam extends BaseEntity implements Serializable { @EqualsAndHashCode(callSuper = true) public static class SurveyTestUpdateParam extends SurveyTestParam { - @ApiModelProperty("id") - @NotBlank(message = "索引不能为空") - private String Id; - } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java index bb15cc9f5..9f6607e4d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java @@ -30,11 +30,52 @@ public class SurveyTestVO extends BaseEntity implements Serializable { */ private String planId; + /** + * 普测计划名称 + */ + private String planName; + + /** + * 0 关联系统内变电站；1 用户手动输入变电站 + */ + private Integer customSubstationFlag; + + /** + * 变电站台账ID或者用户手动输入的变电站名称 + */ + private String substation; + + /** + * 变电站名称 + */ + private String substationName; + + /** + * 变电站电压等级 + */ + private String voltageLevel; + + /** + * 计划开始时间 + */ + private LocalDate planStartTime; + + /** + * 计划结束时间 + */ + private LocalDate planEndTime; + /** * 负责单位id */ private String deptId; + /** + * 负责单位名称 + */ + private String deptName; + + /** * 计划完成时间 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java index 57c6f0324..0fe296620 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java @@ -102,7 +102,7 @@ public class DeVReportManageController extends BaseController { @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改表单状态") + @ApiOperation("更改表单状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); supervisionDevMainReportPOService.updateStatus(businessKey,status); 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 69ed28edc..acfb6d21c 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 @@ -81,7 +81,7 @@ public class QuitRunningDeviceController extends BaseController { @GetMapping("/updateDeviceStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更新退运装置流程状态") + @ApiOperation("更新退运装置流程状态") public HttpResult updateDeviceStatus(String businessKey, Integer status) { String methodDescribe = getMethodDescribe("updateDeviceStatus"); quitRunningDeviceService.updateDeviceStatus(businessKey, status); @@ -90,7 +90,7 @@ public class QuitRunningDeviceController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "根据id获取设备的详细数据") + @ApiOperation("根据id获取设备的详细数据") public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); QuitRunningDeviceVO quitRunningDeviceVO = quitRunningDeviceService.getVOById(id); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java index 1982ab44f..84f707ad6 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java @@ -83,7 +83,7 @@ public class TempLineController extends BaseController { } @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改表单状态") + @ApiOperation("更改表单状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); supervisionTempLineReportService.updateStatus(businessKey,status); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java index b33ec0940..a1a5807c8 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineDebugController.java @@ -91,7 +91,7 @@ public class TempLineDebugController extends BaseController { } @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改表单状态") + @ApiOperation("更改表单状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); supervisionTempLineDebugPOService.updateStatus(businessKey,status); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java index b8dcadf65..715111c8d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java @@ -95,7 +95,7 @@ public class WarningLeafletController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "根据id获取预告警单的详细数据") + @ApiOperation("根据id获取预告警单的详细数据") public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); WarningLeafletVO warningLeafletVO = warningLeafletService.getVOById(id); @@ -105,7 +105,7 @@ public class WarningLeafletController extends BaseController { @ApiIgnore @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改表单状态") + @ApiOperation("更改表单状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); warningLeafletService.updateStatus(businessKey,status); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java index 465c2fc16..ff5f77f4d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/plan/SupervisionPlanController.java @@ -89,7 +89,7 @@ public class SupervisionPlanController extends BaseController { } @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改表单状态") + @ApiOperation("更改表单状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); supervisionPlanPOService.updateStatus(businessKey,status); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java index 147bd445e..5557ac4a2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java @@ -105,7 +105,7 @@ public class GeneralSurveyController extends BaseController { @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更改普测计划状态") + @ApiOperation("更改普测计划状态") public HttpResult updateStatus(String businessKey,Integer status) { String methodDescribe = getMethodDescribe("updateStatus"); supervisionGeneralSurveyPlanPOService.updateStatus(businessKey,status); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java index 755987714..fdc00bc0c 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java @@ -83,7 +83,7 @@ public class SurveyPlanController extends BaseController { @GetMapping("/updateSurveyPlanStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更新普测计划流程状态") + @ApiOperation("更新普测计划流程状态") public HttpResult updateSurveyPlanStatus(String businessKey, Integer status) { String methodDescribe = getMethodDescribe("updateSurveyPlanStatus"); surveyPlanService.updateSurveyPlanStatus(businessKey, status); @@ -92,7 +92,7 @@ public class SurveyPlanController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "根据id获取普测计划的详细数据") + @ApiOperation("根据id获取普测计划的详细数据") public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); SurveyPlanVO surveyPlanVO = surveyPlanService.getVOById(id); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java index 747b40203..37290dfa9 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyTestController.java @@ -10,6 +10,7 @@ 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.survey.SurveyTestParam; +import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO; import com.njcn.supervision.pojo.vo.survey.SurveyTestVO; import com.njcn.supervision.service.survey.ISurveyTestService; import io.swagger.annotations.Api; @@ -82,7 +83,7 @@ public class SurveyTestController extends BaseController { @GetMapping("/updateSurveyTestStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更新普测测试流程状态") + @ApiOperation("更新普测测试流程状态") public HttpResult updateSurveyTestStatus(String businessKey, Integer status) { String methodDescribe = getMethodDescribe("updateSurveyTestStatus"); surveyTestService.updateSurveyTestStatus(businessKey, status); @@ -90,6 +91,14 @@ public class SurveyTestController extends BaseController { } + @GetMapping("/getById") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("根据id获取普测计划测试的详细数据") + public HttpResult getById(String id) { + String methodDescribe = getMethodDescribe("getById"); + SurveyTestVO surveyTestVO = surveyTestService.getVOById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, surveyTestVO, methodDescribe); + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 7ba760907..bb4bc8c72 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -100,7 +100,7 @@ public class UserReportManageController extends BaseController { @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "根据id获取用户档案录入的详细数据") + @ApiOperation("根据id获取用户档案录入的详细数据") public HttpResult getById(String id) { String methodDescribe = getMethodDescribe("getById"); UserReportVO userReportVO = userReportPOService.getVOById(id); @@ -110,7 +110,7 @@ public class UserReportManageController extends BaseController { @GetMapping("/updateUserReportStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更新用户数据流程状态") + @ApiOperation("更新用户数据流程状态") public HttpResult updateUserReportStatus(String businessKey, Integer status) { String methodDescribe = getMethodDescribe("updateUserReportStatus"); userReportPOService.updateUserReportStatus(businessKey, status); @@ -119,7 +119,7 @@ public class UserReportManageController extends BaseController { @GetMapping("/updateUserStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @Operation(summary = "更新干扰源用户状态") + @ApiOperation("更新干扰源用户状态") public HttpResult updateUserStatus(String lineId, Integer userStatus) { String methodDescribe = getMethodDescribe("updateUserStatus"); userReportPOService.updateUserStatus(lineId, userStatus); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml index 0234782f8..4ede081de 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml @@ -3,8 +3,15 @@ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java index 828d83daf..3ea6cc040 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/ISurveyTestService.java @@ -26,4 +26,6 @@ public interface ISurveyTestService extends IService { String cancelSurveyTest(BpmProcessInstanceCancelParam cancelReqVO); void updateSurveyTestStatus(String businessKey, Integer status); + + SurveyTestVO getVOById(String id); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index b3506f78c..7570c028e 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; /** @@ -47,18 +48,22 @@ import java.util.*; * @since 2024-05-30 */ @Service -@RequiredArgsConstructor public class SurveyPlanServiceImpl extends ServiceImpl implements ISurveyPlanService { - private final UserFeignClient userFeignClient; + @Resource + private UserFeignClient userFeignClient; - private final BpmProcessFeignClient bpmProcessFeignClient; + @Resource + private BpmProcessFeignClient bpmProcessFeignClient; - private final DeptFeignClient deptFeignClient; + @Resource + private DeptFeignClient deptFeignClient; - private final LineFeignClient lineFeignClient; + @Resource + private LineFeignClient lineFeignClient; - private final ISurveyTestService surveyTestService; + @Resource + private ISurveyTestService surveyTestService; /** * 预告警单的反馈单对应的流程定义 KEY @@ -98,7 +103,6 @@ public class SurveyPlanServiceImpl extends ServiceImpl implements ISurveyTestService { - private final UserFeignClient userFeignClient; + @Resource + private UserFeignClient userFeignClient; - private final BpmProcessFeignClient bpmProcessFeignClient; + @Resource + private BpmProcessFeignClient bpmProcessFeignClient; + + @Resource + private DeptFeignClient deptFeignClient; + + @Resource + private LineFeignClient lineFeignClient; + + @Resource + private ISurveyPlanService surveyPlanService; /** * 预告警单的反馈单对应的流程定义 KEY @@ -72,18 +89,38 @@ public class SurveyTestServiceImpl extends ServiceImpl(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper); - + Page surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper); + List records = surveyTestVOPage.getRecords(); + if (CollectionUtil.isNotEmpty(records)) { + for (SurveyTestVO record : records) { + //回显部门名称 + record.setDeptName(deptFeignClient.getDeptById(record.getDeptId()).getData().getName()); + //回显变电站名称 + if (record.getCustomSubstationFlag() == 0) { + //关联台账内的变电站名称 + String substation = record.getSubstation(); + record.setSubstationName(lineFeignClient.getSubstationInfo(substation).getData().getName()); + } else { + record.setSubstationName(record.getSubstation()); + } + } + } + return surveyTestVOPage; } @Override @Transactional(rollbackFor = Exception.class) public String addSurveyTest(SurveyTestParam surveyTestParam) { - SurveyTest surveyTest = new SurveyTest(); - BeanUtils.copyProperties(surveyTestParam, surveyTest); + SurveyTest surveyTest = this.getById(surveyTestParam.getId()); + //没有copy前端所有的字段，仅赋值了test表中需要的几个字段 + surveyTest.setCompleteTime(surveyTestParam.getCompleteTime()); + surveyTest.setCompleteBy(surveyTestParam.getCompleteBy()); + surveyTest.setTestReport(surveyTestParam.getTestReport()); + surveyTest.setProblemFlag(surveyTestParam.getProblemFlag()); + surveyTest.setProblemDetail(surveyTestParam.getProblemDetail()); surveyTest.setState(DataStateEnum.ENABLE.getCode()); surveyTest.setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); - this.save(surveyTest); + this.updateById(surveyTest); // 发起 BPM 流程 Map processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); @@ -102,7 +139,7 @@ public class SurveyTestServiceImpl extends ServiceImpl