From 6a97015cd6182d02977ff49d619148f143f4054a Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 21 Jan 2025 09:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E6=8E=A8=E9=80=81=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java | 3 ++- .../pms/service/gwPush/impl/GwMonitorPushServiceImpl.java | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java index 1d17d6f2e..4054c4147 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java @@ -3,6 +3,7 @@ package com.njcn.device.pms.pojo.dto; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; /** @@ -28,7 +29,7 @@ public class PushMonitorDTO { private String customName; private String status; private Date ctime; - private Date updateTime; + private LocalDateTime updateTime; private String lineId; private String chv; private String chi; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java index ca507b290..ff70971a1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java @@ -222,12 +222,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { - /* if (tranMap.containsKey(item.getPotentialTransFormerType())) { - pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue()); - } - if (pointMap.containsKey(item.getNeutralGroundingMode())) { - pushMonitorDTO.setNeutralGround(pointMap.get(item.getNeutralGroundingMode()).getValue()); - }*/ + pushMonitorDTO.setUpdateTime(item.getUpdateTime()); if (StrUtil.isNotBlank(item.getOrgName())) {