From be9c6bfc46aca1b109d350bbb7f160b6bfc5402f Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 25 Jul 2023 10:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RMpDevEvaluateDetailController.java | 38 ++++++++----------- .../RStatDevSignalController.java | 36 +++++++----------- .../mapping/RStatHarmonicVoltageMPOMapper.xml | 0 .../RStatHarmonicVoltageMPOService.java | 1 - 4 files changed, 30 insertions(+), 45 deletions(-) rename pqs-prepare/prepare-boot/src/main/{resources => java}/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml (100%) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpDevEvaluateDetailController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpDevEvaluateDetailController.java index fc1fbf74d..f45778351 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpDevEvaluateDetailController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpDevEvaluateDetailController.java @@ -75,31 +75,25 @@ public class RMpDevEvaluateDetailController extends BaseController { /*主网*/ List collect = data1.stream().map(DeptGetDeviceDTO::getDeviceList).flatMap(Collection::stream).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(collect)){ - Map> map = collect.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId)); - map.forEach((k, v) -> { - DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); - deviceDetail.setDevId(k); - List lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - deviceDetail.setLineIds(lineIds); - deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+""); - list.add(deviceDetail); - }); - } + collect.forEach(temp -> { + DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); + deviceDetail.setDevId(temp.getDevId()); + deviceDetail.setLineIds(temp.getMonitorIds()); + deviceDetail.setUpdateTime(temp.getUpdateTime()+""); + list.add(deviceDetail); + }); /*配网*/ List collect2 = data1.stream().map(DeptGetDeviceDTO::getPwDeviceList).flatMap(Collection::stream).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(collect2)){ - Map> map = collect2.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId)); - map.forEach((k, v) -> { - DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); - deviceDetail.setDevId(k); - List lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - deviceDetail.setLineIds(lineIds); - deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+""); - list.add(deviceDetail); - }); - } + + collect2.forEach(temp -> { + DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); + deviceDetail.setDevId(temp.getDevId()); + deviceDetail.setLineIds(temp.getMonitorIds()); + deviceDetail.setUpdateTime(temp.getUpdateTime()+""); + list.add(deviceDetail); + }); + deviceParam.setDetailList(list); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatDevSignalController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatDevSignalController.java index c1b8ab30b..26bc0fb40 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatDevSignalController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatDevSignalController.java @@ -77,31 +77,23 @@ public class RStatDevSignalController extends BaseController { /*主网*/ List collect = data1.stream().map(DeptGetDeviceDTO::getDeviceList).flatMap(Collection::stream).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(collect)){ - Map> map = collect.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId)); - map.forEach((k, v) -> { - DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); - deviceDetail.setDevId(k); - List lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - deviceDetail.setLineIds(lineIds); - deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+""); - list.add(deviceDetail); - }); - } + collect.forEach(temp -> { + DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); + deviceDetail.setDevId(temp.getDevId()); + deviceDetail.setLineIds(temp.getMonitorIds()); + deviceDetail.setUpdateTime(temp.getUpdateTime()+""); + list.add(deviceDetail); + }); /*配网*/ List collect2 = data1.stream().map(DeptGetDeviceDTO::getPwDeviceList).flatMap(Collection::stream).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(collect2)){ - Map> map = collect2.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId)); - map.forEach((k, v) -> { - DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); - deviceDetail.setDevId(k); - List lineIds = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - deviceDetail.setLineIds(lineIds); - deviceDetail.setUpdateTime(v.get(0).getUpdateTime()+""); - list.add(deviceDetail); - }); - } + collect2.forEach(temp -> { + DeviceParam.DeviceDetail deviceDetail = new DeviceParam.DeviceDetail(); + deviceDetail.setDevId(temp.getDevId()); + deviceDetail.setLineIds(temp.getMonitorIds()); + deviceDetail.setUpdateTime(temp.getUpdateTime()+""); + list.add(deviceDetail); + }); deviceParam.setDetailList(list); } rStatDevSignalDPOService.eventdetailHandler (deviceParam); diff --git a/pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml similarity index 100% rename from pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java index a95a96a11..e29000559 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java @@ -2,7 +2,6 @@ package com.njcn.prepare.harmonic.service.mysql.newalgorithm; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO; -import com.baomidou.mybatisplus.extension.service.IService; /** * * Description: