From 7c36dd2a0bb2715c9c90e9899149f62205b83392 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 6 Jun 2023 08:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83bug?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/po/SubstationExpend.java | 4 +- .../Impl/AreaLineServiceImpl.java | 40 ++++++++++++++----- .../Impl/AreaStatisticalServiceImpl.java | 2 +- .../src/main/resources/templates/bar8.ftl | 6 +-- .../src/main/resources/templates/bar9.ftl | 6 +-- 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java index 0ae1bbffb..bb6d03be8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SubstationExpend.java @@ -1,8 +1,6 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.common.pojo.dto.SimpleDTO; -import com.njcn.db.bo.BaseEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.List; @@ -19,6 +17,8 @@ import lombok.*; * @since 2023-05-08 */ @Data +@NoArgsConstructor +@AllArgsConstructor @TableName("pms_substation_expend") public class SubstationExpend implements Serializable { diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java index 1b74dcf11..8c2fe086f 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java @@ -220,21 +220,17 @@ public class AreaLineServiceImpl implements AreaLineService { largeScreenService.setResults(comAccessData, comAssessDTOS); float allComAss = comAssesUtil.getAllComAss(comAssessDTOS); BaseVO baseVO = new BaseVO(); - baseVO.setName(generalDeviceDTO.getName()); + baseVO.setName(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")"); baseVO.setValue(BigDecimal.valueOf(lineIndexs.size())); baseVO.setData(String.valueOf(allComAss)); baseVO.setCount(tail); baseVO.setSize(lineIndexs.size()); listObject.add(baseVO); + }else { + setDto(listObject, generalDeviceDTO); } } else { - BaseVO baseVO = new BaseVO(); - baseVO.setName(generalDeviceDTO.getName()); - baseVO.setValue(BigDecimal.valueOf(3.141592)); - baseVO.setData("-1"); - baseVO.setCount(0); - baseVO.setSize(0); - listObject.add(baseVO); + setDto(listObject, generalDeviceDTO); } i++; } @@ -243,6 +239,16 @@ public class AreaLineServiceImpl implements AreaLineService { return eventHeatMapVO; } + public void setDto(List listObject, GeneralDeviceDTO generalDeviceDTO) { + BaseVO baseVO = new BaseVO(); + baseVO.setName(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")"); + baseVO.setValue(BigDecimal.valueOf(3.141592)); + baseVO.setData("-1"); + baseVO.setCount(0); + baseVO.setSize(0); + listObject.add(baseVO); + } + @Override public EventSeverityVO getEventSeverity(DeviceInfoParam.BusinessParam deviceInfoParam) { //获取暂降字典信息 @@ -279,14 +285,18 @@ public class AreaLineServiceImpl implements AreaLineService { for (int eventNum = 0; eventNum < info.size(); eventNum++) { tail += info.get(eventNum).getFileFlag(); } - eventSeverityValueVO.setAreaName(generalDeviceDTO.getName()); + eventSeverityValueVO.setAreaName(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")"); eventSeverityValueVO.setLineNum(lineIndexs.size()); eventSeverityValueVO.setEventNum(tail); eventSeverityValueList.add(eventSeverityValueVO); - objectList.add(generalDeviceDTO.getName()); + objectList.add(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")"); objectList.add(tail); listObject.add(objectList); + }else { + setObjectDto(listObject, generalDeviceDTO); } + } else { + setObjectDto(listObject, generalDeviceDTO); } i++; } @@ -295,6 +305,16 @@ public class AreaLineServiceImpl implements AreaLineService { return eventSeverityVO; } + public void setObjectDto(List> listObject, GeneralDeviceDTO generalDeviceDTO) { + List info=new ArrayList<>(); + info.add(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")"); + info.add(BigDecimal.valueOf(3.141592)); + info.add("-1"); + info.add(0); + info.add(0); + info.add(0); + listObject.add(info); + } /** * 获取终端运行统计 * diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java index ceb016d36..f2796633b 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java @@ -186,7 +186,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService { private AreaStatisticsVO statisticsAreaInfo(List generalDeviceDTOList, List eventDetailList) { List areaCalculation = generalDeviceDTOList.parallelStream().map(t -> { AreaCalculationVO calculationVO = new AreaCalculationVO(); - calculationVO.setAreaName(t.getName()); + calculationVO.setAreaName(t.getName()+"\n("+t.getLineIndexes().size()+")"); calculationVO.setMonitoringPoints(t.getLineIndexes().size()); calculationVO.setFrequency(countLineIndexes(eventDetailList).apply(t.getLineIndexes())); diff --git a/pqs-event/event-boot/src/main/resources/templates/bar8.ftl b/pqs-event/event-boot/src/main/resources/templates/bar8.ftl index 646cb1f11..953fa0dbf 100644 --- a/pqs-event/event-boot/src/main/resources/templates/bar8.ftl +++ b/pqs-event/event-boot/src/main/resources/templates/bar8.ftl @@ -4,7 +4,7 @@ backgroundColor: '#fff', animation: false, title: { text: '暂降类型', -x: 'center', +x: '51%', }, legend: { orient: 'vertical', @@ -16,11 +16,11 @@ series: [ name: '暂降类型', type: 'pie', radius: '70%', -center: ['50%', '60%'], +center: ['55%', '53%'], label: { normal: { show: true, -formatter: '{d}%' +formatter: '{b}:{d}%' }, emphasis: { show: true diff --git a/pqs-event/event-boot/src/main/resources/templates/bar9.ftl b/pqs-event/event-boot/src/main/resources/templates/bar9.ftl index 48e4a14a4..c013cbc01 100644 --- a/pqs-event/event-boot/src/main/resources/templates/bar9.ftl +++ b/pqs-event/event-boot/src/main/resources/templates/bar9.ftl @@ -4,7 +4,7 @@ backgroundColor: '#fff', animation: false, title: { text: '暂降原因', -x: 'center' +x: '51%' }, legend: { orient: 'vertical', @@ -16,10 +16,10 @@ series: [ name: '暂降原因', type: 'pie', radius: '70%', -center: ['50%', '53%'], +center: ['55%', '53%'], label: { normal: { -formatter: '{d}%' +formatter: '{b}:{d}%' }, emphasis: { show: true