微调

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java

@@ -9,7 +9,7 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.DevDetail;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -111,7 +111,7 @@ public interface GeneralDeviceInfoClient {
      * @return
      */
     @PostMapping("/getOnlineRateByDevIds")
-    HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param);
+    HttpResult<List<RStatOnlineRateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param);
 
     /**
      *根据单位获取投运监测点（双系统）

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java

@@ -10,7 +10,7 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.DevDetail;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.biz.utils.DeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -84,7 +84,7 @@ public class GeneralDeviceInfoClientFallbackFactory implements FallbackFactory<G
             }
 
             @Override
-            public HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(OnlineRateParam param) {
+            public HttpResult<List<RStatOnlineRateVO>> getOnlineRateByDevIds(OnlineRateParam param) {
                 log.error("{}异常，降级处理，异常为：{}", "获取终端在线率（谐波专用）", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RStatIntegrityVO.java

@@ -1,8 +1,8 @@
 package com.njcn.device.pq.pojo.vo;
 
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -26,6 +26,6 @@ public class RStatIntegrityVO {
 
     private Integer realTime;
 
-    private Double integrityRate;
+    private BigDecimal integrityRate;
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RStatOnlineRateVO.java

@@ -2,6 +2,7 @@ package com.njcn.device.pq.pojo.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -11,7 +12,7 @@ import java.time.LocalDateTime;
  * @createTime: 2023-04-03
  */
 @Data
-public class RStatOnlinerateVO {
+public class RStatOnlineRateVO {
     private static final long serialVersionUID = 1L;
 
     private LocalDateTime timeId;
@@ -22,5 +23,5 @@ public class RStatOnlinerateVO {
 
     private Integer offlineMin;
 
-    private Float onlineRate;
+    private BigDecimal onlineRate;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/common/DeviceOnlineRate.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -23,7 +24,7 @@ public class DeviceOnlineRate {
     private Integer belowNum;
 
     @ApiModelProperty("总终端在线率")
-    private String totalOnlineRate;
+    private BigDecimal totalOnlineRate;
 
     @ApiModelProperty("统计信息")
     List<CitDetail> citDetailList;
@@ -41,7 +42,7 @@ public class DeviceOnlineRate {
         private Integer citBelowNum;
 
         @ApiModelProperty("总终端在线率")
-        private String citTotalOnlineRate;
+        private BigDecimal citTotalOnlineRate;
 
         @ApiModelProperty("统计信息")
         List<?> detailList;
@@ -82,7 +83,7 @@ public class DeviceOnlineRate {
         private LocalDateTime timeID;
 
         @ApiModelProperty("在线率")
-        private String onlineRate;
+        private BigDecimal onlineRate;
     }
 
     @Data
@@ -123,7 +124,7 @@ public class DeviceOnlineRate {
         private LocalDateTime latestTime;
 
         @ApiModelProperty("数据完整性")
-        private Double integrity;
+        private BigDecimal integrity;
     }
 
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java

@@ -269,9 +269,9 @@ public class GeneralDeviceInfoController extends BaseController {
     @PostMapping("/getOnlineRateByDevIds")
     @ApiOperation("终端在线率（谐波专用）")
     @ApiImplicitParam(name = "param", value = "参数实体", required = true)
-    public HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) {
+    public HttpResult<List<RStatOnlineRateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) {
         String methodDescribe = getMethodDescribe("getOnlineRateByDevIds");
-        List<RStatOnlinerateVO> onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param);
+        List<RStatOnlineRateVO> onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe);
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java

@@ -6,13 +6,11 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
-import com.njcn.device.pq.pojo.dto.LineDataQualityDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.param.LineDataQualityParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam;
 import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO;
 import com.njcn.device.pq.service.TerminalOnlineRateDataService;
 import com.njcn.web.controller.BaseController;
@@ -80,9 +78,9 @@ public class TerminalOnlineRateDataController extends BaseController {
     @PostMapping("/getOnlineRateByDevIds")
     @ApiOperation("终端在线率（谐波专用）")
     @ApiImplicitParam(name = "param", value = "参数实体", required = true)
-    public HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) {
+    public HttpResult<List<RStatOnlineRateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) {
         String methodDescribe = getMethodDescribe("getOnlineRateByDevIds");
-        List<RStatOnlinerateVO> onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param);
+        List<RStatOnlineRateVO> onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe);
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java

@@ -4,7 +4,7 @@ package com.njcn.device.pq.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,7 +26,7 @@ public interface RStatOnlinerateDMapper extends BaseMapper<RStatOnlinerateD> {
      * @param param
      * @return List<OnlineRate>
      */
-    List<RStatOnlinerateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
+    List<RStatOnlineRateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
 
     /**
      * @Description: 根据终端id集合获取总终端在线lv

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.device.pq.mapper.RStatOnlinerateDMapper">
-    <select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlinerateVO">
+    <select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlineRateVO">
         select
         dev_index,
         sum(online_min) as onlineMin,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java

@@ -128,7 +128,7 @@ public class CommunicateServiceImpl implements CommunicateService {
         param.setEndTime(DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
         if (state == 1) {
             //在线率
-            List<RStatOnlinerateVO> onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param);
+            List<RStatOnlineRateVO> onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param);
             if (CollUtil.isNotEmpty(onlineRateByDevIds)) {
                 onlineRateByDevIds.forEach(po -> {
                     //数据完整性 保留四位小数

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java

@@ -14,7 +14,6 @@ import com.njcn.device.common.mapper.onlinerate.OnLineRateMapper;
 import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.DeptLineService;
-import com.njcn.device.line.service.LineService;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DevRunEvaluateParam;
@@ -381,7 +380,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
             //超标率
             List<RStatLimitRateDPO> limitRatePOList = rStatLimitRateDClient.monitorIdsGetLimitInfo(rStatLimitQueryParam).getData();
             //获取所有终端在线率
-            List<RStatOnlinerateVO> onlineRateByDev = onLineRateMapper.getOnlineRateByDevIds(onlineRateParam);
+            List<RStatOnlineRateVO> onlineRateByDev = onLineRateMapper.getOnlineRateByDevIds(onlineRateParam);
 
             for (GeneralDeviceDTO dto : deviceInfo) {
                 detail = new DeviceRunEvaluateVO.Detail();
@@ -406,6 +405,8 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
                         evaluateVO.setName(value.get(0).getDevName());
                         evaluateVO.setSubName(value.get(0).getSubName());
                         evaluateVO.setIp(value.get(0).getIp());
+                        evaluateVO.setCompany(value.get(0).getCompany());
+                        evaluateVO.setRunFlag(RunFlagEnum.getRunFlagRemarkByStatus(value.get(0).getRunFlag()));
                         //部门
                         if (deptMap.containsKey(value.get(0).getCit())) {
                             evaluateVO.setCit(deptMap.get(value.get(0).getCit()));
@@ -442,12 +443,12 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
         }
     }
 
-    private BigDecimal onLineRate(List<RStatOnlinerateVO> onlineRateByDev, List<String> devIds) {
+    private BigDecimal onLineRate(List<RStatOnlineRateVO> onlineRateByDev, List<String> devIds) {
         //终端在线率
-        List<RStatOnlinerateVO> onlineRateDS = onlineRateByDev.stream().filter(x -> devIds.contains(x.getDevIndex())).collect(Collectors.toList());
+        List<RStatOnlineRateVO> onlineRateDS = onlineRateByDev.stream().filter(x -> devIds.contains(x.getDevIndex())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(onlineRateDS)) {
-            double onlineTime = onlineRateDS.stream().mapToDouble(RStatOnlinerateVO::getOnlineMin).sum();
-            double offlineTime = onlineRateDS.stream().mapToDouble(RStatOnlinerateVO::getOfflineMin).sum();
+            double onlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOnlineMin).sum();
+            double offlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOfflineMin).sum();
             return NumberUtil.round(Math.min(onlineTime * 100.0 / (onlineTime + offlineTime), 100), 2);
         } else {
             return new BigDecimal(0);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java

@@ -4,6 +4,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -34,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -69,9 +71,9 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
     @Override
     public List<LineDataQualityDTO> getLineDataQuality(LineDataQualityParam lineDataQualityParam) {
         List<String> lineIds = lineDataQualityParam.getLineIds();
-        List<Line> lineList = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,lineIds));
+        List<Line> lineList = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId, lineIds));
 
-        lineList = lineList.stream().peek(item->{
+        lineList = lineList.stream().peek(item -> {
             String devId = item.getPids().split(StrUtil.COMMA)[4];
             item.setPid(devId);
         }).collect(Collectors.toList());
@@ -81,35 +83,35 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
         QueryWrapper<RStatOnlinerateD> onlineQuery = new QueryWrapper<>();
         onlineQuery.select("dev_index,avg(online_min/offline_min+online_min) as onlineRate")
                 .lambda()
-                .in(RStatOnlinerateD::getDevIndex,devIds)
-                .between(RStatOnlinerateD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
+                .in(RStatOnlinerateD::getDevIndex, devIds)
+                .between(RStatOnlinerateD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN), DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
                 .groupBy(RStatOnlinerateD::getDevIndex);
         List<RStatOnlinerateD> rStatOnlinerateDList = onlineRateMapper.selectList(onlineQuery);
-        Map<String,RStatOnlinerateD> onlineMap = rStatOnlinerateDList.stream().collect(Collectors.toMap(RStatOnlinerateD::getDevIndex, Function.identity()));
+        Map<String, RStatOnlinerateD> onlineMap = rStatOnlinerateDList.stream().collect(Collectors.toMap(RStatOnlinerateD::getDevIndex, Function.identity()));
 
 
         QueryWrapper<RStatIntegrityD> integrityQuery = new QueryWrapper<>();
         integrityQuery.select("line_index,avg(real_time/due_time) as integrityData")
                 .lambda()
-                .in(RStatIntegrityD::getLineIndex,lineIds)
-                .between(RStatIntegrityD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN),DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
+                .in(RStatIntegrityD::getLineIndex, lineIds)
+                .between(RStatIntegrityD::getTimeId, DateUtil.parse(lineDataQualityParam.getBeginTime(), DatePattern.NORM_DATE_PATTERN), DateUtil.parse(lineDataQualityParam.getEndTime(), DatePattern.NORM_DATE_PATTERN))
                 .groupBy(RStatIntegrityD::getLineIndex);
         List<RStatIntegrityD> rStatIntegrityDList = rStatIntegrityDMapper.selectList(integrityQuery);
-        Map<String,RStatIntegrityD> integrityMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex,Function.identity()));
+        Map<String, RStatIntegrityD> integrityMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex, Function.identity()));
 
         List<LineDataQualityDTO> result = new ArrayList<>();
-        for(Line item : lineList){
+        for (Line item : lineList) {
             LineDataQualityDTO lineDataQualityDTO = new LineDataQualityDTO();
             lineDataQualityDTO.setLineId(item.getId());
             lineDataQualityDTO.setLineName(item.getName());
-            if(onlineMap.containsKey(item.getPid())){
+            if (onlineMap.containsKey(item.getPid())) {
                 lineDataQualityDTO.setOnlineRate(Double.valueOf(onlineMap.get(item.getPid()).getOnlineRate()));
-            }else {
+            } else {
                 lineDataQualityDTO.setOnlineRate(0.00);
             }
-            if(integrityMap.containsKey(item.getId())){
+            if (integrityMap.containsKey(item.getId())) {
                 lineDataQualityDTO.setIntegrityRate(Double.valueOf(integrityMap.get(item.getId()).getIntegrityData()));
-            }else {
+            } else {
                 lineDataQualityDTO.setIntegrityRate(0.00);
             }
             result.add(lineDataQualityDTO);
@@ -132,7 +134,7 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
 
             return rStatIntegrityD;
         }).collect(Collectors.toList());
-        this.saveOrUpdateBatchByMultiId(collect1,200);
+        this.saveOrUpdateBatchByMultiId(collect1, 200);
         return true;
     }
 
@@ -149,25 +151,25 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     .collect(Collectors.toList());
             rate.setTotalNum(lineIds.size());
             //获取所有监测点的数据完整性
-            List<RStatIntegrityVO> lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(lineIds,param.getSearchBeginTime(),param.getSearchEndTime());
+            List<RStatIntegrityVO> lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(lineIds, param.getSearchBeginTime(), param.getSearchEndTime());
             //获取所有监测点信息信息
             List<LineDetailVO.Detail> LineInfoByIds = lineService.getLineDetailByIds(lineIds);
 
-            rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo)?calculateIntegrityRate(lineIntegrityRateInfo,90):lineIds.size());
-            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo,lineIds).toString());
-            List<DeviceOnlineRate.CitDetail> citDetailList=new ArrayList<>();
+            rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, lineIds.size()) : lineIds.size());
+            rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, lineIds));
+            List<DeviceOnlineRate.CitDetail> citDetailList = new ArrayList<>();
             DeviceOnlineRate.CitDetail citDetail;
             DeviceOnlineRate.LineDetail detail;
             for (GeneralDeviceDTO dto : deviceInfo) {
                 //获取部门终端集合
                 List<RStatIntegrityVO> citDevOnRate = lineIntegrityRateInfo.stream().filter(x -> dto.getLineIndexes().contains(x.getLineIndex())).collect(Collectors.toList());
-                Map<String, Double> onlineRateByDevMap = citDevOnRate.stream()
+                Map<String, BigDecimal> onlineRateByDevMap = citDevOnRate.stream()
                         .collect(Collectors.toMap(RStatIntegrityVO::getLineIndex, RStatIntegrityVO::getIntegrityRate));
-                citDetail=new DeviceOnlineRate.CitDetail();
+                citDetail = new DeviceOnlineRate.CitDetail();
                 citDetail.setCitName(dto.getName());
                 citDetail.setCitTotalNum(dto.getLineIndexes().size());
-                citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate)?calculateIntegrityRate(lineIntegrityRateInfo,90):dto.getLineIndexes().size());
-                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo,dto.getLineIndexes()).toString());
+                citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate) ? calculateIntegrityRate(citDevOnRate, 90, dto.getLineIndexes().size()) : dto.getLineIndexes().size());
+                citDetail.setCitTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, dto.getLineIndexes()));
                 List<DeviceOnlineRate.LineDetail> detailList = new ArrayList<>();
                 List<LineDetailVO.Detail> lineDetail = LineInfoByIds.stream().filter(x -> dto.getLineIndexes().contains(x.getLineId())).collect(Collectors.toList());
                 for (LineDetailVO.Detail line : lineDetail) {
@@ -183,7 +185,7 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
                     detail.setLineId(line.getLineId());
                     detail.setLineName(line.getLineName());
                     detail.setLatestTime(line.getTimeID());
-                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), 0.0));
+                    detail.setIntegrity(onlineRateByDevMap.getOrDefault(line.getLineId(), BigDecimal.valueOf(0)));
                     detailList.add(detail);
                 }
                 citDetail.setDetailList(detailList);
@@ -194,19 +196,18 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl<RStatIntegrityDMa
         return rate;
     }
 
-    private Double calculateIntegrityRate(List<RStatIntegrityVO> lineIntegrityRateInfo ,List<String> deviceIds){
+    private BigDecimal calculateIntegrityRate(List<RStatIntegrityVO> lineIntegrityRateInfo, List<String> deviceIds) {
         List<RStatIntegrityVO> list = lineIntegrityRateInfo.stream().filter(x -> deviceIds.contains(x.getLineIndex())).collect(Collectors.toList());
-        if(CollUtil.isNotEmpty(list)){
-            BigDecimal onlineMin = BigDecimal.valueOf(list.stream().mapToLong(RStatIntegrityVO::getDueTime).sum());
-            BigDecimal offlineMin =BigDecimal.valueOf( list.stream().mapToLong(RStatIntegrityVO::getRealTime).sum());
-            BigDecimal sumMin= onlineMin.add(offlineMin);
-            return sumMin.doubleValue();
+        if (CollUtil.isNotEmpty(list)) {
+            BigDecimal dueTime = BigDecimal.valueOf(list.stream().mapToLong(RStatIntegrityVO::getDueTime).sum());
+            BigDecimal realTime = BigDecimal.valueOf(list.stream().mapToLong(RStatIntegrityVO::getRealTime).sum());
+            return realTime.multiply(BigDecimal.valueOf(100.0)).divide(dueTime, 2, RoundingMode.HALF_UP);
         }
-        return 0.0;
+        return BigDecimal.valueOf(0);
     }
 
-    private Integer calculateIntegrityRate(List<RStatIntegrityVO> onlineRateByDev,Integer limit){
-        return (int) onlineRateByDev.stream().filter(x -> x.getIntegrityRate() < limit).count();
+    private Integer calculateIntegrityRate(List<RStatIntegrityVO> onlineRateByDev, Integer limit, Integer count) {
+        return count - onlineRateByDev.stream().filter(x -> x.getIntegrityRate().doubleValue() >= limit).collect(Collectors.toList()).size();
     }
 
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java

@@ -2,12 +2,8 @@ package com.njcn.device.pq.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.common.service.GeneralDeviceService;
@@ -16,20 +12,15 @@ import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.mapper.*;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pq.pojo.dto.LineDataQualityDTO;
 import com.njcn.device.pq.pojo.dto.PublicDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.param.LineDataQualityParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam;
 
-import com.njcn.device.pq.pojo.po.Line;
-import com.njcn.device.pq.pojo.po.RStatIntegrityD;
-import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 import com.njcn.device.pq.pojo.po.TerminalOnlineRateData;
 import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
 import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO;
 import com.njcn.device.pq.service.TerminalOnlineRateDataService;
 import com.njcn.device.pq.utils.DataStatisticsUtil;
@@ -215,7 +206,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
         param.setIds(deviceIndexes);
         param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(searchBeginTime)).toString());
         param.setEndTime( DateUtil.endOfDay(DateUtil.parse(searchEndTime)).toString());
-        List<RStatOnlinerateVO> data = onlineRateMapper.getOnlineRateByDevIds(param);
+        List<RStatOnlineRateVO> data = onlineRateMapper.getOnlineRateByDevIds(param);
         if (CollUtil.isNotEmpty(data)) {
             data.forEach(po -> {
                 PublicDTO publicDTO = new PublicDTO();

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/onlinerate/OnLineRateMapper.java

@@ -4,7 +4,7 @@ package com.njcn.device.common.mapper.onlinerate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,6 +26,6 @@ public interface OnLineRateMapper extends BaseMapper<RStatOnlinerateD> {
      * @param param
      * @return List<OnlineRate>
      */
-    List<RStatOnlinerateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
+    List<RStatOnlineRateVO> getOnlineRateByDevIds(@Param("param") OnlineRateParam param);
 
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/mapper/onlinerate/mapping/OnLineRateMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.device.common.mapper.onlinerate.OnLineRateMapper">
-    <select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlinerateVO">
+    <select id="getOnlineRateByDevIds" resultType="com.njcn.device.pq.pojo.vo.RStatOnlineRateVO">
         select
         dev_index,
         sum(online_min) as onlineMin,

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/controller/OnLineRateController.java

@@ -9,7 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.device.service.OnLineRateService;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.pq.pojo.vo.common.DeviceOnlineRate;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -48,9 +48,9 @@ public class OnLineRateController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getOnlineRateByDevIds")
     @ApiOperation("通用终端在线率(冀北)")
-    public HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam deviceInfoParam) {
+    public HttpResult<List<RStatOnlineRateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam deviceInfoParam) {
         String methodDescribe = getMethodDescribe("deviceOnlineRateInfo");
-        List<RStatOnlinerateVO> rate = onLineRateService.getOnlineRateByDevIds(deviceInfoParam);
+        List<RStatOnlineRateVO> rate = onLineRateService.getOnlineRateByDevIds(deviceInfoParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rate, methodDescribe);
     }
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/OnLineRateService.java

@@ -3,7 +3,7 @@ package com.njcn.device.device.service;
 
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.pq.pojo.vo.common.DeviceOnlineRate;
 
 import java.util.List;
@@ -31,5 +31,5 @@ public interface OnLineRateService {
      * @param
      * @return
      */
-    List<RStatOnlinerateVO> getOnlineRateByDevIds(OnlineRateParam onlineRateParam);
+    List<RStatOnlineRateVO> getOnlineRateByDevIds(OnlineRateParam onlineRateParam);
 }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/OnLineRateServiceImpl.java

@@ -12,12 +12,13 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
 import com.njcn.device.pq.pojo.vo.DevDetail;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.device.pq.pojo.vo.common.DeviceOnlineRate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,24 +50,24 @@ public class OnLineRateServiceImpl extends ServiceImpl<OnLineRateMapper, RStatOn
             onlineRateParam.setStartTime(param.getSearchBeginTime());
             onlineRateParam.setEndTime(param.getSearchEndTime());
             //获取所有终端在线率
-            List<RStatOnlinerateVO> onlineRateByDev = this.baseMapper.getOnlineRateByDevIds(onlineRateParam);
+            List<RStatOnlineRateVO> onlineRateByDev = this.baseMapper.getOnlineRateByDevIds(onlineRateParam);
 
             //获取所有终端信息
             List<DevDetail> devInfoByIds = deviceService.getDevInfoByIds(deviceIds);
-            rate.setBelowNum(CollUtil.isNotEmpty(onlineRateByDev) ? calculateOnLineRate(onlineRateByDev, 90) : deviceIds.size());
+            rate.setBelowNum(CollUtil.isNotEmpty(onlineRateByDev) ? calculateOnLineRate(onlineRateByDev, 90, deviceIds.size()) : deviceIds.size());
             rate.setTotalOnlineRate(calculateOnLineRate(onlineRateByDev, deviceIds));
             List<DeviceOnlineRate.CitDetail> citDetailList = new ArrayList<>();
             DeviceOnlineRate.CitDetail citDetail;
             DeviceOnlineRate.Detail detail;
             for (GeneralDeviceDTO dto : deviceInfo) {
                 //获取部门终端集合
-                List<RStatOnlinerateVO> citDevOnRate = onlineRateByDev.stream().filter(x -> dto.getDeviceIndexes().contains(x.getDevIndex())).collect(Collectors.toList());
-                Map<String, Float> onlineRateByDevMap = citDevOnRate.stream()
-                        .collect(Collectors.toMap(RStatOnlinerateVO::getDevIndex, RStatOnlinerateVO::getOnlineRate));
+                List<RStatOnlineRateVO> citDevOnRate = onlineRateByDev.stream().filter(x -> dto.getDeviceIndexes().contains(x.getDevIndex())).collect(Collectors.toList());
+                Map<String, BigDecimal> onlineRateByDevMap = citDevOnRate.stream()
+                        .collect(Collectors.toMap(x -> x.getDevIndex(), x -> x.getOnlineRate()));
                 citDetail = new DeviceOnlineRate.CitDetail();
                 citDetail.setCitName(dto.getName());
                 citDetail.setCitTotalNum(dto.getDeviceIndexes().size());
-                citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate) ? calculateOnLineRate(onlineRateByDev, 90) : dto.getDeviceIndexes().size());
+                citDetail.setCitBelowNum(CollUtil.isNotEmpty(citDevOnRate) ? calculateOnLineRate(citDevOnRate, 90, dto.getDeviceIndexes().size()) : dto.getDeviceIndexes().size());
                 citDetail.setCitTotalOnlineRate(calculateOnLineRate(onlineRateByDev, dto.getDeviceIndexes()));
                 List<DeviceOnlineRate.Detail> detailList = new ArrayList<>();
                 List<DevDetail> details = devInfoByIds.stream().filter(x -> dto.getDeviceIndexes().contains(x.getDevIndex())).collect(Collectors.toList());
@@ -82,7 +83,7 @@ public class OnLineRateServiceImpl extends ServiceImpl<OnLineRateMapper, RStatOn
                     detail.setRunFlag(RunFlagEnum.getRunFlagRemarkByStatus(dev.getRunFlag()));
                     detail.setComFlag(dev.getComFlag() == 0 ? "中断" : "正常");
                     detail.setTimeID(dev.getTimeID());
-                    detail.setOnlineRate(onlineRateByDevMap.containsKey(dev.getDevIndex()) ? onlineRateByDevMap.get(dev.getDevIndex()).toString() : "0");
+                    detail.setOnlineRate(onlineRateByDevMap.containsKey(dev.getDevIndex()) ? onlineRateByDevMap.get(dev.getDevIndex()) : BigDecimal.valueOf(0));
                     detailList.add(detail);
                 }
                 citDetail.setDetailList(detailList);
@@ -94,23 +95,23 @@ public class OnLineRateServiceImpl extends ServiceImpl<OnLineRateMapper, RStatOn
     }
 
     @Override
-    public List<RStatOnlinerateVO> getOnlineRateByDevIds(OnlineRateParam onlineRateParam) {
+    public List<RStatOnlineRateVO> getOnlineRateByDevIds(OnlineRateParam onlineRateParam) {
         return this.baseMapper.getOnlineRateByDevIds(onlineRateParam);
     }
 
-    private String calculateOnLineRate(List<RStatOnlinerateVO> onlineRateByDev, List<String> deviceIds) {
-        List<RStatOnlinerateVO> list = onlineRateByDev.stream().filter(x -> deviceIds.contains(x.getDevIndex())).collect(Collectors.toList());
+    private BigDecimal calculateOnLineRate(List<RStatOnlineRateVO> onlineRateByDev, List<String> deviceIds) {
+        List<RStatOnlineRateVO> list = onlineRateByDev.stream().filter(x -> deviceIds.contains(x.getDevIndex())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(list)) {
-            BigDecimal onlineMin = BigDecimal.valueOf(list.stream().mapToLong(RStatOnlinerateVO::getOnlineMin).sum());
-            BigDecimal offlineMin = BigDecimal.valueOf(list.stream().mapToLong(RStatOnlinerateVO::getOfflineMin).sum());
+            BigDecimal onlineMin = BigDecimal.valueOf(list.stream().mapToLong(RStatOnlineRateVO::getOnlineMin).sum());
+            BigDecimal offlineMin = BigDecimal.valueOf(list.stream().mapToLong(RStatOnlineRateVO::getOfflineMin).sum());
             BigDecimal sumMin = onlineMin.add(offlineMin);
-            return onlineMin.divide(sumMin, 2).toString();
+            return onlineMin.multiply(BigDecimal.valueOf(100.0)).divide(sumMin, 2, RoundingMode.HALF_UP);
         }
-        return "0";
+        return BigDecimal.valueOf(0);
     }
 
-    private Integer calculateOnLineRate(List<RStatOnlinerateVO> onlineRateByDev, Integer limit) {
-        return onlineRateByDev.stream().filter(x -> x.getOnlineRate() < limit).collect(Collectors.toList()).size();
+    private Integer calculateOnLineRate(List<RStatOnlineRateVO> onlineRateByDev, Integer limit, Integer count) {
+        return count - onlineRateByDev.stream().filter(x -> x.getOnlineRate().doubleValue() >= limit).collect(Collectors.toList()).size();
     }
 
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OnlineRateDataServiceImpl.java

@@ -8,7 +8,7 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.harmonic.mapper.OnlineRateDataMapper;
 import com.njcn.harmonic.pojo.dto.PublicDTO;
 import com.njcn.harmonic.pojo.vo.OnlineRateCensusVO;
@@ -143,7 +143,7 @@ public class OnlineRateDataServiceImpl implements OnlineRateDataService {
         param.setIds(deviceIndexes);
         param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
         param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
-        List<RStatOnlinerateVO> data = generalDeviceInfoClient.getOnlineRateByDevIds(param).getData();
+        List<RStatOnlineRateVO> data = generalDeviceInfoClient.getOnlineRateByDevIds(param).getData();
         if (CollUtil.isNotEmpty(data)) {
             data.forEach(po -> {
                 PublicDTO publicDTO = new PublicDTO();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -41,7 +41,7 @@ import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.GridDiagramVO;
 import com.njcn.device.pq.pojo.vo.RStatIntegrityVO;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.event.api.RmpEventDetailFeignClient;
 import com.njcn.event.pojo.dto.EventCount;
 import com.njcn.harmonic.mapper.*;
@@ -1001,11 +1001,11 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         onlineRateParam.setStartTime(startDate);
         onlineRateParam.setEndTime(endDate);
         List<RStatIntegrityVO> integrityVOS = lineFeignClient.getOnIntegrityByIds(onlineRateParam).getData();
-        Map<String, Double> integrityMap = integrityVOS.stream().collect(Collectors.toMap(RStatIntegrityVO::getLineIndex, RStatIntegrityVO::getIntegrityRate));
+        Map<String, BigDecimal> integrityMap = integrityVOS.stream().collect(Collectors.toMap(RStatIntegrityVO::getLineIndex, RStatIntegrityVO::getIntegrityRate));
 
         //获取装置在线率
-        List<RStatOnlinerateVO> onLineRateVOS = generalDeviceInfoClient.getOnlineRateByDevIds(onlineRateParam).getData();
-        Map<String, Float> onlineRateMap = onLineRateVOS.stream().collect(Collectors.toMap(RStatOnlinerateVO::getDevIndex, RStatOnlinerateVO::getOnlineRate));
+        List<RStatOnlineRateVO> onLineRateVOS = generalDeviceInfoClient.getOnlineRateByDevIds(onlineRateParam).getData();
+        Map<String, BigDecimal> onlineRateMap = onLineRateVOS.stream().collect(Collectors.toMap(RStatOnlineRateVO::getDevIndex, RStatOnlineRateVO::getOnlineRate));
 
         List<RMpPollutionDPO> rMpPollutionDPOS = rMpPollutionDPOMapper.selectSumList(lineIdList, param.getIds(), startDate, endDate);
         Map<String, Double> calcMap = new HashMap<>();
@@ -1023,12 +1023,12 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     BeanUtil.copyProperties(eventMap.get(lineId), linePollution);
                     BeanUtil.copyProperties(data, linePollution, true);
                     //监测点在线率
-                    Float vo2 = onlineRateMap.get(data.getDeviceId());
-                    linePollution.setOnlineRate(Objects.isNull(vo2) ? 0.0f : vo2);
+                    BigDecimal vo2 = onlineRateMap.get(data.getDeviceId());
+                    linePollution.setOnlineRate(Objects.isNull(vo2) ? 0.0f : vo2.floatValue());
                     //获取监测点数据完整性
-                    linePollution.setIntegrity(Objects.isNull(integrityMap.get(lineId)) ? 0.0 : integrityMap.get(lineId)>100?100.0:integrityMap.get(lineId));
+                    linePollution.setIntegrity(Objects.isNull(integrityMap.get(lineId)) ? 0.0 : integrityMap.get(lineId).doubleValue()>100?100.0:integrityMap.get(lineId).doubleValue());
                     // 计算谐波的污染值
-                    linePollution.setHarmonicValue(calcMap.containsKey(lineId)?calcMap.get(lineId)>100?100.0:integrityMap.get(lineId):0.0);
+                    linePollution.setHarmonicValue(calcMap.containsKey(lineId)?calcMap.get(lineId)>100?100.0:integrityMap.get(lineId).doubleValue():0.0);
                     linePollution.setInterval(data.getTimeInterval());
                     linePollutionList.add(linePollution);
                 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java

@@ -7,7 +7,7 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.harmonic.mapper.TerminalDataMapper;
 import com.njcn.harmonic.pojo.dto.PublicDTO;
 import com.njcn.harmonic.pojo.vo.TerminalCensusVO;
@@ -211,7 +211,7 @@ public class TerminalServiceImpl implements TerminalService {
         param.setIds(deviceIndexes);
         param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
         param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
-        List<RStatOnlinerateVO> data = generalDeviceInfoClient.getOnlineRateByDevIds(param).getData();
+        List<RStatOnlineRateVO> data = generalDeviceInfoClient.getOnlineRateByDevIds(param).getData();
         if (CollUtil.isNotEmpty(data)) {
             data.forEach(po -> {
                 PublicDTO publicDTO = new PublicDTO();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java

@@ -25,7 +25,7 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.RStatIntegrityD;
 import com.njcn.device.pq.pojo.vo.GridDiagramVO;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlineRateVO;
 import com.njcn.harmonic.mapper.RStatLimitTargetDMapper;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
@@ -103,7 +103,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
             integrityList = lineIntegrityClient.getIntegrityByLineIds(lineIds, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime()).getData();
         }
         //终端在线率
-        List<RStatOnlinerateVO> onlineRateList =new ArrayList<>();
+        List<RStatOnlineRateVO> onlineRateList =new ArrayList<>();
         if(CollUtil.isNotEmpty(devIds)){
             OnlineRateParam param=new OnlineRateParam();
             param.setIds(devIds);
@@ -580,7 +580,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
     }
 
 
-        private void onLineAndIntegrity(List<String> lineIds, List<RStatIntegrityD> onIntegrityByIds, List<String> devIds, List<RStatOnlinerateVO> onlineRateByDevIds,List<RStatLimitTargetVO> limitTargetList, GridDiagramVO.LineData lineData) {
+        private void onLineAndIntegrity(List<String> lineIds, List<RStatIntegrityD> onIntegrityByIds, List<String> devIds, List<RStatOnlineRateVO> onlineRateByDevIds, List<RStatLimitTargetVO> limitTargetList, GridDiagramVO.LineData lineData) {
         //监测完整率
         List<RStatIntegrityD> integrityDS = onIntegrityByIds.stream().filter(x -> lineIds.contains(x.getLineIndex())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(integrityDS)) {
@@ -591,10 +591,10 @@ public class RStatLimitServiceImpl implements RStatLimitService {
             lineData.setIntegrityRate(0.0f);
         }
         //终端在线率
-        List<RStatOnlinerateVO> onlineRateDS = onlineRateByDevIds.stream().filter(x -> devIds.contains(x.getDevIndex())).collect(Collectors.toList());
+        List<RStatOnlineRateVO> onlineRateDS = onlineRateByDevIds.stream().filter(x -> devIds.contains(x.getDevIndex())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(onlineRateDS)) {
-            double onlineTime = onlineRateDS.stream().mapToDouble(RStatOnlinerateVO::getOnlineMin).sum();
-            double offlineTime = onlineRateDS.stream().mapToDouble(RStatOnlinerateVO::getOfflineMin).sum();
+            double onlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOnlineMin).sum();
+            double offlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOfflineMin).sum();
             lineData.setOnLineRate(Math.min(NumberUtil.round(onlineTime * 100.0 / (onlineTime + offlineTime), 2).floatValue(),100));
         } else {
             lineData.setOnLineRate(0.0f);