From 2c9d17c0ffa9d8d8790ef4b0e95397826332f1b6 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 22 Nov 2024 13:32:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E9=99=8D=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E9=94=99=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/mapper/distribution/mapping/PwMonitorMapper.xml   | 8 ++++----
 .../java/com/njcn/event/pojo/po/RmpEventDetailPO.java     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

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 dda364098..e0d788bb6 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
@@ -49,7 +49,7 @@
         </where>
 
         ) UNION ALL
-        (
+       /* (
         SELECT
         ppd.id,
         ppd.Name,
@@ -62,7 +62,7 @@
         ppd.Line_Name
         FROM
         pms_power_distributionarea AS ppd
-        ) UNION ALL
+        ) UNION ALL*/
         (
         SELECT
         ppc.id,
@@ -176,7 +176,7 @@
                 </foreach>
             </if>
         </where>
-        ) UNION ALL
+        ) /*UNION ALL
         (
         SELECT
         ppd.id,
@@ -191,7 +191,7 @@
         FROM
         pms_power_distributionarea AS ppd
         )
-        ) AS monitor
+        ) AS monitor*/
         INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
         WHERE
         monitor.Status = 1
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
index e7ddadc0f..ccdeb52b7 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Transient;
+
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -121,7 +121,7 @@ public class RmpEventDetailPO implements Serializable {
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "用于计算数量")
-    @Transient
+    @TableField(exist = false)
     private Integer count;
 
 }