From 7e038381c3f1d65ba1a88881bb752d21ead72dbe Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 6 Jan 2022 15:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=91=98=E5=B7=A5=E4=BD=9C=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=97=B6=E9=95=BF=E5=8D=95=E4=BD=8D=E6=94=B9?= =?UTF-8?q?=E4=B8=BAh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govorg/result/GridMemberDataAnalysisResultDTO.java | 2 +- .../beans/GridMemberDataAnalysisExcelExportBean.java | 4 ++-- .../dataaggre/service/impl/AggreGridServiceImpl.java | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java index 0bd54027fa..b100635906 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridMemberDataAnalysisResultDTO.java @@ -22,7 +22,7 @@ public class GridMemberDataAnalysisResultDTO { // 巡查 private int patrolTimes; - private int totalTime; + private double totalTime; private int patrolRoutineWorkTimes; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java index c8ce22756f..091c17c4c4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/beans/GridMemberDataAnalysisExcelExportBean.java @@ -47,8 +47,8 @@ public class GridMemberDataAnalysisExcelExportBean { @ExcelProperty(value = {"巡查次数"}) private int patrolTimes; - @ExcelProperty(value = {"巡查时长"}) - private int totalTime; + @ExcelProperty(value = {"巡查时长(小时)"}) + private double totalTime; @ExcelProperty(value = {"例行工作次数"}) private int patrolRoutineWorkTimes; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java index dcf258d270..346a0f9ecf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java @@ -21,6 +21,8 @@ import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -143,7 +145,11 @@ public class AggreGridServiceImpl implements AggreGridService { GridMemberDataAnalysisResultDTO data = gridAndData.get(d.getGridId()); if (data != null) { data.setPatrolTimes(d.getPatrolTimes()); - data.setTotalTime(d.getTotalTime()); + + // 巡查时长，转为h为单位 + double f = ((double)d.getTotalTime()) / 3600; + BigDecimal h = new BigDecimal(f).setScale(2, RoundingMode.HALF_UP); + data.setTotalTime(h.doubleValue()); data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes()); } }