From 5d263c4be4729d136d7d37b4890e26901b54322a Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 31 May 2024 09:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/api/TerminalBaseClient.java | 2 +- .../TerminalBaseClientFallbackFactory.java | 2 +- .../pq/controller/TerminalBaseController.java | 6 ++-- .../pq/service/TerminalBaseService.java | 2 +- .../service/impl/TerminalBaseServiceImpl.java | 28 +++++++++++-------- .../api/UserReportFeignClient.java | 2 -- .../UserReportFeignClientFallbackFactory.java | 5 ---- ...SupervisionDevMainReportPOServiceImpl.java | 1 + ...SupervisionTempLineDebugPOServiceImpl.java | 4 ++- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java index 711bf0ff4..83d6473d0 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java @@ -37,5 +37,5 @@ public interface TerminalBaseClient { @ApiOperation("终端/母线/监测点同步操作") @PostMapping("terminalSync") - HttpResult terminalSync( @RequestBody SyncTerminalParam syncTerminalParam); + HttpResult terminalSync( @RequestBody SyncTerminalParam syncTerminalParam); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java index 11f0f0dae..1248e7a68 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java @@ -39,7 +39,7 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory terminalSync(SyncTerminalParam syncTerminalParam) { + public HttpResult terminalSync(SyncTerminalParam syncTerminalParam) { log.error("{}异常，降级处理，异常为：{}", "台账同步", throwable.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java index dc4421010..8577ad482 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java @@ -146,11 +146,11 @@ public class TerminalBaseController extends BaseController { @ApiOperation("终端/母线/监测点同步操作") @OperateInfo(operateType = OperateType.ADD, info = LogEnum.BUSINESS_MEDIUM) @PostMapping("terminalSync") - public HttpResult terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) { + public HttpResult terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) { String methodDescribe = getMethodDescribe("terminalSync"); - terminalBaseService.terminalSync(syncTerminalParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + String subtation = terminalBaseService.terminalSync(syncTerminalParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subtation, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java index efec6fa02..c93f36796 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java @@ -242,5 +242,5 @@ public interface TerminalBaseService { * @Author: clam * @Date: 2024/5/29 */ - boolean terminalSync(SyncTerminalParam syncTerminalParam); + String terminalSync(SyncTerminalParam syncTerminalParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index a5763e0e2..352195043 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1812,7 +1812,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple @Override @Transactional(rollbackFor = Exception.class) - public boolean terminalSync(SyncTerminalParam syncTerminalParam) { + public String terminalSync(SyncTerminalParam syncTerminalParam) { String projectIndex = null; String provinceIndex = null; String gdIndex = null; @@ -1847,17 +1847,21 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple //变电站 todo 可能新建电站 if (Objects.nonNull(syncTerminalParam.getSubStationParam())) { if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) { - Line subStation = assembleLine(syncTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, syncTerminalParam.getSubStationParam().getSort()); - this.baseMapper.insert(subStation); - subIndex = subStation.getId(); + Line substation = this.lambdaQuery().eq(Line::getName, syncTerminalParam.getSubStationParam().getName()).one(); + if(Objects.isNull(substation)){ + Line subStation = assembleLine(syncTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, syncTerminalParam.getSubStationParam().getSort()); + this.baseMapper.insert(subStation); + subIndex = subStation.getId(); + + //变电站下的经纬度入库 + Substation sub = new Substation(); + sub.setId(subIndex); + sub.setScale(syncTerminalParam.getSubStationParam().getScale()); + sub.setLng(syncTerminalParam.getSubStationParam().getLng()); + sub.setLat(syncTerminalParam.getSubStationParam().getLat()); + substationMapper.insert(sub); + } - //变电站下的经纬度入库 - Substation sub = new Substation(); - sub.setId(subIndex); - sub.setScale(syncTerminalParam.getSubStationParam().getScale()); - sub.setLng(syncTerminalParam.getSubStationParam().getLng()); - sub.setLat(syncTerminalParam.getSubStationParam().getLat()); - substationMapper.insert(sub); } } @@ -1977,7 +1981,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple deptLine.setLineId(line.getId()); deptLineMapper.insert(deptLine); - return true; + return subIndex; } 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 f98c944c0..c2ad5c000 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,7 +19,5 @@ 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 0baf00840..4151504dd 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 @@ -33,11 +33,6 @@ public class UserReportFeignClientFallbackFactory implements FallbackFactory updateUserStatus(String businessKey, Integer userStatus) { - log.error("{}异常，降级处理，异常为：{}", "更新干扰源用户状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } }; } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index ef20a1bb8..b16cc1340 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -205,6 +205,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper .eq(SupervisionTempDeviceReport::getSubstation,supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getSubstation()) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index ba5939da6..0b9bad6d1 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -247,8 +247,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl