From 67d6b245d683d567238c64b62f26bad25a9486bc Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Tue, 27 Feb 2024 16:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96=E5=B9=B2?=
 =?UTF-8?q?=E6=89=B0=E6=BA=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../send/impl/PqTypicalSourceCreatePOServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 4022f3d77..153a0bb0f 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -106,10 +106,15 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                 DicDataEnum.PHOTOVOLTAICSIT_EUSERS.getCode(),
                 DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode()).collect(Collectors.toList());
 
-        List<SysDicTreePO> other_interferencesource_users_dict = sysdictreepo.stream().filter(temp -> other_interferencesource_users.contains(temp.getCode())).collect(Collectors.toList());
+//        List<SysDicTreePO> other_interferencesource_users_dict = sysdictreepo.stream().filter(temp -> other_interferencesource_users.contains(temp.getCode())).collect(Collectors.toList());
         List<SysDicTreePO> windfarm_user_dict = sysdictreepo.stream().filter(temp -> windfarm_user.contains(temp.getCode())).collect(Collectors.toList());
         List<SysDicTreePO> photovoltaicsit_eusers_dict = sysdictreepo.stream().filter(temp -> photovoltaicsit_eusers.contains(temp.getCode())).collect(Collectors.toList());
         List<SysDicTreePO> tractionstation_dict = sysdictreepo.stream().filter(temp -> tractionstation.contains(temp.getCode())).collect(Collectors.toList());
+        List<SysDicTreePO> un_other_interferencesource_users_dict =  new ArrayList<>();
+        un_other_interferencesource_users_dict.addAll(photovoltaicsit_eusers_dict);
+        un_other_interferencesource_users_dict.addAll(tractionstation_dict);
+        un_other_interferencesource_users_dict.addAll(tractionstation_dict);
+
 
 
         List<PvTerminalTreeVO> deptList = deptFeignClient.allDeptList().getData();
@@ -148,8 +153,8 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                     tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList());
                     pqTypicalSourceCreatePO.setIndustryType("99");
                 }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) {
-                    List<String> idList = other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList());
-                    tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList());
+                    List<String> idList = un_other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList());
+                    tempList = monitorList.stream().filter(tempmonitor -> !idList.contains(tempmonitor.getObjType())).collect(Collectors.toList());
                     pqTypicalSourceCreatePO.setIndustryType("08");
 
                 }