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 @@ ) 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 @@ - ) 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; }