From e805f40924a8dc6b5235630cac142fe7213ac99c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 5 Jul 2021 15:42:34 +0800
Subject: [PATCH] ......

---
 .../epmetuser/impl/EpmetUserServiceImpl.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 69815ed254..86f97d96e4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -275,15 +275,15 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //NumberFormat numberFormat = NumberFormat.getInstance();
         //numberFormat.setMaximumFractionDigits(NumConstant.ZERO);
         resultList.forEach(re -> {
-            /*String totalTime = "0分钟";
+            String totalTime = "0分钟";
             if (re.getTimeNum() > NumConstant.ZERO) {
                 int hour = re.getTimeNum() / 3600;
                 int minute = re.getTimeNum() % 3600;
                 totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
             }
-            re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);*/
+            re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
             //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
-            re.setTotalTime(re.getTimeNum() / 60 + "分钟");
+            //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
             list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
         });
 
@@ -311,7 +311,14 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         resultList.add(personal1);
         PersonalPatrolListResultDTO personal2 = new PersonalPatrolListResultDTO();
         personal2.setKey("总时长");
-        personal2.setValue(resultDTO.getTimeNum() / 60 + "分钟");
+        //personal2.setValue(resultDTO.getTimeNum() / 60 + "分钟");
+        String totalTime = "0分钟";
+        if (resultDTO.getTimeNum() > NumConstant.ZERO) {
+            int hour = resultDTO.getTimeNum() / 3600;
+            int minute = resultDTO.getTimeNum() % 3600;
+            totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
+        }
+        personal2.setValue(totalTime == "" ? "0分钟" : totalTime);
         resultList.add(personal2);
         PersonalPatrolListResultDTO personal3 = new PersonalPatrolListResultDTO();
         personal3.setKey("事件数");