From c30dd1990319a29d50a1503654c63f0820977439 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 16:06:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridMemberDataAnalysisResultDTO.java | 2 +- .../service/impl/AggreGridServiceImpl.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 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 b100635906..da6758c768 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 double totalTime; + private String totalTime; 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 346a0f9ecf..ba2a0b7a82 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,11 +21,7 @@ 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; @Service public class AggreGridServiceImpl implements AggreGridService { @@ -144,13 +140,17 @@ public class AggreGridServiceImpl implements AggreGridService { if (gridAndData != null) { GridMemberDataAnalysisResultDTO data = gridAndData.get(d.getGridId()); if (data != null) { + data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes()); data.setPatrolTimes(d.getPatrolTimes()); - // 巡查时长，转为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()); + int totalTime = d.getTotalTime(); + if (totalTime > 0){ + int minutes = totalTime / 60; + if (minutes > 0){ + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + data.setTotalTime(totalTimeDesc); + } + } } } } From 89c8b9b64497b1236a660ed6571045efaa7b1f20 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 6 Jan 2022 16:07:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ba2a0b7a82..d0c7b4cfe0 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 @@ -147,7 +147,7 @@ public class AggreGridServiceImpl implements AggreGridService { if (totalTime > 0){ int minutes = totalTime / 60; if (minutes > 0){ - String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分"; + String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分钟"; data.setTotalTime(totalTimeDesc); } }