From faac7953d370c4993facd499c5dc53ab2eb4bdfd Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Fri, 26 Dec 2025 15:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=8D=97=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../voltage/impl/SgEventServiceImpl.java      |  5 +-
 .../njcn/device/pq/pojo/dto/PublicDTO.java    |  4 +
 .../pq/pojo/vo/LineIntegrityDataVO.java       | 12 +++
 .../pq/pojo/vo/TerminalOnlineRateDataVO.java  | 12 +++
 .../mapper/mapping/RStatOnlinerateDMapper.xml |  3 +-
 .../mapping/TerminalOnlineRateDataMapper.xml  |  1 -
 .../impl/LineIntegrityDataServiceImpl.java    | 78 +++++++++++++------
 .../TerminalOnlineRateDataServiceImpl.java    | 56 +++++++++----
 .../device/pq/utils/DataStatisticsUtil.java   | 53 ++++++++++++-
 .../mapper/mapping/RStatIntegrityDMapper.xml  |  3 +-
 10 files changed, 179 insertions(+), 48 deletions(-)

diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgEventServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgEventServiceImpl.java
index 3cc8a7903..688fd4d82 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgEventServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgEventServiceImpl.java
@@ -322,10 +322,7 @@ public class SgEventServiceImpl extends ServiceImpl<SgEventMapper, SgEvent> impl
 
     @Override
     public boolean deleteEventData(List<String> ids) {
-        return this.lambdaUpdate()
-                .set(SgEvent::getState, DataStateEnum.DELETED.getCode())
-                .in(SgEvent::getId, ids)
-                .update();
+        return this.removeByIds(ids);
     }
 
     @Override
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PublicDTO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PublicDTO.java
index f6caa5346..75b020848 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PublicDTO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PublicDTO.java
@@ -8,4 +8,8 @@ public class PublicDTO {
     private String id;
 
     private Double data;
+
+    private Integer onlineMin;
+
+    private Integer offlineMin;
 }
\ No newline at end of file
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java
index 64a385f73..c17059f35 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineIntegrityDataVO.java
@@ -136,6 +136,18 @@ public class LineIntegrityDataVO implements Serializable {
     @ApiModelProperty(name = "integrityData",value = "数据完整性")
     private Double integrityData;
 
+    /**
+     * 实际时间
+     */
+    @ApiModelProperty(name = "realTime",value = "实际时间")
+    private Integer realTime;
+
+    /**
+     * 期望时间
+     */
+    @ApiModelProperty(name = "dueTime",value = "期望时间")
+    private Integer dueTime;
+
     /**
      * 监测点合格率
      */
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalOnlineRateDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalOnlineRateDataVO.java
index b83e199a1..313cdb58a 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalOnlineRateDataVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalOnlineRateDataVO.java
@@ -77,6 +77,18 @@ public class TerminalOnlineRateDataVO implements Serializable {
     @ApiModelProperty(name = "onlineRate",value = "在线率")
     private Double onlineRate;
 
+    /**
+     * 在线分钟数
+     */
+    @ApiModelProperty(name = "onlineMin",value = "在线分钟数")
+    private Integer onlineMin;
+
+    /**
+     * 离线分钟数
+     */
+    @ApiModelProperty(name = "offlineMin",value = "离线分钟数")
+    private Integer offlineMin;
+
     /**
      * 最新数据时间
      */
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml
index e6ba44ea2..9af24b6ff 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml
@@ -5,8 +5,7 @@
         select
         dev_index,
         sum(online_min) as onlineMin,
-        sum(offline_min) as offlineMin,
-        ROUND( sum(online_min)*1.0/(sum(online_min) + sum(offline_min))*100,2) as onlineRate
+        sum(offline_min) as offlineMin
         from r_stat_onlinerate_d
         <where>
             <if test="param!=null and param.ids != null and param.ids.size > 0">
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
index c2d536b90..dd2c263d2 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml
@@ -176,7 +176,6 @@
     <select id="getDevOnlineByDevIds" resultType="TerminalOnlineRateData">
         select
                 dev_index devId,
-                avg(online_min/(online_min+offline_min))*100 onlineRate,
                 sum(online_min) onlineMin,
                 sum(offline_min) offlineMin
         from r_stat_onlinerate_d
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
index 5d7f74c46..22ca48af5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
@@ -173,13 +173,17 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
                 }
 
                 // 数据封装
-                Double temValue = lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToDouble(LineIntegrityDataVO::getIntegrityData).average().orElse(3.14159);
+                // 汇总所有监测点的实际时间和期望时间，重新计算完整性
+                int totalRealTime = (int) lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getRealTime).sum();
+                int totalDueTime = (int) lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getDueTime).sum();
+                lineIntegrityDataVO.setRealTime(totalRealTime);
+                lineIntegrityDataVO.setDueTime(totalDueTime);
+                lineIntegrityDataVO.setIntegrityData(DataStatisticsUtil.calculateIntegrityRate(totalRealTime, totalDueTime));
                 LineIntegrityDataVO temp = lineList.stream().filter(t -> t.getAlgoDescribe() != null).min(Comparator.comparing(LineIntegrityDataVO::getAlgoDescribe)).orElse(new LineIntegrityDataVO());
                 lineIntegrityDataVO.setAlgoDescribe(temp.getAlgoDescribe());
                 lineIntegrityDataVO.setId(generalDeviceDTO.getIndex());
                 lineIntegrityDataVO.setName(generalDeviceDTO.getName());
                 lineIntegrityDataVO.setLevel(0);
-                lineIntegrityDataVO.setIntegrityData(DataStatisticsUtil.dataLimits(temValue));
                 pro.add(lineIntegrityDataVO);
 
             }
@@ -193,12 +197,12 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
 
 
     private void dealDataJinDu(List<LineIntegrityDataVO> mList,LineIntegrityDataVO children){
-        double temValue = mList.stream().filter(it->it.getIntegrityData()!=3.14159).mapToDouble(LineIntegrityDataVO::getIntegrityData).average().orElse(3.14159);
-        if(temValue!=3.14159){
-            children.setIntegrityData(new BigDecimal(temValue).setScale(2,RoundingMode.HALF_UP).doubleValue());
-        }else {
-            children.setIntegrityData(temValue);
-        }
+        // 汇总子节点的实际时间和期望时间，重新计算完整性
+        int totalRealTime = (int) mList.stream().filter(it->it.getIntegrityData()!=3.14159).mapToLong(LineIntegrityDataVO::getRealTime).sum();
+        int totalDueTime = (int) mList.stream().filter(it->it.getIntegrityData()!=3.14159).mapToLong(LineIntegrityDataVO::getDueTime).sum();
+        children.setRealTime(totalRealTime);
+        children.setDueTime(totalDueTime);
+        children.setIntegrityData(DataStatisticsUtil.calculateIntegrityRate(totalRealTime, totalDueTime));
     }
 
     private void dealMonitorData(List<LineIntegrityDataVO> lineList,List<LineDataIntegrity> percentageOfCompleteDatas,Map<String, Integer> mapA){
@@ -209,10 +213,13 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             if(dataIntegrityMap.containsKey(monitor.getId())){
                 flag = true;
                 LineDataIntegrity integrity = dataIntegrityMap.get(monitor.getId());
-                monitor.setIntegrityData(DataStatisticsUtil.dataLimits(integrity.getIntegrityData()));
+                monitor.setRealTime(integrity.getReal() == null ? 0 : integrity.getReal().intValue());
+                monitor.setDueTime(integrity.getDue() == null ? 0 : integrity.getDue().intValue());
+                Double integrityData = DataStatisticsUtil.calculateIntegrityRate(monitor.getRealTime(), monitor.getDueTime());
+                monitor.setIntegrityData(integrityData);
                 if (StrUtil.isNotBlank(monitor.getLineGrade())) {
                     if (mapA.containsKey(monitor.getLineGrade())) {
-                        if (integrity.getIntegrityData() > mapA.get(monitor.getLineGrade())) {
+                        if (integrityData != 3.14159 && integrityData > mapA.get(monitor.getLineGrade())) {
                             monitor.setValueOver(1);
                         } else {
                             monitor.setValueOver(0);
@@ -228,6 +235,8 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             if (!flag) {
                 //表示未匹配到数据完整性
                 monitor.setIntegrityData(3.14159);
+                monitor.setRealTime(0);
+                monitor.setDueTime(0);
                 monitor.setValueOver(0);
             }
         }
@@ -248,13 +257,19 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
                 outParam.setType(generalDeviceDTO.getName() + "\n(" + generalDeviceDTO.getLineIndexes().size() + ")");
                 //根据监测点查询数据完整性
                 List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
-                double v = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
-                outParam.setSingle(v!=3.14159?NumberUtil.round(v,2).doubleValue():v);
+                // 汇总所有监测点的实际时间和期望时间，再计算总完整性
+                int totalRealTime = (int) integrityData.stream().mapToLong(PublicDTO::getOnlineMin).sum();
+                int totalDueTime = (int) integrityData.stream().mapToLong(PublicDTO::getOfflineMin).sum();
+                double v = DataStatisticsUtil.calculateIntegrityRate(totalRealTime, totalDueTime);
+                outParam.setSingle(v);
                 //如果存在需要比较的时间，再获取对应数据
                 if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
                     List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());
-                    double v1 = compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
-                    outParam.setRatio(v1!=3.14159?NumberUtil.round(v1,2).doubleValue():v1);
+                    // 汇总所有监测点的实际时间和期望时间，再计算总完整性
+                    int compareRealTime = (int) compareData.stream().mapToLong(PublicDTO::getOnlineMin).sum();
+                    int compareDueTime = (int) compareData.stream().mapToLong(PublicDTO::getOfflineMin).sum();
+                    double v1 = DataStatisticsUtil.calculateIntegrityRate(compareRealTime, compareDueTime);
+                    outParam.setRatio(v1);
                 }
                 out.add(outParam);
             }
@@ -320,12 +335,14 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
                     for (LineDataIntegrity lineData : percentageOfCompleteDatas) {
                         if (lineDataIntegrity.getId().equals(lineData.getLineId())) {
                             flag = true;
-                            Double temValue = lineData.getIntegrityData();
-                            lineDataIntegrity.setIntegrityData(DataStatisticsUtil.dataLimits(temValue));
+                            lineDataIntegrity.setRealTime(lineData.getReal() == null ? 0 : lineData.getReal().intValue());
+                            lineDataIntegrity.setDueTime(lineData.getDue() == null ? 0 : lineData.getDue().intValue());
+                            Double temValue = DataStatisticsUtil.calculateIntegrityRate(lineDataIntegrity.getRealTime(), lineDataIntegrity.getDueTime());
+                            lineDataIntegrity.setIntegrityData(temValue);
                             //根据等级判断是否越限
                             if (StrUtil.isNotBlank(lineDataIntegrity.getLineGrade())) {
                                 if (mapA.containsKey(lineDataIntegrity.getLineGrade())) {
-                                    if (temValue > mapA.get(lineDataIntegrity.getLineGrade())) {
+                                    if (temValue != 3.14159 && temValue > mapA.get(lineDataIntegrity.getLineGrade())) {
                                         lineDataIntegrity.setValueOver(1);
                                     } else {
                                         lineDataIntegrity.setValueOver(0);
@@ -343,6 +360,8 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
                     if (!flag) {
                         //表示未匹配到数据完整性
                         lineDataIntegrity.setIntegrityData(3.14159);
+                        lineDataIntegrity.setRealTime(0);
+                        lineDataIntegrity.setDueTime(0);
                         lineDataIntegrity.setValueOver(0);
                     }
                 }
@@ -352,13 +371,17 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
                 lineIntegrityDataVO.setChildren(subList);
 
                 // 数据封装
-                Double temValue = lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToDouble(LineIntegrityDataVO::getIntegrityData).average().orElse(3.14159);
+                // 汇总所有监测点的实际时间和期望时间，重新计算完整性
+                int totalRealTime = (int) lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getRealTime).sum();
+                int totalDueTime = (int) lineList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getDueTime).sum();
+                lineIntegrityDataVO.setRealTime(totalRealTime);
+                lineIntegrityDataVO.setDueTime(totalDueTime);
+                lineIntegrityDataVO.setIntegrityData(DataStatisticsUtil.calculateIntegrityRate(totalRealTime, totalDueTime));
                 LineIntegrityDataVO temp = lineList.stream().filter(t -> t.getAlgoDescribe() != null).min(Comparator.comparing(LineIntegrityDataVO::getAlgoDescribe)).orElse(new LineIntegrityDataVO());
                 lineIntegrityDataVO.setAlgoDescribe(temp.getAlgoDescribe());
                 lineIntegrityDataVO.setId(generalDeviceDTO.getIndex());
                 lineIntegrityDataVO.setName(generalDeviceDTO.getName());
                 lineIntegrityDataVO.setLevel(0);
-                lineIntegrityDataVO.setIntegrityData(Math.min(DataStatisticsUtil.dataLimits(temValue),100.0));
                 pro.add(lineIntegrityDataVO);
 
             }
@@ -397,9 +420,12 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             for (String pid : pids) {
                 if (lineAdministrationTree.getId().equals(pid)) {
                     List<LineIntegrityDataVO> lineIntegrityDataVOList = groupLine.get(pid);
-                    //父级完整性匹配
-                    Double temValue = lineIntegrityDataVOList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToDouble(LineIntegrityDataVO::getIntegrityData).average().orElse(3.14159);
-                    lineAdministrationTree.setIntegrityData(DataStatisticsUtil.dataLimits(temValue));
+                    //父级完整性匹配 - 汇总子节点的实际时间和期望时间，重新计算完整性
+                    int totalRealTime = (int) lineIntegrityDataVOList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getRealTime).sum();
+                    int totalDueTime = (int) lineIntegrityDataVOList.stream().filter(item -> item.getIntegrityData() != 3.14159).mapToLong(LineIntegrityDataVO::getDueTime).sum();
+                    lineAdministrationTree.setRealTime(totalRealTime);
+                    lineAdministrationTree.setDueTime(totalDueTime);
+                    lineAdministrationTree.setIntegrityData(DataStatisticsUtil.calculateIntegrityRate(totalRealTime, totalDueTime));
                     LineIntegrityDataVO temp = lineIntegrityDataVOList.stream().filter(t -> t.getAlgoDescribe() != null).min(Comparator.comparing(LineIntegrityDataVO::getAlgoDescribe)).orElse(new LineIntegrityDataVO());
                     lineAdministrationTree.setAlgoDescribe(temp.getAlgoDescribe());
                 }
@@ -418,10 +444,12 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
         if (!CollectionUtils.isEmpty(data)) {
             data.forEach(po -> {
                 PublicDTO publicDTO = new PublicDTO();
-                //数据完整性 保留四位小数
-                Double integrity = po.getIntegrityRate() == null ? 3.14159 : BigDecimal.valueOf(Double.parseDouble(po.getIntegrityRate().toString())).setScale(2, RoundingMode.HALF_UP).doubleValue();
                 publicDTO.setId(po.getLineIndex());
-                publicDTO.setData((integrity > 100.00) ? 100.00 : integrity);
+                publicDTO.setOnlineMin(po.getRealTime() == null ? 0 : po.getRealTime().intValue());
+                publicDTO.setOfflineMin(po.getDueTime() == null ? 0 : po.getDueTime().intValue());
+                // 计算数据完整性
+                Double integrity = DataStatisticsUtil.calculateIntegrityRate(publicDTO.getOnlineMin(), publicDTO.getOfflineMin());
+                publicDTO.setData(integrity);
                 integrityList.add(publicDTO);
             });
         }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java
index 81de180cf..59e71ad31 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java
@@ -182,11 +182,17 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                 type.add(generalDeviceDTO.getName()+"\n("+generalDeviceDTO.getLineIndexes().size()+")");
                 //根据终端索引集查询在线率
                 List<PublicDTO> onlineRateList = getCondition(deviceIndexes, onlineRateCensusParam.getSearchBeginTime(), onlineRateCensusParam.getSearchEndTime());
-                single.add(onlineRateList.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+                // 汇总所有设备的在线分钟和离线分钟，再计算总在线率
+                int totalOnlineMin = (int) onlineRateList.stream().mapToLong(PublicDTO::getOnlineMin).sum();
+                int totalOfflineMin = (int) onlineRateList.stream().mapToLong(PublicDTO::getOfflineMin).sum();
+                single.add(DataStatisticsUtil.calculateOnlineRate(totalOnlineMin, totalOfflineMin));
                 //如果存在需要比较的时间，再获取对应数据
                 if(StrUtil.isNotBlank(onlineRateCensusParam.getPeriodBeginTime()) && StrUtil.isNotBlank(onlineRateCensusParam.getPeriodEndTime())){
                     List<PublicDTO> compareData = getCondition(deviceIndexes, onlineRateCensusParam.getPeriodBeginTime(), onlineRateCensusParam.getPeriodEndTime());
-                    ratio.add(compareData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));
+                    // 汇总所有设备的在线分钟和离线分钟，再计算总在线率
+                    int compareOnlineMin = (int) compareData.stream().mapToLong(PublicDTO::getOnlineMin).sum();
+                    int compareOfflineMin = (int) compareData.stream().mapToLong(PublicDTO::getOfflineMin).sum();
+                    ratio.add(DataStatisticsUtil.calculateOnlineRate(compareOnlineMin, compareOfflineMin));
                 }
             }
         }
@@ -210,10 +216,12 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
         if (CollUtil.isNotEmpty(data)) {
             data.forEach(po -> {
                 PublicDTO publicDTO = new PublicDTO();
-                //终端在线率 保留两位小数
-                Double onlineRate = po.getOnlineRate() == null ? null : BigDecimal.valueOf(Double.parseDouble(po.getOnlineRate().toString())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                 publicDTO.setId(po.getDevIndex());
-                publicDTO.setData(DataStatisticsUtil.dataLimits(onlineRate));
+                publicDTO.setOnlineMin(po.getOnlineMin() == null ? 0 : po.getOnlineMin().intValue());
+                publicDTO.setOfflineMin(po.getOfflineMin() == null ? 0 : po.getOfflineMin().intValue());
+                // 计算在线率
+                Double onlineRate = DataStatisticsUtil.calculateOnlineRate(publicDTO.getOnlineMin(), publicDTO.getOfflineMin());
+                publicDTO.setData(onlineRate);
                 publicDTOList.add(publicDTO);
             });
         }
@@ -321,14 +329,24 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                                                 }
                                             }
                                         }
-                                        Double devAvg = children.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));
-                                        devItem.setOnlineRate(devAvg);
+                                        // 汇总子节点的在线分钟和离线分钟，重新计算在线率
+                                        int totalOnlineMin = (int) children.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOnlineMin).sum();
+                                        int totalOfflineMin = (int) children.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOfflineMin).sum();
+                                        devItem.setOnlineMin(totalOnlineMin);
+                                        devItem.setOfflineMin(totalOfflineMin);
+                                        devItem.setOnlineRate(DataStatisticsUtil.calculateOnlineRate(totalOnlineMin, totalOfflineMin));
                                     }
                                 }
-                                Double devAvg = devs.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));
-                                subItem.setOnlineRate(devAvg);
+                                // 汇总设备的在线分钟和离线分钟，重新计算变电站在线率
+                                int totalOnlineMin = (int)devs.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOnlineMin).sum();
+                                int totalOfflineMin = (int)devs.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOfflineMin).sum();
+                                subItem.setOnlineMin(totalOnlineMin);
+                                subItem.setOfflineMin(totalOfflineMin);
+                                subItem.setOnlineRate(DataStatisticsUtil.calculateOnlineRate(totalOnlineMin, totalOfflineMin));
                             } else {
                                 subItem.setOnlineRate(3.14159);
+                                subItem.setOnlineMin(0);
+                                subItem.setOfflineMin(0);
                             }
                             if (Objects.nonNull(subItem.getAlgoDescribe())) {
                                 if (mapAlarm.containsKey(subItem.getAlgoDescribe())) {
@@ -340,10 +358,16 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                                 }
                             }
                         }
-                        Double subAvg = subs.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));
-                        gdItem.setOnlineRate(subAvg);
+                        // 汇总变电站的在线分钟和离线分钟，重新计算供电公司在线率
+                        int totalOnlineMin = (int) subs.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOnlineMin).sum();
+                        int totalOfflineMin = (int) subs.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOfflineMin).sum();
+                        gdItem.setOnlineMin(totalOnlineMin);
+                        gdItem.setOfflineMin(totalOfflineMin);
+                        gdItem.setOnlineRate(DataStatisticsUtil.calculateOnlineRate(totalOnlineMin, totalOfflineMin));
                     } else {
                         gdItem.setOnlineRate(3.14159);
+                        gdItem.setOnlineMin(0);
+                        gdItem.setOfflineMin(0);
                     }
                     if (Objects.nonNull(gdItem.getAlgoDescribe())) {
                         if (mapAlarm.containsKey(gdItem.getAlgoDescribe())) {
@@ -355,10 +379,16 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
                         }
                     }
                 }
-                Double gdAvg = gds.stream().filter(item -> item.getOnlineRate() != 3.14159).collect(Collectors.averagingDouble(TerminalOnlineRateDataVO::getOnlineRate));
-                proItem.setOnlineRate(gdAvg);
+                // 汇总供电公司的在线分钟和离线分钟，重新计算省会在线率
+                int totalOnlineMin = (int) gds.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOnlineMin).sum();
+                int totalOfflineMin = (int) gds.stream().filter(item -> item.getOnlineRate() != 3.14159).mapToLong(TerminalOnlineRateDataVO::getOfflineMin).sum();
+                proItem.setOnlineMin(totalOnlineMin);
+                proItem.setOfflineMin(totalOfflineMin);
+                proItem.setOnlineRate(DataStatisticsUtil.calculateOnlineRate(totalOnlineMin, totalOfflineMin));
             } else {
                 proItem.setOnlineRate(3.14159);
+                proItem.setOnlineMin(0);
+                proItem.setOfflineMin(0);
             }
             if (Objects.nonNull(proItem.getAlgoDescribe())) {
                 if (mapAlarm.containsKey(proItem.getAlgoDescribe()))
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DataStatisticsUtil.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DataStatisticsUtil.java
index 3df34998a..4fcf9e348 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DataStatisticsUtil.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DataStatisticsUtil.java
@@ -127,16 +127,26 @@ public class DataStatisticsUtil {
                 for (TerminalOnlineRateData onlineRateData : terminalOnlineRateList) {
                     if (onlineRateDataVO.getId().equals(onlineRateData.getDevId())) {
                         flag = true;
-                        onlineRateDataVO.setOnlineRate( dataLimits(onlineRateData.getOnlineRate()));
+                        onlineRateDataVO.setOnlineMin(onlineRateData.getOnlineMin());
+                        onlineRateDataVO.setOfflineMin(onlineRateData.getOfflineMin());
+                        // 根据onlineMin和offlineMin计算在线率
+                        Double onlineRate = calculateOnlineRate(onlineRateData.getOnlineMin(), onlineRateData.getOfflineMin());
+                        onlineRateDataVO.setOnlineRate(onlineRate);
                         break;
                     }
                 }
                 if (!flag) {
                     onlineRateDataVO.setOnlineRate(3.14159);
+                    onlineRateDataVO.setOnlineMin(0);
+                    onlineRateDataVO.setOfflineMin(0);
                 }
             }).collect(Collectors.toList());
         } else {
-            deviceList = deviceList.stream().peek(onlineRateDataVO -> onlineRateDataVO.setOnlineRate(3.14159)).collect(Collectors.toList());
+            deviceList = deviceList.stream().peek(onlineRateDataVO -> {
+                onlineRateDataVO.setOnlineRate(3.14159);
+                onlineRateDataVO.setOnlineMin(0);
+                onlineRateDataVO.setOfflineMin(0);
+            }).collect(Collectors.toList());
         }
     }
 
@@ -149,6 +159,45 @@ public class DataStatisticsUtil {
         return data>100?100:data;
     }
 
+    /**
+     * 根据在线分钟数和离线分钟数计算在线率
+     * @param onlineMin 在线分钟数
+     * @param offlineMin 离线分钟数
+     * @return 在线率（保留两位小数，超过100则返回100）
+     */
+    public static Double calculateOnlineRate(Integer onlineMin, Integer offlineMin) {
+        if (onlineMin == null || offlineMin == null) {
+            return 3.14159;
+        }
+        long totalMin = onlineMin + offlineMin;
+        if (totalMin == 0) {
+            return 3.14159;
+        }
+        double rate = onlineMin * 100.0 / totalMin;
+        // 保留两位小数
+        rate = Math.round(rate * 100.0) / 100.0;
+        return dataLimits(rate);
+    }
+
+    /**
+     * 根据实际时间和期望时间计算数据完整性
+     * @param realTime 实际时间
+     * @param dueTime 期望时间
+     * @return 数据完整性（保留两位小数，超过100则返回100）
+     */
+    public static Double calculateIntegrityRate(Integer realTime, Integer dueTime) {
+        if (realTime == null || dueTime == null) {
+            return 3.14159;
+        }
+        if (dueTime == 0) {
+            return 3.14159;
+        }
+        double rate = realTime * 100.0 / dueTime;
+        // 保留两位小数
+        rate = Math.round(rate * 100.0) / 100.0;
+        return dataLimits(rate);
+    }
+
 }
 
 
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
index ca7f10e2f..a98bf1bb9 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
@@ -19,7 +19,8 @@
     <select id="getOnIntegrityByIds" resultType="com.njcn.device.pq.pojo.vo.RStatIntegrityVO">
         SELECT
         line_index AS lineIndex,
-        ROUND(sum( real_time )*1.0 / sum( due_time ) * 100,2) AS integrityRate
+        sum(real_time) AS realTime,
+        sum(due_time) AS dueTime
         FROM
         r_stat_integrity_d
         <where>