From 736ad700a6e4a324e07eaff114c5f0be1288e1b8 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 17 Oct 2023 16:46:18 +0800 Subject: [PATCH] =?UTF-8?q?1.pom=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6=202.?= =?UTF-8?q?=E5=8F=91=E5=B0=84=E7=89=B9=E6=80=A7=E5=92=8C=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 24 +- .../pms/pojo/po/RMpMonitorAlarmCountM.java | 2 + .../distribution/mapping/PwMonitorMapper.xml | 8 + .../majornetwork/mapping/OverviewMapper.xml | 47 +-- .../impl/IPwMonitorServiceImpl.java | 3 + .../impl/OverviewServiceImpl.java | 5 +- .../pojo/po/RMpEmissionIExcessRateM.java | 3 - .../njcn/harmonic/pojo/po/RMpEmissionIM.java | 3 - .../njcn/harmonic/pojo/po/RMpEmissionM.java | 3 - .../njcn/harmonic/pojo/po/RMpInfluenceM.java | 7 - .../pojo/po/RMpInfluenceVExcessRateM.java | 6 - .../njcn/harmonic/pojo/po/RMpInfluenceVM.java | 6 - .../newalgorithm/RMpEmissionMController.java | 54 +++ .../newalgorithm/RMpInfluenceMController.java | 54 +++ .../RMpEmissionIExcessRateMMapper.java | 16 + .../newalgorithm/RMpEmissionIMMapper.java | 16 + .../newalgorithm/RMpEmissionMMapper.java | 16 + .../newalgorithm/RMpInfluenceMMapper.java | 16 + .../RMpInfluenceVExcessRateMMapper.java | 16 + .../newalgorithm/RMpInfluenceVMMapper.java | 16 + .../mapping/RMpEmissionIExcessRateMMapper.xml | 5 + .../mapping/RMpEmissionIMMapper.xml | 5 + .../mapping/RMpEmissionMMapper.xml | 5 + .../mapping/RMpInfluenceMMapper.xml | 5 + .../RMpInfluenceVExcessRateMMapper.xml | 5 + .../mapping/RMpInfluenceVMMapper.xml | 5 + .../IRMpEmissionIExcessRateMService.java | 16 + .../newalgorithm/IRMpEmissionIMService.java | 17 + .../newalgorithm/IRMpEmissionMService.java | 25 ++ .../newalgorithm/IRMpInfluenceMService.java | 24 ++ .../IRMpInfluenceVExcessRateMService.java | 16 + .../newalgorithm/IRMpInfluenceVMService.java | 16 + .../RMpEmissionIExcessRateMServiceImpl.java | 20 + .../impl/RMpEmissionIMServiceImpl.java | 23 ++ .../impl/RMpEmissionMServiceImpl.java | 363 ++++++++++++++++++ .../impl/RMpInfluenceMServiceImpl.java | 361 +++++++++++++++++ .../RMpInfluenceVExcessRateMServiceImpl.java | 20 + .../impl/RMpInfluenceVMServiceImpl.java | 20 + 38 files changed, 1185 insertions(+), 87 deletions(-) create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpEmissionMController.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpInfluenceMController.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpEmissionIExcessRateMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpEmissionIMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpEmissionMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpInfluenceMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpInfluenceVExcessRateMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RMpInfluenceVMMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpEmissionIExcessRateMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpEmissionIMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpEmissionMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpInfluenceMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpInfluenceVExcessRateMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RMpInfluenceVMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpEmissionIExcessRateMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpEmissionIMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpEmissionMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpInfluenceMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpInfluenceVExcessRateMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/IRMpInfluenceVMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpEmissionIExcessRateMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpEmissionIMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpEmissionMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceVExcessRateMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceVMServiceImpl.java diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index d881e47d5..94cdf10c4 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -21,32 +21,22 @@ - - com.njcn - pq-device-boot - ${project.version} - - + + + + + com.njcn pms-device-boot ${project.version} - --> + com.njcn common-swagger ${project.version} - - com.squareup.okhttp3 - okhttp - 4.9.0 - - - com.squareup.okhttp3 - logging-interceptor - 4.9.0 - diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java index c2022148c..9d3ed6aff 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,6 +21,7 @@ public class RMpMonitorAlarmCountM implements Serializable { /** * 单位ID */ + @TableField(exist = false) private String orgNo; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml index d6d15d37a..13c190fde 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml @@ -168,6 +168,14 @@ pm.Line_Name FROM pms_monitor AS pm + + + AND pm.Monitor_Tag IN + + #{item} + + + ) UNION ALL ( SELECT diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml index 6e6b2e896..8f9c5997b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml @@ -224,56 +224,21 @@