From 4bebf28b76c5f2912e541ec4940081ea0631b713 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 6 Nov 2025 16:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BE=9B=E7=BB=99=E7=89=A9=E8=81=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +- .../device/biz/enums/DeviceResponseEnum.java | 1 + pqs-device/pq-device/pom.xml | 1 + pqs-device/pq-device/pq-device-boot/pom.xml | 25 +--- .../pq/controller/CommLineController.java | 2 +- .../pq/controller/CommTerminalController.java | 39 +----- .../pq/controller/DeptLineController.java | 4 +- .../GeneralDeviceInfoController.java | 4 +- .../controller/OperationContrController.java | 4 +- .../pq/controller/OverLimitController.java | 69 ---------- .../pq/controller/TerminalBaseController.java | 7 +- .../device/pq/job/DeviceComflagTasks.java | 17 +-- .../device/pq/mapper/DeviceProcessMapper.java | 29 ----- .../device/pq/mapper/OverlimitMapper.java | 17 --- .../pq/mapper/mapping/OverlimitMapper.xml | 5 - .../device/pq/service/IOverLimitService.java | 20 --- .../service/impl/CommTerminalServiceImpl.java | 4 +- .../service/impl/CommunicateServiceImpl.java | 11 +- .../service/impl/DataVerifyServiceImpl.java | 18 +-- .../impl/DeviceRunEvaluateServiceImpl.java | 7 +- .../service/impl/GridDiagramServiceImpl.java | 11 +- .../service/impl/LargeScreenServiceImpl.java | 1 + .../impl/LineIntegrityDataServiceImpl.java | 3 +- .../pq/service/impl/LineMarkServiceImpl.java | 2 +- .../pq/service/impl/LogManageServiceImpl.java | 12 +- .../service/impl/NewStationServiceImpl.java | 2 +- .../pq/service/impl/OverLimitServiceImpl.java | 20 --- .../impl/PqDataVerifyBakServiceImpl.java | 11 +- .../pq/service/impl/PqIcdPathServiceImpl.java | 15 +-- .../impl/PqsDeviceUnitServiceImpl.java | 2 +- .../impl/PqsLineWeightServiceImpl.java | 4 +- .../impl/PqsTransformerServiceImpl.java | 2 +- .../impl/RStatIntegrityDServiceImpl.java | 7 +- .../pq/service/impl/RunManageServiceImpl.java | 11 +- .../impl/SubstationExpendServiceImpl.java | 3 +- .../service/impl/SubstationServiceImpl.java | 11 +- .../TerminalOnlineRateDataServiceImpl.java | 1 + .../service/impl/TerminalTreeServiceImpl.java | 8 +- .../impl/YwZtSubstationServiceImpl.java | 2 +- pqs-device/pq-device/pq-device-com/pom.xml | 53 ++++++++ .../common}/mapper/SuperDataMapper.java | 2 +- .../device/common}/mapper/TopMsgMapper.java | 2 +- .../mapper/mapping/SuperDataMapper.xml | 2 +- .../common}/mapper/mapping/TopMagMapper.xml | 2 +- .../common/service}/GeneralDeviceService.java | 21 ++- .../common}/service/TerminalBaseService.java | 3 +- .../service/impl/TerminalBaseServiceImpl.java | 31 +++-- .../device}/controller/DeviceController.java | 6 +- .../controller/DeviceVersionController.java} | 6 +- .../controller/NodeDeviceController.java | 6 +- .../controller/PqDevTypeController.java | 9 +- .../controller/ProgramVersionController.java | 4 +- .../device}/mapper/DevFuctionMapper.java | 2 +- .../device/device}/mapper/DevMealMapper.java | 2 +- .../device}/mapper/DevStrategyMapper.java | 2 +- .../device}/mapper/DevVersionMapper.java | 2 +- .../device}/mapper/DeviceBakMapper.java | 2 +- .../device/device}/mapper/DeviceMapper.java | 2 +- .../device/mapper/DeviceProcessMapper.java | 20 +++ .../device}/mapper/PqDevTypeMapper.java | 2 +- .../device}/mapper/ProgramVersionMapper.java | 3 +- .../device}/mapper/TerminalVersionMapper.java | 3 +- .../device/device}/mapper/VersionMapper.java | 2 +- .../mapper/mapping/DevFuctionMapper.xml | 2 +- .../device/mapper/mapping/DevMealMapper.xml} | 2 +- .../mapper/mapping/DevStrategyMapper.xml} | 2 +- .../mapper/mapping/DevVersionMapper.xml | 2 +- .../mapper/mapping/DeviceBakMapper.xml} | 3 +- .../device}/mapper/mapping/DeviceMapper.xml | 2 +- .../mapper/mapping/DeviceProcessMapper.xml} | 3 +- .../mapper/mapping/PqDevTypeMapper.xml | 2 +- .../mapper/mapping/ProgramVersionMapper.xml | 2 +- .../mapper/mapping/TerminalVersionMapper.xml | 2 +- .../device}/mapper/mapping/VersionMapper.xml | 2 +- .../device}/service/DevFuctionService.java | 2 +- .../device}/service/DeviceBakService.java | 2 +- .../device}/service/DeviceProcessService.java | 3 +- .../device}/service/IDevMealService.java | 2 +- .../device}/service/IDevStrategyService.java | 2 +- .../device}/service/IDeviceService.java | 2 +- .../device}/service/NodeDeviceService.java | 3 +- .../device}/service/PqDevTypeService.java | 2 +- .../service/ProgramVersionService.java | 2 +- .../service/TerminalVersionService.java | 2 +- .../service/impl/DevFuctionServiceImpl.java | 9 +- .../service/impl/DevMealServiceImpl.java | 6 +- .../service/impl/DevStrategyServiceImpl.java | 7 +- .../service/impl/DeviceBakServiceImpl.java | 7 +- .../impl/DeviceProcessServiceImpl.java | 10 +- .../service/impl/DeviceServiceImpl.java | 18 +-- .../service/impl/NodeDeviceServiceImpl.java | 21 +-- .../service/impl/PqDevTypeServiceImpl.java | 18 +-- .../impl/ProgramVersionServiceImpl.java | 8 +- .../impl/TerminalVersionServiceImpl.java | 8 +- .../line}/controller/LineController.java | 44 ++----- .../device/line}/mapper/DeptLineMapper.java | 2 +- .../device/line}/mapper/LineBakMapper.java | 4 +- .../device/line}/mapper/LineDetailMapper.java | 2 +- .../njcn/device/line}/mapper/LineMapper.java | 21 +-- .../line}/mapper/mapping/DeptLineMapper.xml | 2 +- .../line}/mapper/mapping/LineBakMapper.xml | 2 +- .../line}/mapper/mapping/LineDetailMapper.xml | 2 +- .../line}/mapper/mapping/LineMapper.xml | 18 +-- .../device/line}/service/DeptLineService.java | 2 +- .../device/line}/service/LineBakService.java | 4 +- .../device/line}/service/LineService.java | 31 +---- .../service/impl/DeptLineServiceImpl.java | 10 +- .../service/impl/LineBakServiceImpl.java | 6 +- .../line}/service/impl/LineServiceImpl.java | 108 +++------------- .../node}/controller/NodeController.java | 6 +- .../njcn/device/node}/mapper/NodeMapper.java | 2 +- .../node}/mapper/mapping/NodeMapper.xml | 2 +- .../device/node}/service/INodeService.java | 2 +- .../node}/service/impl/NodeServiceImpl.java | 6 +- .../controller/PQOverlimitController.java | 112 ++++++++++++++++ .../overlimit/mapper/OverlimitMapper.java | 28 ++++ .../mapper/mapping/OverlimitMapper.xml | 20 +++ .../overlimit/service/IOverLimitService.java | 37 ++++++ .../service/impl/OverLimitServiceImpl.java | 104 +++++++++++++++ .../mapper/RStatIntegrityDMapper.java | 3 +- .../mapper/mapping/RStatIntegrityDMapper.xml | 2 +- .../substation}/mapper/SubstationMapper.java | 2 +- .../mapper/mapping/SubstationMapper.xml | 2 +- .../subvoltage}/mapper/VoltageMapper.java | 2 +- .../mapper/mapping/VoltageMapper.xml | 2 +- .../controller/PqsTerminalLogsController.java | 10 +- .../TerminalMaintainController.java | 5 +- .../mapper/PqsTerminalLogsMapper.java | 2 +- .../mapper/TerminalMaintainMapper.java | 2 +- .../mapper/mapping/PqsTerminalLogsMapper.xml | 2 +- .../mapper/mapping/TerminalMaintainMapper.xml | 2 +- .../service/IPqsTerminalLogsService.java | 6 +- .../service/TerminalMaintainService.java | 4 +- .../impl/PqsTerminalLogsServiceImpl.java | 11 +- .../impl/TerminalMaintainServiceImpl.java | 16 ++- .../njcn/device}/utils/ExcelStyleUtil.java | 2 +- .../com/njcn/device}/utils/SocketClient.java | 18 ++- pqs-harmonic/harmonic-boot/pom.xml | 7 +- .../controller/HistoryResultController.java | 18 --- .../majornetwork/RStatLimitController.java | 28 +--- .../service/IRStatLimitRateDService.java | 16 --- .../service/impl/AnalyzeServiceImpl.java | 6 +- .../service/impl/GridServiceImpl.java | 2 +- .../impl/PollutionSubstationServiceImpl.java | 1 + .../impl/RStatLimitRateDServiceImpl.java | 20 --- .../impl/SteadyExceedRateServiceImpl.java | 4 +- .../impl/SteadyQualifyServiceImpl.java | 2 +- .../majornetwork/RStatLimitService.java | 12 -- .../RMpPartHarmonicDetailDServiceImpl.java | 2 +- .../impl/RStatLimitServiceImpl.java | 95 +------------- .../impl/REvaluationDataServiceImpl.java | 7 +- .../TypicalSourceLoadDownServiceImpl.java | 4 - pqs-harmonic/harmonic-common/pom.xml | 32 +++++ .../controller/RStatLimitRateDController.java | 84 ++++++++++++ .../mapper/RStatLimitRateDMapper.java | 2 +- .../mapper/mapping/RStatLimitRateDMapper.xml | 2 +- .../service/IRStatLimitRateDService.java | 26 ++++ .../impl/RStatLimitRateDServiceImpl.java | 120 ++++++++++++++++++ pqs-harmonic/pom.xml | 1 + 159 files changed, 980 insertions(+), 946 deletions(-) delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OverLimitController.java delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceProcessMapper.java delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/OverlimitMapper.xml delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IOverLimitService.java delete mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/OverLimitServiceImpl.java create mode 100644 pqs-device/pq-device/pq-device-com/pom.xml rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/mapper/SuperDataMapper.java (91%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/mapper/TopMsgMapper.java (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/mapper/mapping/SuperDataMapper.xml (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/mapper/mapping/TopMagMapper.xml (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/service/impl => pq-device-com/src/main/java/com/njcn/device/common/service}/GeneralDeviceService.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/service/TerminalBaseService.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/common}/service/impl/TerminalBaseServiceImpl.java (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/controller/DeviceController.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalVersionController.java => pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceVersionController.java} (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/controller/NodeDeviceController.java (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/controller/PqDevTypeController.java (91%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/controller/ProgramVersionController.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DevFuctionMapper.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DevMealMapper.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DevStrategyMapper.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DevVersionMapper.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DeviceBakMapper.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/DeviceMapper.java (98%) create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceProcessMapper.java rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/PqDevTypeMapper.java (87%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/ProgramVersionMapper.java (90%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/TerminalVersionMapper.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/VersionMapper.java (92%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/DevFuctionMapper.xml (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml => pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevMealMapper.xml} (71%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml => pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevStrategyMapper.xml} (69%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/DevVersionMapper.xml (69%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceProcessMapper.xml => pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceBakMapper.xml} (71%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/DeviceMapper.xml (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceBakMapper.xml => pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceProcessMapper.xml} (68%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/PqDevTypeMapper.xml (70%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/ProgramVersionMapper.xml (95%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/TerminalVersionMapper.xml (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/mapper/mapping/VersionMapper.xml (92%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/DevFuctionService.java (88%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/DeviceBakService.java (85%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/DeviceProcessService.java (75%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/IDevMealService.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/IDevStrategyService.java (86%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/IDeviceService.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/NodeDeviceService.java (88%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/PqDevTypeService.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/ProgramVersionService.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/TerminalVersionService.java (95%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DevFuctionServiceImpl.java (55%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DevMealServiceImpl.java (70%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DevStrategyServiceImpl.java (63%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DeviceBakServiceImpl.java (67%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DeviceProcessServiceImpl.java (62%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/DeviceServiceImpl.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/NodeDeviceServiceImpl.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/PqDevTypeServiceImpl.java (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/ProgramVersionServiceImpl.java (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/device}/service/impl/TerminalVersionServiceImpl.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/controller/LineController.java (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/DeptLineMapper.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/LineBakMapper.java (71%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/LineDetailMapper.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/LineMapper.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/mapping/DeptLineMapper.xml (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/mapping/LineBakMapper.xml (71%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/mapping/LineDetailMapper.xml (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/mapper/mapping/LineMapper.xml (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/DeptLineService.java (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/LineBakService.java (64%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/LineService.java (91%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/impl/DeptLineServiceImpl.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/impl/LineBakServiceImpl.java (75%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/line}/service/impl/LineServiceImpl.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/node}/controller/NodeController.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/node}/mapper/NodeMapper.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/node}/mapper/mapping/NodeMapper.xml (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/node}/service/INodeService.java (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/node}/service/impl/NodeServiceImpl.java (98%) create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/controller/PQOverlimitController.java create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/OverlimitMapper.java create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/mapping/OverlimitMapper.xml create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/IOverLimitService.java create mode 100644 pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/impl/OverLimitServiceImpl.java rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/rstatintegrity}/mapper/RStatIntegrityDMapper.java (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/rstatintegrity}/mapper/mapping/RStatIntegrityDMapper.xml (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/substation}/mapper/SubstationMapper.java (95%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/substation}/mapper/mapping/SubstationMapper.xml (97%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/subvoltage}/mapper/VoltageMapper.java (95%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/subvoltage}/mapper/mapping/VoltageMapper.xml (91%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/controller/PqsTerminalLogsController.java (94%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/controller/TerminalMaintainController.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/mapper/PqsTerminalLogsMapper.java (93%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/mapper/TerminalMaintainMapper.java (98%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/mapper/mapping/PqsTerminalLogsMapper.xml (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/mapper/mapping/TerminalMaintainMapper.xml (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/service/IPqsTerminalLogsService.java (77%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/service/TerminalMaintainService.java (90%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/service/impl/PqsTerminalLogsServiceImpl.java (92%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device/terminal}/service/impl/TerminalMaintainServiceImpl.java (96%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device}/utils/ExcelStyleUtil.java (99%) rename pqs-device/pq-device/{pq-device-boot/src/main/java/com/njcn/device/pq => pq-device-com/src/main/java/com/njcn/device}/utils/SocketClient.java (99%) delete mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IRStatLimitRateDService.java delete mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatLimitRateDServiceImpl.java create mode 100644 pqs-harmonic/harmonic-common/pom.xml create mode 100644 pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/controller/RStatLimitRateDController.java rename pqs-harmonic/{harmonic-boot/src/main/java/com/njcn/harmonic => harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate}/mapper/RStatLimitRateDMapper.java (98%) rename pqs-harmonic/{harmonic-boot/src/main/java/com/njcn/harmonic => harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate}/mapper/mapping/RStatLimitRateDMapper.xml (99%) create mode 100644 pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/IRStatLimitRateDService.java create mode 100644 pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/rstatlimitrate/service/impl/RStatLimitRateDServiceImpl.java diff --git a/pom.xml b/pom.xml index f53abbfa0..6bd72681f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,9 +41,9 @@ - 192.168.1.22 + 192.168.1.103 - 192.168.1.127 + 127.0.0.1 192.168.1.22 @@ -55,7 +55,7 @@ - 78588706-e06f-4580-b612-b26d72493fcb + 6fd2d036-f390-46ee-9c9d-d5a5c00e3314 ${middle.server.url}:8080 diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java index 4c1d38c33..21e5c73e7 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java @@ -32,6 +32,7 @@ public enum DeviceResponseEnum { DEVICE_SAME_NAME("A0290","设备名称已存在"), DEVICE_REPETITION("A0291","设备名称重复"), + MODEL_NAME_REPEAT("A00350","名称不可重复"), DEVICE_IP_REPETITION("A0292","设备ip端口号重复"), DEVICE_SAME_IP("A0293","当前设备ip端口号已存在"), DEVICE_EMPTY("A0294","设备为空"), diff --git a/pqs-device/pq-device/pom.xml b/pqs-device/pq-device/pom.xml index d3588b1b5..0fadd2cc3 100644 --- a/pqs-device/pq-device/pom.xml +++ b/pqs-device/pq-device/pom.xml @@ -14,6 +14,7 @@ pq-device-api pq-device-boot + pq-device-com diff --git a/pqs-device/pq-device/pq-device-boot/pom.xml b/pqs-device/pq-device/pq-device-boot/pom.xml index b8f490239..841963792 100644 --- a/pqs-device/pq-device/pq-device-boot/pom.xml +++ b/pqs-device/pq-device/pq-device-boot/pom.xml @@ -20,10 +20,9 @@ com.njcn - pq-device-api - ${project.version} + pq-device-com + 1.0.0 - com.njcn system-api @@ -39,26 +38,10 @@ common-web ${project.version} - - com.njcn - common-oss - 1.0.0 - compile - - - com.njcn.platform - message-api - 1.0.0 - compile - - - com.njcn - supervision-api - 1.0.0 - compile - + + com.njcn.platform diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java index ab6f431ce..56a99ad78 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommLineController.java @@ -8,7 +8,7 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.dto.LineALLInfoDTO; import com.njcn.device.biz.pojo.dto.PollutionLineInfoDTO; -import com.njcn.device.pq.service.LineService; +import com.njcn.device.line.service.LineService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java index 468a5ecf4..c7f00a15e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java @@ -11,14 +11,12 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.param.SubstationParam; -import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.LineService; +import com.njcn.device.line.mapper.LineDetailMapper; import com.njcn.device.pq.service.CommTerminalService; -import com.njcn.device.pq.service.IOverLimitService; import com.njcn.device.pq.service.IPqsDeviceUnitService; -import com.njcn.device.pq.service.LineService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -57,9 +55,6 @@ public class CommTerminalController extends BaseController { private final IPqsDeviceUnitService iPqsDeviceUnitService; - private final IOverLimitService iOverLimitService; - - /** * 通过部门获取所有子集部门所拥有的监测点基本信息 @@ -241,34 +236,6 @@ public class CommTerminalController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getOverLimitData") - @ApiOperation("根据监测点id获取越限数值") - @ApiImplicitParam(name = "id", value = "监测点id", required = true) - public HttpResult getOverLimitData(@RequestParam("id") String id) { - String methodDescribe = getMethodDescribe("getOverLimitData"); - Overlimit result = lineService.getOverLimitData(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getAllLineOverLimit") - @ApiOperation("获取投运在线的监测点的限值") - public HttpResult> getAllLineOverLimit() { - String methodDescribe = getMethodDescribe("getAllLineOverLimit"); - List result = lineService.getAllLineOverLimit("harmonic-boot", null); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getOverLimitDataByIds") - @ApiOperation("根据监测点id集合获取越限数值") - @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true) - public HttpResult> getOverLimitDataByIds(@RequestBody List ids) { - String methodDescribe = getMethodDescribe("getOverLimitDataByIds"); - List result = iOverLimitService.listByIds(ids); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } @PostMapping("/getLineBySubstationRelation") @ApiOperation("获取变电站和监测点的关系") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java index 3519b199b..6d35187f9 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java @@ -7,10 +7,10 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.device.pq.mapper.DeptLineMapper; +import com.njcn.device.line.mapper.DeptLineMapper; +import com.njcn.device.line.service.DeptLineService; import com.njcn.device.pq.pojo.po.DeptLine; import com.njcn.device.pq.pojo.vo.LineDeviceStateVO; -import com.njcn.device.pq.service.DeptLineService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.DeptLineParam; import io.swagger.annotations.Api; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java index b718cb879..6be3b9362 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java @@ -6,6 +6,8 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.common.service.TerminalBaseService; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; @@ -13,8 +15,6 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.po.TopMsgPO; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.service.TerminalBaseService; -import com.njcn.device.pq.service.impl.GeneralDeviceService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 0298ba77a..3ba167105 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -7,20 +7,18 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; +import com.njcn.device.line.service.LineService; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.PqsParam; import com.njcn.device.pq.pojo.po.TopMsgPO; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.service.LineService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.RequestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OverLimitController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OverLimitController.java deleted file mode 100644 index 957bf5480..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OverLimitController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.njcn.device.pq.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -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.common.utils.HttpResultUtil; -import com.njcn.device.biz.pojo.po.Overlimit; -import com.njcn.device.pq.pojo.param.AlarmStrategyParam; -import com.njcn.device.pq.pojo.vo.AlarmStrategyVO; -import com.njcn.device.pq.service.AlarmStrategyService; -import com.njcn.device.pq.service.IOverLimitService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -/** - * 监测点限值 - * @author cdf - * @date 2023/6/7 - */ -@Slf4j -@RestController -@RequestMapping("/overLimit") -@Api(tags = "监测点限值") -@RequiredArgsConstructor -public class OverLimitController extends BaseController { - - private final IOverLimitService iOverLimitService; - - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getOverLimitByLineIds") - @ApiOperation("监测点集合获取限值") - @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true) - @ApiIgnore - public HttpResult> getOverLimitByLineIds(@RequestBody List lineIds){ - String methodDescribe = getMethodDescribe("getOverLimitByLineIds"); - List overLimitList= iOverLimitService.list(new LambdaQueryWrapper().in(Overlimit::getId,lineIds)); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe); - } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getLimitMapsByLineIds") - @ApiOperation("监测点集合获取限值") - @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true) - @ApiIgnore - public HttpResult>> getLimitMapsByLineIds(@RequestBody List lineIds){ - String methodDescribe = getMethodDescribe("getLimitMapsByLineIds"); - List> overLimitList= iOverLimitService.listMaps(new LambdaQueryWrapper().in(Overlimit::getId,lineIds)); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe); - } - -} 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 82d9c4bf5..fd7482bb8 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 @@ -12,6 +12,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.common.service.TerminalBaseService; +import com.njcn.device.line.service.LineService; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; @@ -20,10 +23,6 @@ import com.njcn.device.pq.pojo.dto.PushResultDTO; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.service.LineService; -import com.njcn.device.pq.service.TerminalBaseService; -import com.njcn.device.pq.service.impl.GeneralDeviceService; -import com.njcn.message.constant.DeviceRebootType; import com.njcn.poi.util.PoiUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.*; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java index 8ea761a1b..93a7f3bcf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/job/DeviceComflagTasks.java @@ -4,21 +4,13 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.dataProcess.api.PqsCommunicateFeignClient; import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto; -import com.njcn.device.pq.constant.Param; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.NodeMapper; -import com.njcn.device.pq.mapper.PqsTerminalLogsMapper; -import com.njcn.device.pq.pojo.dto.DeviceInfo; -import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree; +import com.njcn.device.device.service.DeviceProcessService; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.node.mapper.NodeMapper; import com.njcn.device.pq.pojo.po.Device; import com.njcn.device.pq.pojo.po.DeviceProcess; import com.njcn.device.pq.pojo.po.Node; -import com.njcn.device.pq.pojo.po.PqsTerminalLogs; -import com.njcn.device.pq.service.DeviceProcessService; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.message.constant.DeviceRebootType; import com.njcn.redis.utils.RedisUtil; -import com.njcn.system.api.DicDataFeignClient; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.scheduling.annotation.EnableScheduling; @@ -26,12 +18,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceProcessMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceProcessMapper.java deleted file mode 100644 index 9fea5fb68..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceProcessMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.njcn.device.pq.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pq.pojo.po.Device; -import com.njcn.device.pq.pojo.po.DeviceProcess; -import com.njcn.device.pq.pojo.vo.DevDetail; -import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO; -import com.njcn.device.pq.pojo.vo.RunManageVO; -import com.njcn.device.pq.pojo.vo.RunTimeVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author cdf - * @since 2022-01-04 - */ -public interface DeviceProcessMapper extends BaseMapper { - - - - -} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java deleted file mode 100644 index db5d4b6ed..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.njcn.device.pq.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.biz.pojo.po.Overlimit; - -/** - *

- * Mapper 接口 - *

- * - * @author cdf - * @since 2022-01-04 - */ -public interface OverlimitMapper extends BaseMapper { - -} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/OverlimitMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/OverlimitMapper.xml deleted file mode 100644 index 57e7e627d..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/OverlimitMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IOverLimitService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IOverLimitService.java deleted file mode 100644 index c49693a6c..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IOverLimitService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.device.pq.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.device.biz.pojo.po.Overlimit; -import com.njcn.device.pq.pojo.po.RStatIntegrityD; - -/** - *

- * 越限表实体 - *

- * - * @author hongawen - * @since 2023-03-28 - */ -public interface IOverLimitService extends IService { - - - -} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index a7faa2fa1..2cf9c3c5d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java @@ -10,11 +10,11 @@ import com.njcn.common.utils.EnumUtils; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.param.SubstationParam; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.DeptLineService; import com.njcn.device.pq.enums.RunFlagEnum; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam; import com.njcn.device.pq.service.CommTerminalService; -import com.njcn.device.pq.service.DeptLineService; import com.njcn.redis.utils.RedisUtil; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java index ddf7fdb12..ff73f2616 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java @@ -3,8 +3,7 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.device.pq.mapper.OnlineRateMapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; +import com.njcn.device.line.service.LineService; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.param.PulicTimeParam; @@ -12,23 +11,17 @@ import com.njcn.device.pq.pojo.param.PulicTimeStatisParam; import com.njcn.device.pq.pojo.po.RStatOnlinerateD; import com.njcn.device.pq.pojo.vo.*; import com.njcn.device.pq.service.CommunicateService; -import com.njcn.device.pq.service.LineService; -import com.njcn.device.pq.utils.PublicDateUtil; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import com.njcn.web.enums.DateFlagEnum; import lombok.AllArgsConstructor; -import lombok.SneakyThrows; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java index 47457e3d2..44def8a5f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java @@ -4,13 +4,9 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.*; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.dataProcess.api.DataLimitRateDetailFeignClient; @@ -21,31 +17,23 @@ import com.njcn.dataProcess.enums.DataCleanEnum; import com.njcn.dataProcess.param.DataCleanParam; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto; -import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto; import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; -import com.njcn.device.pq.constant.Param; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.mapper.DataVerifyMapper; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.PqDataVerifyBakMapper; import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam; import com.njcn.device.pq.pojo.po.DataVerify; -import com.njcn.device.pq.pojo.po.Line; -import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.device.pq.pojo.vo.dataClean.*; import com.njcn.device.pq.service.CommTerminalService; import com.njcn.device.pq.service.IDataVerifyService; -import com.njcn.device.pq.service.LineService; -import com.njcn.harmonic.pojo.vo.RStatLimitTargetVO; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.NewUserReportVO; -import com.njcn.supervision.pojo.vo.user.UserLedgerVO; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -58,16 +46,12 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.lang.reflect.Field; -import java.text.DateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; -import java.util.regex.Pattern; import java.util.stream.Collectors; -import java.util.stream.Stream; - /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java index 3dc5db6d3..fe3cd0ab5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java @@ -9,7 +9,9 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.DeptLineService; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DevRunEvaluateParam; @@ -23,11 +25,10 @@ import cn.hutool.core.collection.CollectionUtil; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.PowerFlagEnum; import com.njcn.device.pq.enums.RunFlagEnum; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.pojo.dto.MonitorInfoDTO; import com.njcn.device.pq.pojo.vo.TerminalEvaluateAreaVO; -import com.njcn.device.pq.service.DeptLineService; import com.njcn.device.pq.service.DeviceRunEvaluateService; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import com.njcn.harmonic.api.RStatLimitRateDClient; import com.njcn.harmonic.pojo.param.RStatLimitQueryParam; import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java index 84dfd39ce..361d36630 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,8 +13,11 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.service.DeptLineService; +import com.njcn.device.line.service.LineService; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.GridDiagramParam; @@ -25,12 +27,12 @@ import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.GridDiagramProVO; import com.njcn.device.pq.pojo.vo.GridDiagramVO; import com.njcn.device.pq.service.*; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; -import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; import java.time.ZoneId; @@ -39,7 +41,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java index 979a078d6..9e66a0580 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.service.impl; import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.common.service.GeneralDeviceService; import com.njcn.device.pq.mapper.LargeScreenMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java index cf4a65df8..5d7f74c46 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.common.service.GeneralDeviceService; import com.njcn.device.pq.api.AlarmClient; import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.biz.enums.DeviceResponseEnum; @@ -15,7 +16,6 @@ import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.PowerFlagEnum; import com.njcn.device.pq.enums.RunFlagEnum; import com.njcn.device.pq.mapper.LineIntegrityDataMapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.dto.PublicDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; @@ -27,6 +27,7 @@ import com.njcn.device.pq.pojo.vo.LineIntegrityDataVO; import com.njcn.device.pq.pojo.vo.RStatIntegrityVO; import com.njcn.device.pq.service.LineIntegrityDataService; import com.njcn.device.pq.utils.DataStatisticsUtil; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import com.njcn.harmonic.pojo.vo.IntegrityIconVO; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.param.user.UserReportParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java index 027df6f6a..a7382dcad 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.pq.mapper.LineDetailMapper; +import com.njcn.device.line.mapper.LineDetailMapper; import com.njcn.device.pq.mapper.LineMarkMapper; import com.njcn.device.pq.pojo.bo.excel.LineMark; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java index 4904922ee..ed15ba1bc 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java @@ -7,30 +7,20 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.Lists; import com.njcn.db.constant.DbConstant; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.mapper.EventPushLogsMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.LogManageMapper; -import com.njcn.device.pq.pojo.constant.DeviceValidMessage; -import com.njcn.device.pq.pojo.param.DeviceLogParam; import com.njcn.device.pq.pojo.param.EventLogParam; import com.njcn.device.pq.pojo.po.EventPushLogs; import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; -import com.njcn.device.pq.pojo.vo.DeviceLogVO; import com.njcn.device.pq.pojo.vo.EventLogVO; import com.njcn.device.pq.service.LogManageService; import com.njcn.event.api.EventDetailFeignClient; import com.njcn.event.pojo.po.EventDetail; import lombok.AllArgsConstructor; -import org.influxdb.dto.QueryResult; -import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java index 7f24eadf7..ffb63a28d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NewStationServiceImpl.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.line.mapper.LineDetailMapper; import com.njcn.device.pq.enums.PvDeviceResponseEnum; -import com.njcn.device.pq.mapper.LineDetailMapper; import com.njcn.device.pq.mapper.NewStationMapper; import com.njcn.device.pq.pojo.param.NewStationQueryParam; import com.njcn.device.pq.pojo.po.NewStation; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/OverLimitServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/OverLimitServiceImpl.java deleted file mode 100644 index 5e062e1f2..000000000 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/OverLimitServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.device.pq.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.biz.pojo.po.Overlimit; -import com.njcn.device.pq.mapper.OverlimitMapper; -import com.njcn.device.pq.service.IOverLimitService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -/** - * pqs - * - * @author cdf - * @date 2023/6/7 - */ -@Service -@RequiredArgsConstructor -public class OverLimitServiceImpl extends ServiceImpl implements IOverLimitService { - -} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java index 7ef10bdd1..1c295124f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java @@ -17,15 +17,11 @@ import com.njcn.dataProcess.api.PqReasonableRangeFeignClient; import com.njcn.dataProcess.enums.DataCleanEnum; import com.njcn.dataProcess.param.DataCleanParam; import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; -import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.biz.enums.LineFlagEnum; -import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.constant.Param; import com.njcn.device.pq.enums.LineBaseEnum; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.PqDataVerifyBakMapper; import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam; -import com.njcn.device.pq.pojo.po.DataVerify; import com.njcn.device.pq.pojo.po.PqDataVerifyBak; import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; @@ -35,8 +31,6 @@ import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO; import com.njcn.device.pq.pojo.vo.dataClean.VerifyTargetVO; import com.njcn.device.pq.service.CommTerminalService; import com.njcn.device.pq.service.IPqDataVerifyBakService; -import com.njcn.harmonic.enums.HarmonicResponseEnum; -import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.NewUserReportVO; @@ -45,13 +39,10 @@ import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.SysDicTreePO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.io.InputStream; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.function.Function; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqIcdPathServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqIcdPathServiceImpl.java index 3882ada72..877f16ade 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqIcdPathServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqIcdPathServiceImpl.java @@ -9,18 +9,17 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.bpm.utils.CollectionUtils; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.device.service.PqDevTypeService; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pq.constant.Param; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.PqsTerminalLogsMapper; import com.njcn.device.pq.pojo.dto.PqIcdPathDTO; import com.njcn.device.pq.pojo.param.PqIcdPathParam; import com.njcn.device.pq.pojo.po.*; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.device.pq.service.PqDevTypeService; +import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -59,7 +58,7 @@ public class PqIcdPathServiceImpl extends ServiceImpl icdPathList(List devType) { @@ -152,9 +151,9 @@ public class PqIcdPathServiceImpl extends ServiceImpl pqDevTypeList = devTypeService.lambdaQuery().eq(PqDevType::getIcdId, param.getId()).eq(PqDevType::getState, 1).list(); - if(!CollectionUtil.isEmpty(pqDevTypeList)) { + if (!CollectionUtil.isEmpty(pqDevTypeList)) { List collect = pqDevTypeList.stream().map(PqDevType::getId).collect(Collectors.toList()); - List list = deviceService.lambdaQuery().in(Device::getDevType,collect).eq(Device::getRunFlag, 0).list(); + List list = deviceService.lambdaQuery().in(Device::getDevType, collect).eq(Device::getRunFlag, 0).list(); list.forEach(temp -> { //记录日志 DictData dataDic = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.DEV_PARAMETER.getCode(), DicDataTypeEnum.DEV_OPS.getCode()).getData(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsDeviceUnitServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsDeviceUnitServiceImpl.java index a4040fd88..383503116 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsDeviceUnitServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsDeviceUnitServiceImpl.java @@ -2,8 +2,8 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.enums.LineBaseEnum; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.PqsDeviceUnitMapper; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsLineWeightServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsLineWeightServiceImpl.java index e3de96cae..ff7d6d8e1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsLineWeightServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsLineWeightServiceImpl.java @@ -11,7 +11,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pq.mapper.LineMapper; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.mapper.PqsLineWeightMapper; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.PqsLineWeight; @@ -19,7 +19,7 @@ import com.njcn.device.pq.pojo.vo.PqsLineWeightVo; import com.njcn.device.pq.pojo.vo.TerminalTree; import com.njcn.device.pq.service.IPqsLineWeightService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pq.utils.ExcelStyleUtil; +import com.njcn.device.utils.ExcelStyleUtil; import com.njcn.poi.excel.ExcelUtil; import com.njcn.poi.util.PoiUtil; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTransformerServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTransformerServiceImpl.java index f8f2951d5..f9422c2b1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTransformerServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTransformerServiceImpl.java @@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.PvDeviceResponseEnum; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.PqsTflgassMapper; import com.njcn.device.pq.mapper.PqsTransformerMapper; import com.njcn.device.pq.pojo.dto.transformer.EntityLogicDTO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java index 0dbcb8265..46426942d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java @@ -6,11 +6,9 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; import com.njcn.device.pq.pojo.dto.LineDataQualityDTO; import com.njcn.device.pq.pojo.dto.MonitorIntegrityDTO; @@ -21,6 +19,7 @@ import com.njcn.device.pq.pojo.po.RStatIntegrityD; import com.njcn.device.pq.pojo.po.RStatOnlinerateD; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.device.pq.service.IRStatIntegrityDService; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java index 3c1fea45d..970e06d72 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java @@ -8,11 +8,13 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.common.service.TerminalBaseService; +import com.njcn.device.device.mapper.DeviceMapper; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.service.LineService; import com.njcn.device.pq.enums.LineBaseEnum; -import com.njcn.device.pq.mapper.DeviceMapper; -import com.njcn.device.pq.mapper.LineDetailMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.RunManageParam; @@ -22,12 +24,9 @@ import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO; import com.njcn.device.pq.pojo.vo.RunManageVO; import com.njcn.device.pq.pojo.vo.RunTimeVO; import com.njcn.device.pq.pojo.vo.TerminalLedgerVO; -import com.njcn.device.pq.service.LineService; import com.njcn.device.pq.service.RunManageService; -import com.njcn.device.pq.service.TerminalBaseService; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.NewUserReportVO; -import com.njcn.supervision.pojo.vo.user.UserLedgerVO; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.enums.StatisticsEnum; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java index 47006e3c2..f6f64a7c5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java @@ -4,13 +4,14 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.common.service.TerminalBaseService; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.vo.CommunicateVO; import com.njcn.device.pq.pojo.vo.TerminalBaseVO; import com.njcn.device.pq.service.ISubstationExpendService; -import com.njcn.device.pq.service.TerminalBaseService; import com.njcn.influx.imapper.PqsCommunicateMapper; import com.njcn.influx.pojo.constant.InfluxDBTableConstant; import com.njcn.influx.pojo.po.PqsCommunicate; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java index cb3017502..7b83f6084 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationServiceImpl.java @@ -5,22 +5,19 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.enums.LineBaseEnum; -import com.njcn.device.pq.enums.PowerFlagEnum; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.SubstationMapper; -import com.njcn.device.pq.mapper.VoltageMapper; import com.njcn.device.pq.pojo.dto.SubstationDTO; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.device.pq.pojo.po.Substation; import com.njcn.device.pq.pojo.po.Voltage; import com.njcn.device.pq.pojo.vo.LedgerSelectVO; -import com.njcn.device.pq.pojo.vo.LineDetailVO; import com.njcn.device.pq.service.ISubstationService; +import com.njcn.device.substation.mapper.SubstationMapper; +import com.njcn.device.subvoltage.mapper.VoltageMapper; import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java index 296e54a42..408323e9a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.common.service.GeneralDeviceService; import com.njcn.device.pq.api.AlarmClient; import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.pq.enums.LineBaseEnum; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index 6d994ff4e..c27fa3622 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -9,10 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.enums.common.ServerEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.line.mapper.DeptLineMapper; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.enums.LineBaseEnum; -import com.njcn.device.pq.mapper.DeptLineMapper; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.TreeMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; @@ -25,7 +26,6 @@ import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.param.user.UserReportParam; import com.njcn.supervision.pojo.vo.user.UserLedgerVO; import com.njcn.system.api.AreaFeignClient; -import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.pojo.enums.StatisticsEnum; import com.njcn.system.pojo.po.Area; import com.njcn.web.utils.RequestUtil; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/YwZtSubstationServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/YwZtSubstationServiceImpl.java index 1d069a5ca..f8b571cf8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/YwZtSubstationServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/YwZtSubstationServiceImpl.java @@ -5,13 +5,13 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.device.biz.pojo.dto.SubGetBase; import com.njcn.device.biz.pojo.param.SubstationParam; -import com.njcn.device.pq.mapper.SubstationMapper; import com.njcn.device.pq.mapper.YwZtSubstationMapper; import com.njcn.device.pq.pojo.po.Substation; import com.njcn.device.pq.pojo.po.YwZtSubstation; import com.njcn.device.pq.service.ISubstationService; import com.njcn.device.pq.service.IYwZtSubstationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.substation.mapper.SubstationMapper; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.po.Dept; diff --git a/pqs-device/pq-device/pq-device-com/pom.xml b/pqs-device/pq-device/pq-device-com/pom.xml new file mode 100644 index 000000000..32ea6d4d7 --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + com.njcn + pq-device + 1.0.0 + + + pq-device-com + 传统设备通用业务 + + 8 + 8 + UTF-8 + + + + + com.njcn + pq-device-api + ${project.version} + + + com.njcn + common-web + 1.0.0 + compile + + + com.njcn + supervision-api + 1.0.0 + compile + + + com.njcn + common-oss + 1.0.0 + compile + + + + com.njcn.platform + message-api + 1.0.0 + compile + + + + \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SuperDataMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/SuperDataMapper.java similarity index 91% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SuperDataMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/SuperDataMapper.java index 83b8b7f2c..06917a521 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/SuperDataMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/SuperDataMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.common.mapper; import com.njcn.device.pq.pojo.param.BaseReamParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/TopMsgMapper.java similarity index 94% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/TopMsgMapper.java index adb853a88..c4613d7dd 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/TopMsgMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.common.mapper; import cn.hutool.core.date.DateTime; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/mapping/SuperDataMapper.xml similarity index 96% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/mapping/SuperDataMapper.xml index 44c614511..d3f9e7acc 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/SuperDataMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/mapping/SuperDataMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java index 35f16911f..669cfdf38 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/GeneralDeviceService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.common.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -9,24 +9,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.common.ServerEnum; import com.njcn.common.utils.EnumUtils; +import com.njcn.device.common.mapper.TopMsgMapper; +import com.njcn.device.device.mapper.DeviceMapper; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.DeptLineService; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.PowerFlagEnum; -import com.njcn.device.pq.mapper.DeviceMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.TopMsgMapper; -import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; -import com.njcn.device.pq.pojo.po.*; +import com.njcn.device.pq.pojo.po.DeptLine; +import com.njcn.device.pq.pojo.po.Device; +import com.njcn.device.pq.pojo.po.Line; +import com.njcn.device.pq.pojo.po.TopMsgPO; import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO; import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO; import com.njcn.device.pq.pojo.vo.DevDetail; import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO; -import com.njcn.device.pq.service.DeptLineService; -import com.njcn.device.pq.service.TerminalBaseService; -import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -66,11 +66,10 @@ public class GeneralDeviceService { private final DicDataFeignClient dicDataFeignClient; - private final RedisUtil redisUtil; - private final DeviceMapper deviceMapper; private final LineMapper lineMapper; + private final TopMsgMapper topMsgMapper; 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-com/src/main/java/com/njcn/device/common/service/TerminalBaseService.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/TerminalBaseService.java index cdc3f4c08..317a82cc9 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-com/src/main/java/com/njcn/device/common/service/TerminalBaseService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.common.service; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pq.pojo.bo.BaseLineInfo; @@ -8,7 +8,6 @@ import com.njcn.device.pq.pojo.dto.PreCommandDTO; import com.njcn.device.pq.pojo.dto.PushResultDTO; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Line; -import com.njcn.device.pq.pojo.vo.DevStatusNumVO; import com.njcn.device.pq.pojo.vo.LineWiringDiagramVO; import com.njcn.device.pq.pojo.vo.TerminalBaseVO; import com.njcn.device.pq.pojo.vo.TerminalVO; 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-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java similarity index 99% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java index ac068a58d..854fc2d53 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-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.common.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; @@ -16,9 +16,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -32,10 +29,22 @@ import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.po.DeviceBak; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.utils.COverlimitUtil; +import com.njcn.device.common.mapper.SuperDataMapper; +import com.njcn.device.common.service.TerminalBaseService; +import com.njcn.device.device.mapper.DevFuctionMapper; +import com.njcn.device.device.mapper.DeviceMapper; +import com.njcn.device.device.service.DeviceBakService; +import com.njcn.device.device.service.DeviceProcessService; +import com.njcn.device.device.service.NodeDeviceService; +import com.njcn.device.line.mapper.DeptLineMapper; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.LineBakService; +import com.njcn.device.node.service.INodeService; +import com.njcn.device.overlimit.mapper.OverlimitMapper; import com.njcn.device.pq.constant.Param; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.PvDeviceResponseEnum; -import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.NodeExcel; @@ -47,9 +56,11 @@ import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.param.oracle.*; import com.njcn.device.pq.pojo.po.*; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.service.*; import com.njcn.device.pq.utils.DeviceUtil; -import com.njcn.device.pq.utils.ExcelStyleUtil; +import com.njcn.device.substation.mapper.SubstationMapper; +import com.njcn.device.subvoltage.mapper.VoltageMapper; +import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper; +import com.njcn.device.utils.ExcelStyleUtil; import com.njcn.message.api.ProduceFeignClient; import com.njcn.message.constant.DeviceRebootType; import com.njcn.message.constant.RedisKeyPrefix; @@ -63,12 +74,10 @@ import com.njcn.poi.util.PoiUtil; import com.njcn.redis.utils.RedisUtil; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.UserLedgerVO; -import com.njcn.supervision.pojo.vo.user.UserReportVO; import com.njcn.system.api.AreaFeignClient; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; -import com.njcn.system.enums.DicTreeEnum; import com.njcn.system.pojo.po.Area; import com.njcn.system.pojo.po.DictData; import com.njcn.web.utils.RequestUtil; @@ -92,8 +101,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -4129,8 +4136,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple pushResultDTO.setCode("2"); pushResultDTO.setResult(""); }else { - - TopicReplyDTO topicReplyDTO =JSONObject.parseObject(stringByKey,TopicReplyDTO.class); pushResultDTO.setCode("1"); pushResultDTO.setResult(topicReplyDTO.getResult()); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java index 439234a07..d6a1f47cf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.device.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Console; @@ -12,6 +12,8 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.device.service.IDeviceService; import com.njcn.device.pq.pojo.dto.DevComFlagDTO; import com.njcn.device.pq.pojo.dto.DeviceDTO; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; @@ -19,8 +21,6 @@ import com.njcn.device.pq.pojo.param.ConstantValueParam; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.po.Device; import com.njcn.device.pq.pojo.vo.DevStatusNumVO; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.device.pq.service.impl.GeneralDeviceService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.RequestUtil; import io.swagger.annotations.Api; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalVersionController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceVersionController.java similarity index 94% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalVersionController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceVersionController.java index 273f5742c..ee4cb6b83 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalVersionController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/DeviceVersionController.java @@ -1,14 +1,14 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.device.controller; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.device.service.TerminalVersionService; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.DevVersion; import com.njcn.device.pq.pojo.vo.TerminalVersionVO; -import com.njcn.device.pq.service.TerminalVersionService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,7 +29,7 @@ import java.util.List; @RestController @RequestMapping("/version") @RequiredArgsConstructor -public class TerminalVersionController extends BaseController { +public class DeviceVersionController extends BaseController { private final TerminalVersionService terminalVersionService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NodeDeviceController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/NodeDeviceController.java similarity index 96% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NodeDeviceController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/NodeDeviceController.java index dd8fff79d..da2af4ca7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NodeDeviceController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/NodeDeviceController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.device.controller; import com.njcn.common.pojo.annotation.OperateInfo; @@ -6,15 +6,13 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.device.service.NodeDeviceService; import com.njcn.device.pq.pojo.dto.DeviceInfo; import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree; import com.njcn.device.pq.pojo.param.NodeDeviceParam; - import com.njcn.device.pq.pojo.po.DeviceProcess; -import com.njcn.device.pq.service.NodeDeviceService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; - import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqDevTypeController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/PqDevTypeController.java similarity index 91% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqDevTypeController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/PqDevTypeController.java index c3e49497b..61bad6dd9 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqDevTypeController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/PqDevTypeController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.device.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,16 +10,19 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.device.service.PqDevTypeService; import com.njcn.device.pq.pojo.param.PqDevTypeParam; import com.njcn.device.pq.pojo.po.PqDevType; -import com.njcn.device.pq.service.PqDevTypeService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/ProgramVersionController.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/ProgramVersionController.java index e44320559..d783995bb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/ProgramVersionController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.device.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; @@ -7,9 +7,9 @@ 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.common.utils.HttpResultUtil; +import com.njcn.device.device.service.ProgramVersionService; import com.njcn.device.pq.pojo.param.ProgramParam; import com.njcn.device.pq.pojo.vo.VersionVO; -import com.njcn.device.pq.service.ProgramVersionService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevFuctionMapper.java similarity index 93% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevFuctionMapper.java index 9325acf7f..cdb3b6b21 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevFuctionMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevMealMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevMealMapper.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevMealMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevMealMapper.java index 61d712db7..7fcabaed7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevMealMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevMealMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevStrategyMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevStrategyMapper.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevStrategyMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevStrategyMapper.java index ac196d761..4ed8af895 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevStrategyMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevStrategyMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevVersionMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevVersionMapper.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevVersionMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevVersionMapper.java index ee0184e93..f843c0eef 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevVersionMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DevVersionMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceBakMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceBakMapper.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceBakMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceBakMapper.java index 2e10b3a99..bf2b5989b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceBakMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceBakMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceMapper.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceMapper.java index a451c2e14..a9a69bf22 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceProcessMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceProcessMapper.java new file mode 100644 index 000000000..8a99aec7a --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/DeviceProcessMapper.java @@ -0,0 +1,20 @@ +package com.njcn.device.device.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.DeviceProcess; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2022-01-04 + */ +public interface DeviceProcessMapper extends BaseMapper { + + + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqDevTypeMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/PqDevTypeMapper.java similarity index 87% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqDevTypeMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/PqDevTypeMapper.java index 947067d67..17199410f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqDevTypeMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/PqDevTypeMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.pq.pojo.po.PqDevType; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/ProgramVersionMapper.java similarity index 90% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/ProgramVersionMapper.java index b8715056a..ce87a6a2b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/ProgramVersionMapper.java @@ -1,9 +1,8 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.njcn.device.pq.pojo.param.ProgramParam; import com.njcn.device.pq.pojo.vo.ShowVersionVO; import com.njcn.device.pq.pojo.vo.VersionVO; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/TerminalVersionMapper.java similarity index 93% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/TerminalVersionMapper.java index cc1a3735a..d46fb8e93 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/TerminalVersionMapper.java @@ -1,8 +1,7 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.DevVersion; -import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import com.njcn.device.pq.pojo.vo.TerminalVersionVO; import org.apache.ibatis.annotations.Param; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VersionMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/VersionMapper.java similarity index 92% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VersionMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/VersionMapper.java index a45858f9b..4ad7da7ac 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VersionMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/VersionMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevFuctionMapper.xml similarity index 93% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevFuctionMapper.xml index 38eb53f4e..642c30af1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevFuctionMapper.xml @@ -1,6 +1,6 @@ - + insert into cld_dev_fuction (id,line_id,fuc_name) values diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevMealMapper.xml similarity index 71% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevMealMapper.xml index 2e9dc0bca..552ddaef7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevStrategyMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevMealMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevStrategyMapper.xml similarity index 69% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevStrategyMapper.xml index ca8867ea4..98779574a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevMealMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevStrategyMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevVersionMapper.xml similarity index 69% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevVersionMapper.xml index 7162bb1bc..eca8a1685 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DevVersionMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceProcessMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceBakMapper.xml similarity index 71% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceProcessMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceBakMapper.xml index 9e6f0ea29..d7a2e97b8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceProcessMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceBakMapper.xml @@ -1,7 +1,6 @@ - - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml similarity index 99% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml index d8a3c1b2f..ea7942e44 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml @@ -1,6 +1,6 @@ - + SELECT diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/TerminalVersionMapper.xml similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/TerminalVersionMapper.xml index d821ae1e5..b9393b83f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/TerminalVersionMapper.xml @@ -1,6 +1,6 @@ - + select diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DevFuctionService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DevFuctionService.java similarity index 88% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DevFuctionService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DevFuctionService.java index 0f6aaa5c3..b493f7591 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DevFuctionService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DevFuctionService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pq.pojo.po.DevFuction; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceBakService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceBakService.java similarity index 85% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceBakService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceBakService.java index 600134a6e..e82c2f08e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceBakService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceBakService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceProcessService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceProcessService.java similarity index 75% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceProcessService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceProcessService.java index 1e72aaa10..495f5187c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeviceProcessService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/DeviceProcessService.java @@ -1,8 +1,7 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.device.biz.pojo.po.DeviceBak; import com.njcn.device.pq.pojo.po.DeviceProcess; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevMealService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevMealService.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevMealService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevMealService.java index 7eba9b405..5c5c7e4b8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevMealService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevMealService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevStrategyService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevStrategyService.java similarity index 86% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevStrategyService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevStrategyService.java index cfe1e8e15..77ee40858 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDevStrategyService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDevStrategyService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDeviceService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDeviceService.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDeviceService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDeviceService.java index 1ac9c2382..91af1aabb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDeviceService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/IDeviceService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/NodeDeviceService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/NodeDeviceService.java similarity index 88% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/NodeDeviceService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/NodeDeviceService.java index e3be8d14c..242cc5e80 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/NodeDeviceService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/NodeDeviceService.java @@ -1,10 +1,9 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.njcn.device.pq.pojo.dto.DeviceInfo; import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree; import com.njcn.device.pq.pojo.param.NodeDeviceParam; import com.njcn.device.pq.pojo.po.DeviceProcess; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/PqDevTypeService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/PqDevTypeService.java similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/PqDevTypeService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/PqDevTypeService.java index 04b14e547..de9d51131 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/PqDevTypeService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/PqDevTypeService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/ProgramVersionService.java similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/ProgramVersionService.java index 70ebf5e03..5993d5d72 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/ProgramVersionService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/TerminalVersionService.java similarity index 95% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/TerminalVersionService.java index e8f629106..649c5efdf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/TerminalVersionService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.device.service; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.DevVersion; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevFuctionServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevFuctionServiceImpl.java similarity index 55% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevFuctionServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevFuctionServiceImpl.java index abb852a1e..afe329024 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevFuctionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevFuctionServiceImpl.java @@ -1,10 +1,9 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pq.mapper.DevFuctionMapper; +import com.njcn.device.device.mapper.DevFuctionMapper; import com.njcn.device.pq.pojo.po.DevFuction; -import com.njcn.device.pq.service.DevFuctionService; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -13,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2022/05/24 */ @Service -public class DevFuctionServiceImpl extends ServiceImpl implements DevFuctionService { +public class DevFuctionServiceImpl extends ServiceImpl implements IService { } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevMealServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevMealServiceImpl.java similarity index 70% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevMealServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevMealServiceImpl.java index 7fa50c64e..7be37fda2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevMealServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevMealServiceImpl.java @@ -1,10 +1,10 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pq.mapper.DevMealMapper; +import com.njcn.device.device.mapper.DevMealMapper; +import com.njcn.device.device.service.IDevMealService; import com.njcn.device.pq.pojo.po.DevMeal; -import com.njcn.device.pq.service.IDevMealService; import org.springframework.stereotype.Service; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevStrategyServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevStrategyServiceImpl.java similarity index 63% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevStrategyServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevStrategyServiceImpl.java index de91695c2..026a78700 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevStrategyServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DevStrategyServiceImpl.java @@ -1,10 +1,11 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pq.mapper.DevStrategyMapper; +import com.njcn.device.device.mapper.DevStrategyMapper; +import com.njcn.device.device.service.IDevStrategyService; import com.njcn.device.pq.pojo.po.DevStrategy; -import com.njcn.device.pq.service.IDevStrategyService; import org.springframework.stereotype.Service; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceBakServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceBakServiceImpl.java similarity index 67% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceBakServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceBakServiceImpl.java index 3689a7b97..ffc08a7d9 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceBakServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceBakServiceImpl.java @@ -1,9 +1,10 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pq.mapper.DeviceBakMapper; import com.njcn.device.biz.pojo.po.DeviceBak; -import com.njcn.device.pq.service.DeviceBakService; +import com.njcn.device.device.mapper.DeviceBakMapper; +import com.njcn.device.device.service.DeviceBakService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceProcessServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceProcessServiceImpl.java similarity index 62% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceProcessServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceProcessServiceImpl.java index 58c133480..ee17e7b58 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceProcessServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceProcessServiceImpl.java @@ -1,12 +1,10 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.biz.pojo.po.DeviceBak; -import com.njcn.device.pq.mapper.DeviceBakMapper; -import com.njcn.device.pq.mapper.DeviceProcessMapper; -import com.njcn.device.pq.pojo.po.Device; +import com.njcn.device.device.mapper.DeviceProcessMapper; +import com.njcn.device.device.service.DeviceProcessService; import com.njcn.device.pq.pojo.po.DeviceProcess; -import com.njcn.device.pq.service.DeviceProcessService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceServiceImpl.java similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceServiceImpl.java index 9d0c6b872..95e082553 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/DeviceServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import cn.hutool.core.collection.CollUtil; @@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.device.biz.enums.RunFlagEnum; -import com.njcn.device.pq.mapper.DevVersionMapper; -import com.njcn.device.pq.mapper.DeviceMapper; -import com.njcn.device.pq.mapper.LineMapper; +import com.njcn.device.device.mapper.DevVersionMapper; +import com.njcn.device.device.mapper.DeviceMapper; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.device.service.ProgramVersionService; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.pojo.advanced.*; import com.njcn.device.pq.pojo.param.ConstantValueParam; import com.njcn.device.pq.pojo.po.DevVersion; @@ -20,9 +22,7 @@ import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.Version; import com.njcn.device.pq.pojo.vo.DevStatusNumVO; import com.njcn.device.pq.pojo.vo.DeviceIpRVO; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.device.pq.service.ProgramVersionService; -import com.njcn.device.pq.utils.SocketClient; +import com.njcn.device.utils.SocketClient; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -230,7 +230,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme JSONObject jsonObject = new JSONObject(); jsonObject.set("LineId", lineIndex); jsonObject.set("type", 0); - cn.hutool.json.JSONObject jsonObject1 = new cn.hutool.json.JSONObject(); + JSONObject jsonObject1 = new JSONObject(); jsonObject1.set("len",0); jsonObject1.set("data",jsonObject); socketClient.realTimeData(jsonObject1.toString(),host,socketPort,lineIndex); @@ -243,7 +243,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme JSONObject jsonObject = new JSONObject(); jsonObject.set("LineId", lineIndex); jsonObject.set("type", 1); - cn.hutool.json.JSONObject jsonObject1 = new cn.hutool.json.JSONObject(); + JSONObject jsonObject1 = new JSONObject(); jsonObject1.set("len", 0); jsonObject1.set("data", jsonObject); String host = lineMapper.getNodeIp(lineIndex,0); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeDeviceServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/NodeDeviceServiceImpl.java similarity index 93% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeDeviceServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/NodeDeviceServiceImpl.java index 7a41ac715..f8abcd045 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeDeviceServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/NodeDeviceServiceImpl.java @@ -1,22 +1,21 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import cn.hutool.core.util.StrUtil; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.device.service.DeviceProcessService; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.device.service.NodeDeviceService; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.node.mapper.NodeMapper; import com.njcn.device.pq.constant.Param; import com.njcn.device.pq.enums.PvDeviceResponseEnum; -import com.njcn.device.pq.mapper.DeviceMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.NodeMapper; -import com.njcn.device.pq.mapper.PqsTerminalLogsMapper; import com.njcn.device.pq.pojo.dto.DeviceInfo; import com.njcn.device.pq.pojo.dto.MonitorInfo; import com.njcn.device.pq.pojo.dto.NodeProcessDeviceTree; import com.njcn.device.pq.pojo.param.NodeDeviceParam; import com.njcn.device.pq.pojo.po.*; -import com.njcn.device.pq.service.DeviceProcessService; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.device.pq.service.NodeDeviceService; +import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper; import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -29,10 +28,12 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import java.util.stream.Stream; import static com.njcn.device.pq.enums.LineBaseEnum.SUB_LEVEL; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDevTypeServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/PqDevTypeServiceImpl.java similarity index 94% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDevTypeServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/PqDevTypeServiceImpl.java index 673ff0f3e..c77ff1e10 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDevTypeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/PqDevTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,18 +10,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.pms.enums.PmsDeviceResponseEnum; +import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.device.mapper.PqDevTypeMapper; +import com.njcn.device.device.service.IDeviceService; +import com.njcn.device.device.service.PqDevTypeService; +import com.njcn.device.line.mapper.LineMapper; import com.njcn.device.pq.constant.Param; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.PqDevTypeMapper; -import com.njcn.device.pq.mapper.PqsTerminalLogsMapper; import com.njcn.device.pq.pojo.param.PqDevTypeParam; import com.njcn.device.pq.pojo.po.Device; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.PqDevType; import com.njcn.device.pq.pojo.po.PqsTerminalLogs; -import com.njcn.device.pq.service.IDeviceService; -import com.njcn.device.pq.service.PqDevTypeService; +import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -99,7 +99,7 @@ public class PqDevTypeServiceImpl extends ServiceImpl 0) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + throw new BusinessException(DeviceResponseEnum.MODEL_NAME_REPEAT); } PqDevType devType = new PqDevType(); devType.setName(param.getName()); @@ -118,7 +118,7 @@ public class PqDevTypeServiceImpl extends ServiceImpl 0) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + throw new BusinessException(DeviceResponseEnum.MODEL_NAME_REPEAT); } PqDevType pqDevType = BeanUtil.copyProperties(param, PqDevType.class); //修改icd文件记录日志重启前置 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/ProgramVersionServiceImpl.java similarity index 96% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/ProgramVersionServiceImpl.java index a30b55feb..eb6b2bc73 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/ProgramVersionServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,13 +8,13 @@ import com.google.common.collect.Lists; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.pq.mapper.ProgramVersionMapper; -import com.njcn.device.pq.mapper.VersionMapper; +import com.njcn.device.device.mapper.ProgramVersionMapper; +import com.njcn.device.device.mapper.VersionMapper; +import com.njcn.device.device.service.ProgramVersionService; import com.njcn.device.pq.pojo.param.ProgramParam; import com.njcn.device.pq.pojo.po.Version; import com.njcn.device.pq.pojo.vo.ShowVersionVO; import com.njcn.device.pq.pojo.vo.VersionVO; -import com.njcn.device.pq.service.ProgramVersionService; import com.njcn.web.utils.RequestUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java similarity index 93% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java index 95d142efe..46fc0b327 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java @@ -1,14 +1,14 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.device.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.pq.mapper.DevVersionMapper; -import com.njcn.device.pq.mapper.TerminalVersionMapper; +import com.njcn.device.device.mapper.DevVersionMapper; +import com.njcn.device.device.mapper.TerminalVersionMapper; +import com.njcn.device.device.service.TerminalVersionService; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.po.DevVersion; import com.njcn.device.pq.pojo.vo.TerminalVersionVO; -import com.njcn.device.pq.service.TerminalVersionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/controller/LineController.java similarity index 94% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/controller/LineController.java index a15b342da..3d0e5b5b6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/controller/LineController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.controller; +package com.njcn.device.line.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; @@ -11,17 +11,21 @@ import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.biz.pojo.dto.PollutionLineDTO; import com.njcn.device.biz.pojo.po.Overlimit; -import com.njcn.device.pq.mapper.DeviceMapper; -import com.njcn.device.pq.mapper.LineDetailMapper; -import com.njcn.device.pq.mapper.LineMapper; -import com.njcn.device.pq.mapper.RStatIntegrityDMapper; -import com.njcn.device.pq.pojo.dto.*; +import com.njcn.device.device.mapper.DeviceMapper; +import com.njcn.device.line.mapper.LineMapper; +import com.njcn.device.line.service.LineService; +import com.njcn.device.line.mapper.LineDetailMapper; +import com.njcn.device.overlimit.service.IOverLimitService; +import com.njcn.device.pq.pojo.dto.OverLimitLineDTO; +import com.njcn.device.pq.pojo.dto.PollutionParamDTO; +import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; +import com.njcn.device.pq.pojo.dto.WarningSubstationDTO; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Device; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.device.pq.pojo.vo.*; -import com.njcn.device.pq.service.LineService; +import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper; import com.njcn.web.controller.BaseController; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; @@ -57,6 +61,8 @@ public class LineController extends BaseController { private final RStatIntegrityDMapper integrityDMapper; + private final IOverLimitService overLimitService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLineDetailData") @ApiOperation("根据监测点id获取监测点详情") @@ -78,16 +84,6 @@ public class LineController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getLineOverLimitData") - @ApiOperation("根据监测点id获取越限详情") - @ApiImplicitParam(name = "id", value = "监测点id", required = true) - public HttpResult getLineOverLimitData(@RequestParam("id") String id) { - String methodDescribe = getMethodDescribe("getLineOverLimitData"); - LineOverLimitVO result = lineService.getLineOverLimitData(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getSubstationData") @ApiOperation("根据变电站id获取变电站详情") @@ -149,18 +145,6 @@ public class LineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getOverLimitData") - @ApiOperation("根据监测点id获取越限数值") - @ApiImplicitParam(name = "id", value = "监测点id", required = true) - public HttpResult getOverLimitData(@RequestParam("id") String id) { - String methodDescribe = getMethodDescribe("getOverLimitData"); - Overlimit result = lineService.getOverLimitData(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - - /** * 获取投运在线的监测点的限值 * @@ -176,7 +160,7 @@ public class LineController extends BaseController { }) public HttpResult> getAllLineOverLimit(@RequestParam("serverName") String serverName, @RequestParam(value = "deptId", required = false) String deptId) { String methodDescribe = getMethodDescribe("getAllLineOverLimit"); - List result = lineService.getAllLineOverLimit(serverName, deptId); + List result = overLimitService.getAllLineOverLimit(serverName, deptId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java index 3e6c89a38..4cafb4520 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.line.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineBakMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineBakMapper.java similarity index 71% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineBakMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineBakMapper.java index 8256bfc97..f5af17210 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineBakMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineBakMapper.java @@ -1,8 +1,8 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.line.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pq.pojo.po.*; +import com.njcn.device.pq.pojo.po.LineBak; /** *

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineDetailMapper.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineDetailMapper.java index 313ff3379..09bd84333 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineDetailMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineDetailMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.line.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java index bcc95fc48..f52b6d957 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.line.mapper; import cn.hutool.core.date.DateTime; @@ -7,25 +7,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; -import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.advanced.UpDevVO; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel; import com.njcn.device.pq.pojo.dto.*; -import com.njcn.device.pq.pojo.dto.OverLimitLineDTO; -import com.njcn.device.biz.pojo.dto.PollutionLineDTO; -import com.njcn.device.pq.pojo.dto.WarningSubstationDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; -import com.njcn.device.pq.pojo.po.*; +import com.njcn.device.pq.pojo.po.Device; +import com.njcn.device.pq.pojo.po.Line; +import com.njcn.device.pq.pojo.po.LineDetail; +import com.njcn.device.pq.pojo.po.Voltage; import com.njcn.device.pq.pojo.vo.*; import com.njcn.web.pojo.vo.LineDataVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - import java.util.List; import java.util.Map; import java.util.Set; @@ -200,14 +199,6 @@ public interface LineMapper extends BaseMapper { List getDeviceIdByManufacturer(@Param("deviceIds") List deviceIds, @Param("manufacturer") String manufacturer); - /** - * 获取所有在线投运的监测点限值 - * - * @author cdf - * @date 2022/3/23 - */ - List getAllLineOverLimit(@Param("list") List list); - /** * 根据监测点集合查询基础信息 * diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml similarity index 99% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml index 840604859..8ff662fb6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml @@ -1,6 +1,6 @@ - + update pq_dept_line set id = #{id} where Line_Id = #{lineId} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineBakMapper.xml similarity index 71% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineBakMapper.xml index 29182122e..c8897187f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineBakMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineBakMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml index 236608a74..795869f37 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml @@ -1,6 +1,6 @@ - + @@ -429,22 +429,6 @@ t2.Manufacturer = #{manufacturer} - - - diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/INodeService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/INodeService.java similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/INodeService.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/INodeService.java index 92e8f8891..cb7e59d97 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/INodeService.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/INodeService.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service; +package com.njcn.device.node.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/impl/NodeServiceImpl.java similarity index 98% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeServiceImpl.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/impl/NodeServiceImpl.java index 770ec69e8..577c5160f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/node/service/impl/NodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.service.impl; +package com.njcn.device.node.service.impl; import cn.hutool.core.collection.CollectionUtil; @@ -12,11 +12,11 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.db.constant.DbConstant; import com.njcn.device.biz.enums.DeviceResponseEnum; -import com.njcn.device.pq.mapper.NodeMapper; +import com.njcn.device.node.mapper.NodeMapper; +import com.njcn.device.node.service.INodeService; import com.njcn.device.pq.pojo.bo.excel.NodeExcel; import com.njcn.device.pq.pojo.param.NodeParam; import com.njcn.device.pq.pojo.po.Node; -import com.njcn.device.pq.service.INodeService; import com.njcn.web.factory.PageFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/controller/PQOverlimitController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/controller/PQOverlimitController.java new file mode 100644 index 000000000..d81c710b6 --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/controller/PQOverlimitController.java @@ -0,0 +1,112 @@ +package com.njcn.device.overlimit.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.overlimit.service.IOverLimitService; +import com.njcn.device.pq.pojo.vo.LineOverLimitVO; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; + + +@Slf4j +@RestController +@RequiredArgsConstructor +@Api(tags = "监测点限值信息查询") +public class PQOverlimitController extends BaseController { + + private final IOverLimitService overLimitService; + + // -------- 3个重复的代码！！！！ ---------- + /** + * 来源于CommTerminalController的getOverLimitData + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/commTerminal/getOverLimitData") + @ApiOperation("根据监测点id获取越限数值") + @ApiImplicitParam(name = "id", value = "监测点id", required = true) + public HttpResult getOverLimitDataTerminal(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getOverLimitData"); + Overlimit result = overLimitService.getOverLimitDataById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/line/getOverLimitData") + @ApiOperation("根据监测点id获取越限数值") + @ApiImplicitParam(name = "id", value = "监测点id", required = true) + public HttpResult getOverLimitData(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getOverLimitData"); + Overlimit result = overLimitService.getOverLimitDataById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/line/getLineOverLimitData") + @ApiOperation("根据监测点id获取越限详情") + @ApiImplicitParam(name = "id", value = "监测点id", required = true) + public HttpResult getLineOverLimitData(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getLineOverLimitData"); + LineOverLimitVO result = overLimitService.getLineOverLimitDataById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/commTerminal/getAllLineOverLimit") + @ApiOperation("获取投运在线的监测点的限值") + public HttpResult> getAllLineOverLimit() { + String methodDescribe = getMethodDescribe("getAllLineOverLimit"); + List result = overLimitService.getAllLineOverLimit("harmonic-boot", null); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/overLimit/getOverLimitByLineIds") + @ApiOperation("监测点集合获取限值") + @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true) + @ApiIgnore + public HttpResult> getOverLimitByLineIds(@RequestBody List lineIds){ + String methodDescribe = getMethodDescribe("getOverLimitByLineIds"); + List overLimitList= overLimitService.list(new LambdaQueryWrapper().in(Overlimit::getId,lineIds)); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/commTerminal/getOverLimitDataByIds") + @ApiOperation("根据监测点id集合获取越限数值") + @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true) + public HttpResult> getOverLimitDataByIds(@RequestBody List ids) { + String methodDescribe = getMethodDescribe("getOverLimitDataByIds"); + List result = overLimitService.listByIds(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/overLimit/getLimitMapsByLineIds") + @ApiOperation("监测点集合获取限值") + @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true) + @ApiIgnore + public HttpResult>> getLimitMapsByLineIds(@RequestBody List lineIds){ + String methodDescribe = getMethodDescribe("getLimitMapsByLineIds"); + List> overLimitList= overLimitService.listMaps(new LambdaQueryWrapper().in(Overlimit::getId,lineIds)); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe); + } +} diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/OverlimitMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/OverlimitMapper.java new file mode 100644 index 000000000..6b34315f1 --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/OverlimitMapper.java @@ -0,0 +1,28 @@ +package com.njcn.device.overlimit.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.biz.pojo.po.Overlimit; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2022-01-04 + */ +public interface OverlimitMapper extends BaseMapper { + + /** + * 获取所有在线投运的监测点限值 + * + * @author cdf + * @date 2022/3/23 + */ + List getAllLineOverLimit(@Param("list") List list); + +} diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/mapping/OverlimitMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/mapping/OverlimitMapper.xml new file mode 100644 index 000000000..fb1720efe --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/mapper/mapping/OverlimitMapper.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/IOverLimitService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/IOverLimitService.java new file mode 100644 index 000000000..254a786ab --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/IOverLimitService.java @@ -0,0 +1,37 @@ +package com.njcn.device.overlimit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.pq.pojo.vo.LineOverLimitVO; + +import java.util.List; + +/** + *

+ * 越限表实体 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +public interface IOverLimitService extends IService { + + + Overlimit getOverLimitDataById(String id); + + /** + * 获取监测点越限详情 + * @param id 监测点id + * @return 结果 + */ + LineOverLimitVO getLineOverLimitDataById(String id); + + /** + * 获取投运在线的监测点的限值 + * @param serverType 服务名称 + * @param deptId 部门id + * @return 结果 + */ + List getAllLineOverLimit(String serverType,String deptId); +} diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/impl/OverLimitServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/impl/OverLimitServiceImpl.java new file mode 100644 index 000000000..3d07b564c --- /dev/null +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/overlimit/service/impl/OverLimitServiceImpl.java @@ -0,0 +1,104 @@ +package com.njcn.device.overlimit.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.ServerEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.utils.EnumUtils; +import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.common.service.GeneralDeviceService; +import com.njcn.device.overlimit.mapper.OverlimitMapper; +import com.njcn.device.overlimit.service.IOverLimitService; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.vo.LineOverLimitVO; +import com.njcn.web.utils.GeneralUtil; +import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * pqs + * + * @author cdf + * @date 2023/6/7 + */ +@Service +@RequiredArgsConstructor +public class OverLimitServiceImpl extends ServiceImpl implements IOverLimitService { + + private final GeneralDeviceService generalDeviceService; + + @Override + public Overlimit getOverLimitDataById(String id) { + return this.baseMapper.selectById(id); + } + + @Override + public LineOverLimitVO getLineOverLimitDataById(String id) { + //根据监测点id查询所在监测点的限值表数据 + Overlimit overlimit = this.baseMapper.selectById(id); + LineOverLimitVO lineOverLimitVO = new LineOverLimitVO(); + BeanUtil.copyProperties(overlimit, lineOverLimitVO); + lineOverLimitVO.setOddHarm(overlimit.getUharm3()); + lineOverLimitVO.setEvenHarm(overlimit.getUharm2()); + lineOverLimitVO.setInUharm(overlimit.getInuharm1()); + lineOverLimitVO.setInUharm16(overlimit.getInuharm16()); + return lineOverLimitVO; + } + + @Override + public List getAllLineOverLimit(String serverType, String deptId) { + List overlimitList = new ArrayList<>(); + ServerEnum serverEnum = EnumUtils.getServerEnumByName(serverType); + List dataType = new ArrayList<>(); + dataType.add(2); + switch (serverEnum) { + case EVENT: + dataType.add(0); + break; + case HARMONIC: + dataType.add(1); + break; + default: + dataType.add(0); + dataType.add(1); + break; + } + if (StrUtil.isBlank(deptId)) { + //不传部门id情况,默认查询所有的投运在线的监测点 + overlimitList = this.baseMapper.getAllLineOverLimit(dataType); + } else { + DeviceInfoParam deviceInfoParam = new DeviceInfoParam(RequestUtil.getDeptIndex(), serverType); + List generalDeviceDTOList = generalDeviceService.getDeviceInfoAsDept(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); + if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) { + List lineIndexes = new ArrayList<>(); + generalDeviceDTOList.forEach((item) -> lineIndexes.addAll(item.getLineIndexes())); + + if (lineIndexes.size() > 1000) { + List> index = GeneralUtil.splitList(lineIndexes, 1000); + for (List item : index) { + List tem = this.baseMapper.selectBatchIds(item); + if (CollectionUtil.isNotEmpty(tem)) { + overlimitList.addAll(tem); + } + } + } else { + overlimitList = this.baseMapper.selectBatchIds(lineIndexes); + } + } else { + throw new BusinessException(DeviceResponseEnum.LINE_EMPTY); + } + } + return overlimitList; + } +} + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/RStatIntegrityDMapper.java similarity index 94% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/RStatIntegrityDMapper.java index b4aefb7e8..515bcbd6b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/RStatIntegrityDMapper.java @@ -1,7 +1,6 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.rstatintegrity.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml similarity index 97% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml index 6675a2729..ca3f88ef9 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml @@ -1,6 +1,6 @@ - + SELECT line.id id, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/VoltageMapper.java similarity index 95% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/VoltageMapper.java index 1e8831e92..5cb3235c2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/VoltageMapper.java @@ -1,4 +1,4 @@ -package com.njcn.device.pq.mapper; +package com.njcn.device.subvoltage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/mapping/VoltageMapper.xml similarity index 91% rename from pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml rename to pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/mapping/VoltageMapper.xml index 36c5a946a..1a0e74bb2 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/subvoltage/mapper/mapping/VoltageMapper.xml @@ -1,6 +1,6 @@ - +