From fa2d0f0db41fb15d672bd470946dc05f9cda11f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 29 Dec 2023 13:49:05 +0800
Subject: [PATCH] =?UTF-8?q?1.pms=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gwPush/impl/GwMonitorPushServiceImpl.java | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

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 d403ea967..6e2643587 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
@@ -93,8 +93,8 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
         Map<String, DictData> statusMap = statusDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
 
         //电压互感类型
-        List<DictData> tranDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData();
-        Map<String, DictData> tranMap = tranDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
+        //List<DictData> tranDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData();
+        //Map<String, DictData> tranMap = tranDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
 
         DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData();
 
@@ -201,30 +201,25 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
 
 
-            if (tranMap.containsKey(item.getPotentialTransFormerType())) {
+          /*  if (tranMap.containsKey(item.getPotentialTransFormerType())) {
                 pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue());
-            }
+            }*/
 
 
 
-            if (tranMap.containsKey(item.getPotentialTransFormerType())) {
-                pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue());
-            }
 
-
-
-            if (StrUtil.isNotBlank(item.getOperationId())) {
+            /*if (StrUtil.isNotBlank(item.getOperationId())) {
                 pushMonitorDTO.setMaintOrg(item.getOperationId());
-            }
+            }*/
             if (Objects.nonNull(item.getStatisticalInterval())) {
                 pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString());
             }
 
             pushMonitorDTO.setMonitorTag(objTagMap.get(item.getMonitorTag()).getValue());
 
-            if (StrUtil.isNotBlank(item.getMonitorObjectId())) {
+          /*  if (StrUtil.isNotBlank(item.getMonitorObjectId())) {
                 pushMonitorDTO.setMonitorObjId(item.getMonitorObjectId());
-            }
+            }*/
             pushResult.add(pushMonitorDTO);
         }
 
@@ -317,7 +312,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
             for (Monitor monitor : monitorList) {
                 MonitorLimitDTO monitorLimitDTO = new MonitorLimitDTO();
                 monitorLimitDTO.setId(monitor.getId());
-                monitorLimitDTO.setOcDate(new Date());
+                //monitorLimitDTO.setOcDate(new Date());
                 monitorLimitDTO.setMonitorId(monitor.getId());
 
                 monitorLimitDTO.setPt((int) (monitor.getPt1() /monitor.getPt2()));