From 6ffcd6e092b98f0710e5e90a67299dfbd34d8a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 26 Feb 2024 19:58:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4pms=E5=9B=BD=E7=BD=91?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=8F=B0=E8=B4=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gwPush/impl/GwMonitorPushServiceImpl.java | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 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 3f903d943..71a49b303 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
@@ -27,6 +27,8 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.SysDicTreePO;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.enums.GWSendEnum;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
@@ -60,6 +62,8 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
     private final DicDataFeignClient dicDataFeignClient;
 
+    private final DeptFeignClient deptFeignClient;
+
     private final DictTreeFeignClient dictTreeFeignClient;
 
     private final StatationStatMapper statationStatMapper;
@@ -73,9 +77,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
     @Override
     public String pushMonitor(List<String> ids) {
 
-        if (ids.size() > 100) {
+        /*if (ids.size() > 100) {
             throw new BusinessException("一次最多上送100条数据");
-        }
+        }*/
 
         List<PushMonitorDTO> pushResult = new ArrayList<>();
 
@@ -139,12 +143,19 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
         Map<String,PmsTerminal> mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity()));
         Map<String,GeneratrixWire> mapBus = GeneratrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity()));
+
+
         //获取母线中台信息
         List<PmsMidLedger> pmsMidLedgers = pmsMidLedgerMapper.selectList(new LambdaQueryWrapper<PmsMidLedger>()
-                .in(PmsMidLedger::getId, mapBus.keySet())
+                .in(PmsMidLedger::getId, GeneratrixWireList.stream().map(GeneratrixWire::getMidBusId).distinct().collect(Collectors.toList()))
         );
         Map<String,PmsMidLedger> mapMidLedger = pmsMidLedgers.stream().collect(Collectors.toMap(PmsMidLedger::getId,Function.identity()));
 
+        //单位处理
+        List<Dept> deptList = deptFeignClient.getAllDept().getData();
+        Map<String,Dept> deptMap = deptList.stream().collect(Collectors.toMap(Dept::getCode,Function.identity()));
+        Map<String,Dept> deptIdMap = deptList.stream().collect(Collectors.toMap(Dept::getId,Function.identity()));
+
 
         for (Monitor item : monitorList) {
             PushMonitorDTO pushMonitorDTO = new PushMonitorDTO();
@@ -152,7 +163,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
             pushMonitorDTO.setMonitorId(item.getMonitorId());
             pushMonitorDTO.setMonitorName(item.getName());
             pushMonitorDTO.setTerminalCode(item.getTerminalId());
-            pushMonitorDTO.setCityId(item.getOrgId());
+            pushMonitorDTO.setCityId(deptIdMap.get(deptMap.get(item.getOrgId()).getPid()).getCode());
             pushMonitorDTO.setIsMajorNet("1");
 
             pushMonitorDTO.setProvinceId("13B9B47F1E483324E05338297A0A0595");
@@ -225,9 +236,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
             }*/
 
 
-            /*if (StrUtil.isNotBlank(item.getOperationId())) {
-                pushMonitorDTO.setMaintOrg(item.getOperationId());
-            }*/
+            if (StrUtil.isNotBlank(item.getOrgName())) {
+                pushMonitorDTO.setMaintOrg(item.getOrgName());
+            }
             if (Objects.nonNull(item.getStatisticalInterval())) {
                 pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString());
             }
@@ -292,9 +303,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
     @Override
     public String pushMonitorOverLimit(List<String> ids) {
-        if (ids.size() > 100) {
+       /* if (ids.size() > 100) {
             throw new BusinessException("一次最多上送100条数据");
-        }
+        }*/
 
         List<MonitorLimitDTO> pushResult = new ArrayList<>();