数据中心bug代码提交

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  {
 

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();
+                setDto(listObject, generalDeviceDTO);
-                baseVO.setName(generalDeviceDTO.getName());
-                baseVO.setValue(BigDecimal.valueOf(3.141592));
-                baseVO.setData("-1");
-                baseVO.setCount(0);
-                baseVO.setSize(0);
-                listObject.add(baseVO);
             }
             i++;
         }
@@ -243,6 +239,16 @@ public class AreaLineServiceImpl implements AreaLineService {
         return eventHeatMapVO;
     }
 
+    public void setDto(List<BaseVO> 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<List<Object>> listObject, GeneralDeviceDTO generalDeviceDTO) {
+        List<Object> 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);
+    }
     /**
      * 获取终端运行统计
      *

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<GeneralDeviceDTO> generalDeviceDTOList, List<RmpEventDetailPO> eventDetailList) {
         List<AreaCalculationVO> 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()));

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

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