Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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;
 
 }

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为单位
+                        int totalTime = d.getTotalTime();
-                        double f = ((double)d.getTotalTime()) / 3600;
+                        if (totalTime > 0){
-                        BigDecimal h = new BigDecimal(f).setScale(2, RoundingMode.HALF_UP);
+                            int minutes = totalTime / 60;
-                        data.setTotalTime(h.doubleValue());
+                            if (minutes > 0){
-                        data.setPatrolRoutineWorkTimes(d.getPatrolRoutineWorkTimes());
+                                String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分钟";
+                                data.setTotalTime(totalTimeDesc);
+                            }
+                        }
                     }
                 }
             }