From 779fa3faa3ea1e4536ea7229ed9e929f728e2e7e Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 7 Apr 2023 09:51:02 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=A8=B3=E6=80=81=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/vo/AllDataVO.java | 6 +++++ .../majornetwork/LargeScreenMapper.java | 3 +++ .../mapping/LargeScreenMapper.xml | 20 ++++++++++++++- .../Impl/LargeScreenServiceImpl.java | 25 +++++++++++++++---- .../majornetwork/LargeScreenMapper.java | 3 --- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java index fc181c760..054580d6f 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java @@ -21,6 +21,12 @@ public class AllDataVO implements Serializable { @ApiModelProperty("部门名称") private String areaName; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private String index; + /** * 暂降事件次数 */ diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java index 193090015..9c4a6c2be 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java @@ -32,4 +32,7 @@ public interface LargeScreenMapper { List> getMiddleTerminal (@Param("deviceIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); List getMiddleLimitRate (@Param("lineIds") List deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + + List> getHomeostasisArea (@Param("indexIds") List indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml index 3e353e547..45b4d5a5c 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -195,5 +195,23 @@ left join pq_line pl3 on pl2.Pid = pl3.Id - + diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index 7ff900fc9..5b3f1e596 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -12,6 +12,7 @@ import com.njcn.system.pojo.enums.StatisticsEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import com.njcn.device.pq.api.GeneralDeviceInfoClient; @@ -19,10 +20,7 @@ import java.math.RoundingMode; import java.text.NumberFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -274,6 +272,8 @@ public class LargeScreenServiceImpl implements LargeScreenService { if (generalDeviceDTO.getDeviceIndexes().size() > 0) { AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes()); allDataVO.setAreaName(generalDeviceDTO.getName()); + allDataVO.setIndex(generalDeviceDTO.getIndex()); + allDataVO.setSteadyLoad("0.0"); if (generalDeviceDTO.getLineIndexes().size() > 0) { Map map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); allDataVO.setEventCounts(map.get("count").toString()); @@ -284,11 +284,13 @@ public class LargeScreenServiceImpl implements LargeScreenService { } else { AllDataVO allDataVO = new AllDataVO(); allDataVO.setAreaName(generalDeviceDTO.getName()); + allDataVO.setIndex(generalDeviceDTO.getIndex()); allDataVO.setRunning("0"); allDataVO.setHotSpare("0"); allDataVO.setShutdown("0"); allDataVO.setNormal("0"); allDataVO.setBreakdown("0"); + allDataVO.setSteadyLoad("0.0"); if (generalDeviceDTO.getLineIndexes().size() > 0) { Map map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); allDataVO.setEventCounts(map.get("count").toString()); @@ -298,7 +300,20 @@ public class LargeScreenServiceImpl implements LargeScreenService { result.add(allDataVO); } } - //todo 该接口部分功能未完成 1.稳态符合性 2.综合评估 + //部门id集合 + List indexIds = generalDeviceDTOList.stream().map(GeneralDeviceDTO::getIndex).collect(Collectors.toList()); + List> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + float f = 0.0f; + for (AllDataVO allDataVO : result) { + for (Map map : homeostasisArea) { + if (Objects.equals(map.get("id"),allDataVO.getIndex())){ + f=Float.parseFloat(map.get("avg").toString()); + allDataVO.setSteadyLoad(String.valueOf((1-f)*100)); + } + } + } + + //todo 该接口部分功能未完成 1.综合评估 return result; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java index 8eb99865a..53ee2108c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/LargeScreenMapper.java @@ -1,8 +1,5 @@ package com.njcn.harmonic.mapper.majornetwork; -import com.njcn.device.pq.pojo.vo.AllDataVO; -import com.njcn.device.pq.pojo.vo.EventVO; -import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO; import org.apache.ibatis.annotations.Param; import java.util.List;