From d8cb5479e86fb6c7057dc461c318fbe308cd369f Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 8 May 2024 10:17:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B2=B3=E5=8C=97=E4=B8=A4=E7=BA=A7=E8=B4=AF?= =?UTF-8?q?=E9=80=9A=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=AF=A6=E6=83=85=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...unStatistic.java => PmsRunStatisticD.java} | 4 +- .../device/pms/pojo/po/PmsRunStatisticM.java | 73 +++++++++++++++++++ .../device/pms/pojo/po/PmsRunStatisticY.java | 73 +++++++++++++++++++ ...apper.java => PmsRunStatisticDMapper.java} | 4 +- .../majornetwork/PmsRunStatisticMMapper.java | 19 +++++ .../majornetwork/PmsRunStatisticYMapper.java | 19 +++++ .../ledgerManger/IPmsRunStatisticService.java | 7 +- .../impl/PmsRunStatisticServiceImpl.java | 39 +++++----- .../mysql/line/PmsRunStatisticMapper.java | 4 +- ...ploadPointStatisticalDataDServiceImpl.java | 12 +-- 10 files changed, 214 insertions(+), 40 deletions(-) rename pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/{PmsRunStatistic.java => PmsRunStatisticD.java} (94%) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/{PmsRunStatisticMapper.java => PmsRunStatisticDMapper.java} (59%) create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java similarity index 94% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java index ba8dfb21c..4e994111f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticD.java @@ -9,9 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.njcn.db.bo.BaseEntity; import lombok.Data; -import lombok.EqualsAndHashCode; import java.time.LocalDate; import java.time.LocalDateTime; @@ -24,7 +22,7 @@ import java.time.LocalDateTime; */ @TableName(value = "pms_run_statistic_d") @Data -public class PmsRunStatistic{ +public class PmsRunStatisticD { /** * diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java new file mode 100644 index 000000000..fc83a084a --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticM.java @@ -0,0 +1,73 @@ +package com.njcn.device.pms.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * pqs + * + * @author cdf + * @date 2024/4/17 + */ +@TableName(value = "pms_run_statistic_d") +@Data +public class PmsRunStatisticM { + + /** + * + */ + @MppMultiId + private LocalDate statisticDate; + + @MppMultiId + private String deptId; + + private String runMonitorIds; + + private String onlineMonitorIds; + + private String runBusIds; + + private Integer runBusNum; + + private String onlineBusIds; + + private String runDevIds; + + private String runStationIds; + + private Integer runStationNum; + + private String onlineStationIds; + + private String typicalTractionIds; + + private String typicalWindIds; + + private String typicalSunIds; + + private String typicalOtherIds; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime createTime; + + + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java new file mode 100644 index 000000000..7fc90a5c6 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatisticY.java @@ -0,0 +1,73 @@ +package com.njcn.device.pms.pojo.po; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * pqs + * + * @author cdf + * @date 2024/4/17 + */ +@TableName(value = "pms_run_statistic_d") +@Data +public class PmsRunStatisticY { + + /** + * + */ + @MppMultiId + private LocalDate statisticDate; + + @MppMultiId + private String deptId; + + private String runMonitorIds; + + private String onlineMonitorIds; + + private String runBusIds; + + private Integer runBusNum; + + private String onlineBusIds; + + private String runDevIds; + + private String runStationIds; + + private Integer runStationNum; + + private String onlineStationIds; + + private String typicalTractionIds; + + private String typicalWindIds; + + private String typicalSunIds; + + private String typicalOtherIds; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime createTime; + + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java similarity index 59% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMapper.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java index 87bfdc843..e86ac8e80 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticDMapper.java @@ -3,7 +3,7 @@ package com.njcn.device.pms.mapper.majornetwork; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.device.pms.pojo.po.PmsRunStatistic; +import com.njcn.device.pms.pojo.po.PmsRunStatisticD; /** *

@@ -13,6 +13,6 @@ import com.njcn.device.pms.pojo.po.PmsRunStatistic; * @author cdf * @since 2024-04-17 */ -public interface PmsRunStatisticMapper extends MppBaseMapper { +public interface PmsRunStatisticDMapper extends MppBaseMapper { } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java new file mode 100644 index 000000000..1602fb803 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticMMapper.java @@ -0,0 +1,19 @@ +package com.njcn.device.pms.mapper.majornetwork; + + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.device.pms.pojo.po.PmsRunStatisticD; +import com.njcn.device.pms.pojo.po.PmsRunStatisticM; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface PmsRunStatisticMMapper extends MppBaseMapper { + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java new file mode 100644 index 000000000..fcc80b6f2 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsRunStatisticYMapper.java @@ -0,0 +1,19 @@ +package com.njcn.device.pms.mapper.majornetwork; + + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.device.pms.pojo.po.PmsRunStatisticD; +import com.njcn.device.pms.pojo.po.PmsRunStatisticY; + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface PmsRunStatisticYMapper extends MppBaseMapper { + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java index a09b60eff..e4ae169da 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/IPmsRunStatisticService.java @@ -1,11 +1,8 @@ package com.njcn.device.pms.service.ledgerManger; -import com.baomidou.mybatisplus.extension.service.IService; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.device.pms.pojo.po.PmsRunStatistic; - -import java.time.LocalDate; +import com.njcn.device.pms.pojo.po.PmsRunStatisticD; /** *

@@ -15,7 +12,7 @@ import java.time.LocalDate; * @author cdf * @since 2024-04-17 */ -public interface IPmsRunStatisticService extends IMppService { +public interface IPmsRunStatisticService extends IMppService { /** * 对外接口，统计每日在运测点，在线装置详细信息 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java index 95fafe168..20956cb70 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/PmsRunStatisticServiceImpl.java @@ -2,7 +2,6 @@ package com.njcn.device.pms.service.ledgerManger.impl; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -16,14 +15,12 @@ import com.njcn.device.pms.mapper.majornetwork.*; import com.njcn.device.pms.pojo.po.*; import com.njcn.device.pms.service.ledgerManger.CommTerminalService; import com.njcn.device.pms.service.ledgerManger.IPmsRunStatisticService; -import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.device.pq.pojo.po.RStatIntegrityD; 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.Dic; import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.SysDicTreePO; import com.njcn.system.pojo.vo.DictTreeVO; @@ -48,7 +45,7 @@ import java.util.stream.Stream; */ @Service @RequiredArgsConstructor -public class PmsRunStatisticServiceImpl extends MppServiceImpl implements IPmsRunStatisticService { +public class PmsRunStatisticServiceImpl extends MppServiceImpl implements IPmsRunStatisticService { private final CommTerminalService commTerminalService; @@ -76,7 +73,7 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl deptGetChildrenMoreDTOList = commTerminalService.deptGetLine(deptGetLineParam); - List poList = new ArrayList<>(); + List poList = new ArrayList<>(); //获取在运母线，在运电站数量 List midLedgerStationList = this.getBusBarAndStationInfo(0); @@ -124,36 +121,36 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl onlinePointIds = temPointIds.stream().filter(rStatIntegrityIds::contains).collect(Collectors.toList()); - PmsRunStatistic pmsRunStatistic = new PmsRunStatistic(); - pmsRunStatistic.setStatisticDate(localDate); - pmsRunStatistic.setDeptId(dto.getUnitId()); - pmsRunStatistic.setRunMonitorIds(String.join(StrUtil.COMMA, temPointIds)); - pmsRunStatistic.setOnlineMonitorIds(String.join(StrUtil.COMMA, onlinePointIds)); + PmsRunStatisticD pmsRunStatisticD = new PmsRunStatisticD(); + pmsRunStatisticD.setStatisticDate(localDate); + pmsRunStatisticD.setDeptId(dto.getUnitId()); + pmsRunStatisticD.setRunMonitorIds(String.join(StrUtil.COMMA, temPointIds)); + pmsRunStatisticD.setOnlineMonitorIds(String.join(StrUtil.COMMA, onlinePointIds)); - pmsRunStatistic.setRunDevIds(dto.getLineBaseList().stream().map(LineDevGetDTO::getDevId).distinct().collect(Collectors.joining(StrUtil.COMMA))); + pmsRunStatisticD.setRunDevIds(dto.getLineBaseList().stream().map(LineDevGetDTO::getDevId).distinct().collect(Collectors.joining(StrUtil.COMMA))); long stationCount = midLedgerStationList.stream().filter(it->childrenDept.contains(it.getSectionId())).map(PmsMidLedger::getId).distinct().count(); - pmsRunStatistic.setRunStationNum((int) stationCount); + pmsRunStatisticD.setRunStationNum((int) stationCount); long busBarCount = midLedgerBusBarList.stream().filter(it->childrenDept.contains(it.getSectionId())).map(PmsMidLedger::getId).distinct().count(); - pmsRunStatistic.setRunBusNum((int) busBarCount); + pmsRunStatisticD.setRunBusNum((int) busBarCount); List runBusIds = monitorList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(Monitor::getLineId).distinct().collect(Collectors.toList()); - pmsRunStatistic.setOnlineBusIds(String.join(StrUtil.COMMA, runBusIds)); + pmsRunStatisticD.setOnlineBusIds(String.join(StrUtil.COMMA, runBusIds)); List runStationIds = statationStatList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(StatationStat::getPowerId).distinct().collect(Collectors.toList()); - pmsRunStatistic.setOnlineStationIds(String.join(StrUtil.COMMA, runStationIds)); + pmsRunStatisticD.setOnlineStationIds(String.join(StrUtil.COMMA, runStationIds)); //典型统计 List windPointIds = dto.getLineBaseList().stream().filter(it->windfarm_user_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); List sunPointIds = dto.getLineBaseList().stream().filter(it->photovoltaicsit_eusers_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); List tractionPointIds = dto.getLineBaseList().stream().filter(it->tractionstation_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); List otherPointIds = dto.getLineBaseList().stream().filter(it->!un_other_interferencesource_users_dict.contains(it.getObjType())).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - pmsRunStatistic.setTypicalWindIds(String.join(StrUtil.COMMA, windPointIds)); - pmsRunStatistic.setTypicalSunIds(String.join(StrUtil.COMMA, sunPointIds)); - pmsRunStatistic.setTypicalTractionIds(String.join(StrUtil.COMMA, tractionPointIds)); - pmsRunStatistic.setTypicalOtherIds(String.join(StrUtil.COMMA, otherPointIds)); - poList.add(pmsRunStatistic); + pmsRunStatisticD.setTypicalWindIds(String.join(StrUtil.COMMA, windPointIds)); + pmsRunStatisticD.setTypicalSunIds(String.join(StrUtil.COMMA, sunPointIds)); + pmsRunStatisticD.setTypicalTractionIds(String.join(StrUtil.COMMA, tractionPointIds)); + pmsRunStatisticD.setTypicalOtherIds(String.join(StrUtil.COMMA, otherPointIds)); + poList.add(pmsRunStatisticD); } this.saveBatch(poList); } @@ -163,6 +160,8 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl @@ -13,6 +13,6 @@ import com.njcn.device.pms.pojo.po.PmsRunStatistic; * @author cdf * @since 2024-04-17 */ -public interface PmsRunStatisticMapper extends MppBaseMapper { +public interface PmsRunStatisticMapper extends MppBaseMapper { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java index 7dc180cce..4e6e4644c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java @@ -5,25 +5,21 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.biz.commApi.CommLineClient; -import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; -import com.njcn.device.pms.pojo.po.PmsRunStatistic; +import com.njcn.device.pms.pojo.po.PmsRunStatisticD; import com.njcn.device.pq.pojo.po.RStatIntegrityD; import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD; import com.njcn.prepare.harmonic.enums.UploadEnum; -import com.njcn.prepare.harmonic.mapper.mysql.area.ROperatingIndexDPOMapper; import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.PmsRunStatisticMapper; import com.njcn.prepare.harmonic.mapper.mysql.upload.RUploadPointStatisticalDataDMapper; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; -import com.njcn.prepare.harmonic.pojo.dto.UploadPointStatisticalParam; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; @@ -136,12 +132,12 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl pmsRunStatisticsList = pmsRunStatisticMapper.selectList(new LambdaQueryWrapper().eq(PmsRunStatistic::getStatisticDate,calculatedParam.getDataDate())); + List pmsRunStatisticsListD = pmsRunStatisticMapper.selectList(new LambdaQueryWrapper().eq(PmsRunStatisticD::getStatisticDate,calculatedParam.getDataDate())); //筛选国网上送监测点 List deptAll = calculatedParam.getIdList(); - Map pmsRunStatisticMap = pmsRunStatisticsList.stream().collect(Collectors.toMap(PmsRunStatistic::getDeptId,Function.identity())); + Map pmsRunStatisticMap = pmsRunStatisticsListD.stream().collect(Collectors.toMap(PmsRunStatisticD::getDeptId,Function.identity())); List lineDTOList; if(pmsRunStatisticMap.containsKey(dept.getCode())){ List monitorIds = CollectionUtil.toList(pmsRunStatisticMap.get(dept.getCode()).getRunMonitorIds().split(StrUtil.COMMA)); @@ -160,7 +156,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl Objects.equals(o.getIsUpToGrid(), 1)).collect(toList()); }else {