From 17f220b536e56d63b09c32900cc9c5b58867818d Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 30 May 2024 19:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B2=E6=89=B0=E6=BA=90?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/UserReportFeignClient.java | 3 ++ .../UserReportFeignClientFallbackFactory.java | 6 ++++ .../SupervisionTempDeviceReportParam.java | 13 ++++++++ .../SupervisionTempLineReportParam.java | 2 +- .../device/SupervisionTempDeviceReport.java | 11 +++++++ .../device/SupervisionTempLineReportVO.java | 12 +++++++ .../user/UserReportManageController.java | 9 +++++ .../impl/QuitRunningDeviceServiceImpl.java | 11 ++++--- ...SupervisionTempLineDebugPOServiceImpl.java | 7 ++-- .../SupervisionTempLineReportServiceImpl.java | 11 +++++-- ...SupervisionTempLineRunTestServiceImpl.java | 10 ++++-- .../service/user/UserReportPOService.java | 2 ++ .../user/impl/UserReportPOServiceImpl.java | 33 +++++++++++++++++++ 13 files changed, 117 insertions(+), 13 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java index 92eccbab7..f98c944c0 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java @@ -19,4 +19,7 @@ public interface UserReportFeignClient { @GetMapping("/updateUserReportStatus") HttpResult updateUserReportStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); + @GetMapping("/updateUserStatus") + HttpResult updateUserStatus(String businessKey,Integer userStatus) ; + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java index 4fe6f0bc5..0baf00840 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java @@ -32,6 +32,12 @@ public class UserReportFeignClientFallbackFactory implements FallbackFactory updateUserStatus(String businessKey, Integer userStatus) { + log.error("{}异常，降级处理，异常为：{}", "更新干扰源用户状态", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java index e7f12189a..f3bad5c85 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java @@ -32,6 +32,19 @@ public class SupervisionTempDeviceReportParam { @ApiModelProperty(value="所属供电公司") private String powerCompany; + /** + * 0 关联系统内变电站;1用户手动输入变电站 + */ + @ApiModelProperty(value = " 0 关联系统内变电站;1用户手动输入变电站") + private Integer customubstaionlag; + + /** + * 所属变电站 + */ + @ApiModelProperty(value = "所属变电站名称") + private String substationName; + + /** * 所属变电站 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java index 83601702d..8fb7e021e 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java @@ -222,7 +222,7 @@ public class SupervisionTempLineReportParam { private Integer num; /** - * 线路号 + * 接线方式 */ private Integer ptType; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java index ef7d9130a..6451a074c 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java @@ -32,12 +32,23 @@ public class SupervisionTempDeviceReport { */ @TableField(value = "power_company") private String powerCompany; + /** + * 0 关联系统内变电站;1用户手动输入变电站 + */ + @TableField(value = "custom_substaion_flag") + private Integer customubstaionlag; + /** * 所属变电站 */ @TableField(value = "substation") private String substation; + /** + * 所属变电站 + */ + @TableField(value = "substation_name") + private String substationName; /** * 变电站电压等级 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java index 9e22c5e44..a1c7ff205 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java @@ -223,6 +223,18 @@ public class SupervisionTempLineReportVO { private String processInstanceId; + /** + * 线路号 + */ + private Integer num; + + /** + * 接线方式 + */ + private Integer ptType; + + + /** * 1:审批中；2：审批通过；3：审批不通过；4：已取消 */ 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 d1daaee66..58e9bef38 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,6 +100,15 @@ public class UserReportManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @GetMapping("/updateUserStatus") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @Operation(summary = "更新干扰源用户状态") + public HttpResult updateUserStatus(String lineId,Integer userStatus) { + String methodDescribe = getMethodDescribe("updateUserStatus"); + userReportPOService.updateUserStatus(lineId,userStatus); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getUserReportList") @ApiOperation("查询干扰源下拉列表") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 90865484b..e2884f82e 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -11,22 +11,20 @@ import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum; import com.njcn.bpm.enums.BpmResponseEnum; import com.njcn.bpm.enums.BpmTaskStatusEnum; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; -import com.njcn.bpm.pojo.param.BpmCategoryParam; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; -import com.njcn.bpm.pojo.po.BpmCategory; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.enums.RunFlagEnum; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.line.LineInfoVO; import com.njcn.device.pq.pojo.vo.DeviceVO; -import com.njcn.device.pq.pojo.vo.LineDetailDataVO; -import com.njcn.device.pq.pojo.vo.LineDetailVO; +import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper; import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; import com.njcn.supervision.pojo.po.device.QuitRunningDevice; import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.service.device.IQuitRunningDeviceService; +import com.njcn.supervision.service.user.UserReportPOService; import com.njcn.supervision.utils.InstanceUtil; import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; @@ -59,6 +57,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl ids = supervisionTempLineRunTestParam.getLineIds(); @@ -160,13 +165,14 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl { Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam); String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO); + + void updateUserStatus(String lineId, Integer userStatus); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index c9d126f0a..67ab1b1d5 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -14,10 +14,14 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.UserNatureEnum; +import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.mapper.user.UserReportPOMapper; import com.njcn.supervision.pojo.param.user.UserReportParam; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.user.UserReportPO; import com.njcn.supervision.pojo.po.user.UserReportProjectPO; import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; @@ -66,6 +70,8 @@ public class UserReportPOServiceImpl extends ServiceImpluserStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改 + if(userReportPO.getUserStatus() supervisionTempLineReports = supervisionTempLineReportMapper.selectList(new QueryWrapper().lambda().eq(SupervisionTempLineReport::getUserId, userId)); + List lineIds = supervisionTempLineReports.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList()); + List data = lineFeignClient.getLineDetail(lineIds).getData(); + List collect1 = data.stream().filter(temp -> !Objects.equals(temp.getId(), lineId)) + .map(LineDetail::getRunFlag) + .filter(temp -> !Objects.equals(temp, 2)) + .collect(Collectors.toList()); + if(CollectionUtil.isEmpty(data)){ + userReportPO.setUserStatus(userStatus); + } + }else { + userReportPO.setUserStatus(userStatus); + + } + } + this.updateById(userReportPO); + } + /** * 获取所有字段为null的属性名