From fc9e824d7f2b2342192a61da237ce4f2e80629d9 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 20 Nov 2023 14:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerManger/CommTerminalController.java | 13 +++++++++++++ .../njcn/prepare/executor/MeasurementExecutor.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index ac2280466..752111350 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -13,9 +13,11 @@ import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.service.ledgerManger.CommTerminalService; import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.ITerminalService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -29,6 +31,8 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * @author wr @@ -48,6 +52,8 @@ public class CommTerminalController extends BaseController { private final CommTerminalService commTerminalService; + private final ITerminalService terminalService; + /** * 通过部门获取所有子集部门所拥有的监测点 * @@ -284,11 +290,18 @@ public class CommTerminalController extends BaseController { String methodDescribe = getMethodDescribe("getMonitorDetailList"); List result = new ArrayList<>(); List monitorList = monitorService.getMonitorList(list); + //获取设备最新数据时间 + List devList = monitorList.stream().map(Monitor::getTerminalId).distinct().collect(Collectors.toList()); + List terminals = terminalService.getTerminalSelectByIds(devList); + Map> map = terminals.stream().collect(Collectors.groupingBy(PmsTerminal::getId)); monitorList.forEach(item->{ LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); lineDevGetDTO.setPointId(item.getId()); lineDevGetDTO.setDevId(item.getTerminalId()); lineDevGetDTO.setInterval(item.getStatisticalInterval()); + if (!Objects.isNull(map.get(item.getTerminalId()))){ + lineDevGetDTO.setUpdateTime(map.get(item.getTerminalId()).get(0).getUpdateTime()); + } result.add(lineDevGetDTO); }); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,result, methodDescribe); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java index 00a04c78b..1195cb43b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java @@ -334,8 +334,8 @@ public class MeasurementExecutor extends BaseExecutor { /** * 算法名: 3.4.1.7.2-----监测点指标告警日统计(r_mp_target_warn_d) - * 算法名: 3.4.1.7.3-----监测点指标告警月统计(r_mp_target_warn_m) - * + * 算法名: 3.4.1.7.3-----监测点指标告警月统计(r_mp_monitor_alarm_count_m) + * fixme r_mp_target_warn_d-----根据国网谐波平台算法文档中需进行告警的电能质量指标不包括电压暂升,但数据库有此字段,暂未统计 * @author xuyang * @date 2023年11月14日 08:54 */