Merge branch 'dev_bugfix_ljj' 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/epmetuser/StaffPatrolDetailDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmetuser;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -94,7 +95,7 @@ public class StaffPatrolDetailDTO implements Serializable {
 	private String horizontalaccuracy;
 
     /**
-     * 地址；暂时不用
+     * 地址
      */
 	private String address;
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -226,8 +226,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分";
             dto.setTotalTimeDesc(totalTimeDesc);
             List<StaffPatrolDetailDTO> detailList = details.get(record.getId());
-            detailList =
+            detailList = detailList.stream().sorted(Comparator.comparing(StaffPatrolDetailDTO::getSerialNum).reversed()).collect(Collectors.toList()).stream()
-                    detailList.stream().sorted(Comparator.comparing(StaffPatrolDetailDTO::getSerialNum).reversed()).collect(Collectors.toList()).stream()
                     .filter(item -> null == record.getPatrolEndTime() || record.getPatrolEndTime().compareTo(item.getUploadTime()) > -1).collect(Collectors.toList());
             List<PatrolRecordDetailDTO> recordDetails = detailList.stream().map( detail -> {
                         PatrolRecordDetailDTO detailDTO = new PatrolRecordDetailDTO();
@@ -235,6 +234,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                         detailDTO.setLongitude(detail.getLongitude());
                         detailDTO.setSpeed(detail.getSpeed());
                         detailDTO.setUploadTime(DateUtils.format(detail.getUploadTime(), DateUtils.DATE_TIME_PATTERN));
+                        detailDTO.setAddress(detail.getAddress());
                         return detailDTO;
                     }).collect(Collectors.toList());
             if (("end").equals(record.getStatus())) {