From 58d635f1a510e5317ef840b5edcfa7122f5fc379 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 28 Feb 2024 19:59:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AE=97=E6=B3=95=E5=8D=A0=E6=AF=94=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E7=A8=B3=E6=80=81=E5=90=88=E6=A0=BC=E7=8E=87=E7=AE=97=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0int/int=E5=B0=8F=E6=95=B0=E7=82=B9?= =?UTF-8?q?=E4=BC=9A=E7=9C=81=E7=95=A5=202.=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8D=A0=E6=AF=94=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pojo/vo/ROperatingIndexCommonVO.java | 13 ++++++++++ .../device/pms/pojo/vo/ROperatingIndexVO.java | 9 +++++++ .../impl/RMpDevSolveDetailServiceImpl.java | 26 ++++++++++++++----- .../Impl/line/RMpPassRateDServiceImpl.java | 2 +- .../line/ROperatingMonitorDServiceImpl.java | 2 +- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java index d0aacd7cf..041467ba6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.vo; +import cn.hutool.core.util.NumberUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -85,4 +86,16 @@ public class ROperatingIndexCommonVO { */ @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") private Integer isUnusual; + + public void setDataIntegrityRate(Double dataIntegrityRate) { + this.dataIntegrityRate = NumberUtil.round(dataIntegrityRate*100,2).doubleValue(); + } + + public void setDataRightRate(Double dataRightRate) { + this.dataRightRate = NumberUtil.round(dataRightRate*100,2).doubleValue();; + } + + public void setIndexIntegrityRate(Double indexIntegrityRate) { + this.indexIntegrityRate = NumberUtil.round(indexIntegrityRate*100,2).doubleValue();; + } } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java index 71674390c..357d61f10 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.vo; +import cn.hutool.core.util.NumberUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,6 +67,14 @@ public class ROperatingIndexVO implements Serializable { */ @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)") private Integer isUnusual; + + public void setDataIntegrityRate(Double dataIntegrityRate) { + this.dataIntegrityRate = NumberUtil.round(dataIntegrityRate*100,2).doubleValue();; + } + + public void setIndexIntegrityRate(Double indexIntegrityRate) { + this.indexIntegrityRate = NumberUtil.round(indexIntegrityRate*100,2).doubleValue();; + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java index ddd74c614..570f1b1af 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -59,9 +60,7 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDepSonDetailByDeptId(id).getData(); - /*获取下一级子部门信息*/ -// List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } @@ -95,10 +94,11 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); DecimalFormat df = new DecimalFormat("###.00"); + String time = time(startTime, rMpDevAbnormalManageParam.getType()); terminalListMapByOrgId.forEach((key, terminalListByOrg) -> { RMpDevSolveVO rMpDevSolveVO = new RMpDevSolveVO(); - rMpDevSolveVO.setDataDate(startTime); + rMpDevSolveVO.setDataDate(time); rMpDevSolveVO.setOrgId(key); //单位id rMpDevSolveVO.setOrgName(terminalListByOrg.get(0).getOrgName()); //单位名称 @@ -177,10 +177,11 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); DecimalFormat df = new DecimalFormat("###.00"); + String time = time(startTime, rMpDevAbnormalManageParam.getType()); terminalListMapByManufacture.forEach((key, terminalListByOrg) -> { RMpDevSolveVO rMpDevSolveVO = new RMpDevSolveVO(); - rMpDevSolveVO.setDataDate(startTime); + rMpDevSolveVO.setDataDate(time); rMpDevSolveVO.setManufactureId(key); //厂商id rMpDevSolveVO.setTerminalCount(terminalListByOrg.size()); //终端数量 @@ -247,10 +248,11 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl resultList = new ArrayList<>(); DecimalFormat df = new DecimalFormat("###.00"); + String time = time(startTime, rMpDevAbnormalManageParam.getType()); solveMap.forEach((key, RMpDevSolveDetailList) -> { RMpDevSolveVO rMpDevSolveVO = new RMpDevSolveVO(); - rMpDevSolveVO.setDataDate(startTime); + rMpDevSolveVO.setDataDate(time); rMpDevSolveVO.setBreakDownType(key); //故障类型 rMpDevSolveVO.setTerminalCount(null); //终端数量(故障类型的终端数量前端展示'/') @@ -344,6 +346,18 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl