From 745d7e2829d8a0733b7caab83fba01ff3309b083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 4 Mar 2024 17:28:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=B2=B3=E5=8C=97pms?= =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E5=85=B8=E5=9E=8B=E6=BA=90?= =?UTF-8?q?=E8=8D=B7=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gwPush/impl/MonitorSendServiceImpl.java | 2 +- .../majornetwork/impl/MonitorServiceImpl.java | 3 ++- .../PqTypicalSourceCreatePOServiceImpl.java | 20 +++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index bc085bb64..042301bdc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -78,7 +78,7 @@ public class MonitorSendServiceImpl implements MonitorSendService { //特殊处理 List sysDicTreePOList = dictTreeFeignClient.queryAll().getData(); List typicDic =sysDicTreePOList.stream().filter(item-> Objects.equals(DicTreeEnum.Power_Station.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Ele_Railways.getCode(),item.getCode())|| - Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())).collect(Collectors.toList()); + Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Imp_Users.getCode(),item.getCode())).collect(Collectors.toList()); for(SysDicTreePO sysDicTreePO : typicDic){ List temList = dictTreeFeignClient.query(sysDicTreePO.getId()).getData(); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index c16fdcfe3..1069ca0e0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -190,8 +190,9 @@ public class MonitorServiceImpl extends ServiceImpl impl if(baseParam.getObjType().equals("987654321")){ //特殊处理 List sysDicTreePOList = dictTreeFeignClient.queryAll().getData(); + List typicDic =sysDicTreePOList.stream().filter(item->Objects.equals(DicTreeEnum.Power_Station.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Ele_Railways.getCode(),item.getCode())|| - Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())).collect(Collectors.toList()); + Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Imp_Users.getCode(),item.getCode())).collect(Collectors.toList()); for(SysDicTreePO sysDicTreePO : typicDic){ List temList = dictTreeFeignClient.query(sysDicTreePO.getId()).getData(); 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 527aab7fe..138ba02b9 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 @@ -23,8 +23,10 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.enums.DicTreeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.SysDicTreePO; +import com.njcn.system.pojo.vo.DictTreeVO; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import lombok.RequiredArgsConstructor; @@ -43,7 +45,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * + * * Description: * Date: 2023/12/12 15:16【需求编号】 * @@ -81,7 +83,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); QueryWrapper rMpSurplusHarmonicDetailDQueryWrapper = new QueryWrapper<>(); List sysdictreepo = dictTreeFeignClient.queryAll().getData(); - List other_interferencesource_users = Stream.of(DicDataEnum.SEMICONDUCTOR_MANUFACTURING.getCode(), + /* List other_interferencesource_users = Stream.of(DicDataEnum.SEMICONDUCTOR_MANUFACTURING.getCode(), DicDataEnum.PRECISION_MACHINING.getCode(), DicDataEnum.PARTY_GOVERNMENT.getCode(), DicDataEnum.NOSOCOMIUM.getCode(), @@ -92,7 +94,9 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl windfarm_user = Stream.of( DicDataEnum.WINDPOWER_STATION.getCode()).collect(Collectors.toList()); List photovoltaicsit_eusers = Stream.of( @@ -100,6 +104,12 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl tractionstation = Stream.of( DicDataEnum.ELECTRIFIED_RAILWAY.getCode()).collect(Collectors.toList()); + DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode(DicTreeEnum.Imp_Users.getCode()).getData(); + List dictTreeVOList = dictTreeFeignClient.query(dictTreeVO.getId()).getData(); + List importUser = dictTreeVOList.stream().map(DictTreeVO::getCode).distinct().collect(Collectors.toList()); + importUser.add(dictTreeVO.getCode()); + + /*3.45 典型源荷用户类型*/ List collect = Stream.of(DicDataEnum.TRACTIONSTATION.getCode(), DicDataEnum.WINDFARM_USER.getCode(), @@ -110,11 +120,13 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl windfarm_user_dict = sysdictreepo.stream().filter(temp -> windfarm_user.contains(temp.getCode())).collect(Collectors.toList()); List photovoltaicsit_eusers_dict = sysdictreepo.stream().filter(temp -> photovoltaicsit_eusers.contains(temp.getCode())).collect(Collectors.toList()); List tractionstation_dict = sysdictreepo.stream().filter(temp -> tractionstation.contains(temp.getCode())).collect(Collectors.toList()); + List import_dict = sysdictreepo.stream().filter(temp -> importUser.contains(temp.getCode())).collect(Collectors.toList()); + List 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(windfarm_user_dict); - + un_other_interferencesource_users_dict.addAll(import_dict); List deptList = deptFeignClient.allDeptList().getData();