diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index 6513d27f04..538467d2e1 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -68,18 +68,25 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
                 return chain.filter(exchange);
             }
 
-            //1.添加流水号
             ServerHttpRequest request = exchange.getRequest();
-            List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
-            if (CollectionUtils.isEmpty(tranSerials) || StringUtils.isBlank(tranSerials.get(0))) {
-                request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()});
+
+            //0.添加流水号
+            String tranSerial = getTranserialFromRequestHeader(request);
+            if (StringUtils.isBlank(tranSerial)) {
+                tranSerial = generateTransactionSerial();
+                // 设置当前线程名
+                request.mutate().header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{tranSerial});
             }
+            Thread.currentThread().setName(tranSerial);
+
+            //1.打印请求信息
+            logRequest(request);
 
             //2.获取请求路径，参数
             String requestUri = request.getPath().pathWithinApplication().value();
             MultiValueMap<String, String> queryParams = request.getQueryParams();
             String queryParamsStr = convertQueryParams2String(queryParams);
-            logger.info("CpAuthGatewayFilterFactory当前requestUri=[" + requestUri.concat(queryParamsStr) + "],CpAuthGatewayFilterFactory拦截成功,客户端Id:{}", IpUtils.getClientIp(request));
+            logger.info("当前requestUri=[" + requestUri.concat(queryParamsStr) + "],客户端Id:{}", IpUtils.getClientIp(request));
 
             //3.认证
             String authType = getAuthType(request);
@@ -109,6 +116,36 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
         };
     }
 
+    /**
+     * @Description 打印请求头
+      * @param  request 请求
+     * @return  void
+     * @author wxz
+     * @date 2021.08.18 11:18:00
+     */
+    private void logRequest(ServerHttpRequest request) {
+        HttpHeaders headers = request.getHeaders();
+        StringBuilder sb = new StringBuilder("请求头：");
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            String headerKey = entry.getKey();
+            List<String> headerValue = entry.getValue();
+            sb.append(headerKey).append(":").append(headerValue).append(",");
+        }
+        logger.info(sb.toString());
+    }
+
+    /**
+     * @Description 从request请求头中获取传递过来的流水号
+      * @param request
+     * @return  java.lang.String
+     * @author wxz
+     * @date 2021.08.18 15:55:30
+     */
+    private String getTranserialFromRequestHeader(ServerHttpRequest request) {
+        List<String> tranSerials = request.getHeaders().get(AppClientConstant.TRANSACTION_SERIAL_KEY);
+        return CollectionUtils.isEmpty(tranSerials) ? null : tranSerials.get(0);
+    }
+
     /**
      * @return
      * @Description 将url参数转化为String
@@ -181,23 +218,12 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
         return AuthTypeConstant.AUTH_TYPE_INTERNAL;
     }
 
-    /**
-     * 获取请求头
-     *
-     * @param request
-     * @return
-     */
-    private String getHeader(ServerHttpRequest request, String headerName) {
-        HttpHeaders headers = request.getHeaders();
-        return headers.getFirst(headerName);
-    }
-
     /**
      * 获取事务流水号
      *
      * @return
      */
-    public static String getTransactionSerial() {
+    public static String generateTransactionSerial() {
         String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
                 , "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"};
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
index 8a8e51887b..06a31e07bc 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
@@ -62,4 +62,7 @@ public class GridManagerUserListResultDTO implements Serializable {
     @JsonIgnore
     private Boolean llStatus;
 
+    @JsonIgnore
+    private String recordId;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
index a476cfd3a5..7ab70be6bf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
@@ -44,6 +44,16 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
      */
     List<GridManagerUserListResultDTO> selectLL(@Param("userIds")List<String> userIds);
 
+    List<GridManagerUserListResultDTO> selectPatrolRecord(@Param("userIds")List<String> userIds);
+
+    /**
+     * @Description  按照巡查记录查询经纬度
+     * @Param recordIds
+     * @author zxc
+     * @date 2021/8/18 5:16 下午
+     */
+    List<GridManagerUserListResultDTO> selectPatrolLL(@Param("recordIds")List<String> recordIds);
+
     /**
      * @Description  巡查记录查询
      * @Param formDTO
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 5e3fd465ec..7d6aa5e196 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -411,10 +411,21 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (CollectionUtils.isEmpty(userIds)){
 			return result;
 		}
-		// 经纬度查询
-		List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
-		if (!CollectionUtils.isEmpty(llResult)){
-			result.setLl(llResult);
+		// 查询记录
+//		List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
+		List<GridManagerUserListResultDTO> recordList = baseDao.selectPatrolRecord(userIds);
+		if (!CollectionUtils.isEmpty(recordList)){
+			// 查询经纬度
+			List<GridManagerUserListResultDTO> llList = baseDao.selectPatrolLL(recordList.stream().map(m -> m.getRecordId()).collect(Collectors.toList()));
+			recordList.forEach(r -> {
+				llList.forEach(l -> {
+					if (r.getRecordId().equals(l.getRecordId())){
+						r.setLatitude(l.getLatitude());
+						r.setLongitude(l.getLongitude());
+					}
+				});
+			});
+			result.setLl(recordList);
 		}
 		// 姓名查询
 		List<UserNameResultDTO> nameResult = customerStaffDao.selectUserName(userIds);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
index 7e86005b82..27fc5211ec 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml
@@ -46,4 +46,33 @@
         ORDER BY CREATED_TIME DESC
     </select>
 
+    <select id="selectPatrolRecord" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
+        SELECT t.* FROM (SELECT
+            pr.ID AS recordId,
+            pr.GRID AS gridId,
+            pr.STAFF_ID,
+            pr.`STATUS`
+        FROM staff_patrol_record pr
+        WHERE pr.DEL_FLAG = 0
+            AND pr.staff_id IN (
+                <foreach collection="userIds" item="userId" separator=",">
+                    #{userId}
+                </foreach>
+            )
+        ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
+    </select>
+
+    <!-- 按照巡查记录查询经纬度 -->
+    <select id="selectPatrolLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
+        SELECT
+            t.*
+        FROM
+            ( SELECT DISTINCT ID, SERIAL_NUM, LATITUDE, LONGITUDE, STAFF_PATROL_REC_ID AS recordId FROM staff_patrol_detail WHERE DEL_FLAG = 0 AND STAFF_PATROL_REC_ID IN (
+                <foreach collection="recordIds" item="recordId" separator=",">
+                    #{recordId}
+                </foreach>
+                ) ORDER BY SERIAL_NUM DESC ) t
+        GROUP BY recordId
+    </select>
+
 </mapper>
\ No newline at end of file