From 11a9c209c4dac899e63a26274f79a4855d35fe5c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 Mar 2020 12:40:51 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81Review=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CustomerGridController.java    |  4 +-
 .../java/com/epmet/dao/CustomerGridDao.java   |  2 +-
 .../epmet/service/CustomerGridService.java    |  4 +-
 .../service/impl/CustomerGridServiceImpl.java |  6 +-
 .../main/resources/mapper/CustomerGridDao.xml |  2 +-
 .../constant/StrangerResiGuideConstant.java   | 25 +++++
 .../StrangerResiGuideController.java          |  4 +-
 .../com/epmet/feign/EpmetUserFeignClient.java |  4 +-
 .../EpmetUserFeignClientFallBack.java         |  4 +-
 .../service/StrangerAccessRecordService.java  |  7 +-
 .../impl/StrangerAccessRecordServiceImpl.java | 94 ++++++++++---------
 .../epmet/constant/GridVisitedConstant.java   | 29 ++++++
 .../controller/GridVisitedController.java     | 21 +++--
 .../java/com/epmet/dao/GridVisitedDao.java    |  2 +-
 .../com/epmet/feign/GovOrgFeignClient.java    | 14 +--
 .../fallback/GovOrgFeignClientFallBack.java   |  8 +-
 .../com/epmet/service/GridLatestService.java  |  2 +-
 .../com/epmet/service/GridVisitedService.java | 18 +---
 .../service/impl/GridLatestServiceImpl.java   | 40 ++++----
 .../service/impl/GridVisitedServiceImpl.java  | 83 +++++++++-------
 .../main/resources/mapper/GridVisitedDao.xml  |  2 +-
 21 files changed, 222 insertions(+), 153 deletions(-)
 create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index fec741f5e4..34e26e1be7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -102,8 +102,8 @@ public class CustomerGridController {
      * @throws Exception
      */
     @PostMapping("getcustomergridbygridid")
-    public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO formDTO) {
-        return customerGridService.getCustomerGridByGridId(formDTO);
+    public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO) {
+        return customerGridService.getCustomerGridByGridId(customerGridFormDTO);
     }
     /**
      * @Description 陌生人导览模块调用 根据陌生揽客传入的地区码进行分页查询显示
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 41951995ff..143810f40b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -68,5 +68,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<CustomerGridForStrangerResultDTO> selectRestGridWithoutGivenAreaCode(Map<String,Object> paramsMap);
 
-    CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO formDTO);
+    CustomerGridDTO selectCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index ceb317d455..0840522faa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -108,9 +108,9 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
     Result<List<CustomerGridForStrangerResultDTO>> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO);
 
     /** 根据网格Id查询用户数据
-     * @param formDTO
+     * @param customerGridFormDTO
      * @return
      * @date 2020-03-17
      */
-    Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO);
+    Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index d94eb029cf..94774d1030 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -147,8 +147,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     @Override
-    public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
-        return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(formDTO));
-    }
+    public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) {
+        return new Result<CustomerGridDTO>().ok(baseDao.selectCustomerGridByGridId(customerGridFormDTO));
+}
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 6350399a83..207420bbaa 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -38,7 +38,7 @@
             customer_id,
             CONVERT ( grid_name USING gbk ) ASC
     </select>
-    <select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
+    <select id="selectCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
             resultType="com.epmet.dto.CustomerGridDTO">
         SELECT
             gr.id,
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java
new file mode 100644
index 0000000000..6d84665655
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface StrangerResiGuideConstant {
+    /**
+     * 参数异常
+     */
+    String PARAMETER_EXCEPTION = "参数异常，app端不是指定的居民端，请检查token信息！";
+    /**
+     * 服务调用异常
+     */
+    String EPMET_USER_EXCEPTION = "调用epmet-user服务保存网格记录表数据失败！";
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
index 5f97343835..7c3b78194f 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
@@ -54,8 +54,8 @@ public class StrangerResiGuideController {
 	 * @Date 2020/3/16
 	 **/
 	@PostMapping("getgridhome")
-	public Result<HomeDesignByCustomerResultDTO> getValidCustomerList( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO formDTO) throws Exception {
-		return strangerAccessRecordService.getgridhome(tokenDTO, formDTO);
+	public Result<HomeDesignByCustomerResultDTO> getGridHome( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO strangerFormDTO) throws Exception {
+		return strangerAccessRecordService.getGridHome(tokenDTO, strangerFormDTO);
 	}
 
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 0268ea99ec..31582eecd3 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -19,8 +19,8 @@ public interface EpmetUserFeignClient {
 	 * @param
 	 * @Description
 	 **/
-	@PostMapping("/epmetuser/gridvisited/savelatestandvisited")
-	Result saveLatestAndVisited(VisitedFormDTO formDTO);
+	@PostMapping("/epmetuser/gridvisited/savevisitedrecord")
+	Result saveVisitedRecord(VisitedFormDTO formDTO);
 
 
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 60688ad717..06b6ed803a 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -16,8 +16,8 @@ import org.springframework.stereotype.Component;
 public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 
 	@Override
-	public Result saveLatestAndVisited(VisitedFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveLatestAndVisited",formDTO);
+	public Result saveVisitedRecord(VisitedFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "savevisitedrecord",formDTO);
 	}
 
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
index 88c1d1d37d..b2d42505b3 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
@@ -25,6 +25,7 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
 
     /**
      * 查询陌生人访问记录
+     *
      * @param params
      * @return PageData<StrangerAccessRecordDTO>
      * @author yangshaoping
@@ -41,6 +42,7 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
      * @date 2020-03-19
      */
     PageData<StrangerAccessRecordDTO> page(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -92,9 +94,9 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
     void delete(String[] ids);
 
     /**
+     * @return Result<List < CustomerGridForStrangerResultDTO>>
      * @Description 陌生人根据地区编码查询附近网格数据接口定义
      * @Param CustomerGridListFormDTO
-     * @return Result<List<CustomerGridForStrangerResultDTO>>
      * @Author wangc
      * @Date 2020.03.19 14:28
      **/
@@ -102,9 +104,10 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
 
     /**
      * 居民端-网格链接获取客户首页配置
+     *
      * @param
      * @return void
      * @author sun
      */
-    Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception;
+    Result<HomeDesignByCustomerResultDTO> getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO);
 }
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index 06975cc16d..15d79aed99 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -1,13 +1,17 @@
 package com.epmet.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.StrangerResiGuideConstant;
 import com.epmet.dao.StrangerAccessRecordDao;
 import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.dto.form.*;
@@ -18,17 +22,15 @@ import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.service.StrangerAccessRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.commons.tools.page.PageData;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @Description 陌生人记录访问表
  * @ClassName ResiGuideServiceImpl
@@ -37,6 +39,8 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAccessRecordDao, StrangerAccessRecordEntity> implements StrangerAccessRecordService {
+
+    private static final Logger log = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class);
     @Autowired
     private StrangerAccessRecordDao strangerAccessRecordDao;
     @Autowired
@@ -45,8 +49,10 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private OperCustomizeFeignClient operCustomizeFeignClient;
+
     /**
      * 查询陌生人访问记录
+     *
      * @param params
      * @return PageData<StrangerAccessRecordDTO>
      * @author yangshaoping
@@ -56,12 +62,13 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
 
         IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
-                getPage(params, "VISIT_TIME",false),
+                getPage(params, "VISIT_TIME", false),
                 getWrapper(params)
         );
 
-        return getPageData(page,StrangerAccessRecordDTO.class);
+        return getPageData(page, StrangerAccessRecordDTO.class);
     }
+
     @Override
     public PageData<StrangerAccessRecordDTO> page(Map<String, Object> params) {
         IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
@@ -81,20 +88,21 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     /**
      * sql语句条件查询拼接
      * 陌生人访客记录，逻辑删除标识为0，访问时间为当前三天，按照访问时间降序排列
+     *
      * @param params
      * @return QueryWrapper<StrangerAccessRecordEntity>
      * @author
      * @date
      */
-    private QueryWrapper<StrangerAccessRecordEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<StrangerAccessRecordEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<StrangerAccessRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         Calendar before3daysDate = Calendar.getInstance();
         before3daysDate.setTime(new Date());
-        before3daysDate.add(Calendar.DATE,-3);
-        wrapper.between("VISIT_TIME", before3daysDate.getTime(),new Date());
+        before3daysDate.add(Calendar.DATE, -3);
+        wrapper.between("VISIT_TIME", before3daysDate.getTime(), new Date());
         return wrapper;
     }
 
@@ -127,9 +135,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
 
 
     /**
+     * @return Result<List < CustomerGridForStrangerResultDTO>>
      * @Description 陌生人根据地区编码查询附近网格数据具体实现
      * @Param CustomerGridListFormDTO
-     * @return Result<List<CustomerGridForStrangerResultDTO>>
      * @Author wangc
      * @Date 2020.03.19 14:28
      **/
@@ -148,11 +156,11 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
 
 
         Result<List<CustomerGridForStrangerResultDTO>> queryResult =
-            govOrgFeignClient
-                    .getPageForStrangerGuideInterface(listCustomerGridFormDTO);
+                govOrgFeignClient
+                        .getPageForStrangerGuideInterface(listCustomerGridFormDTO);
 
         //Feign调用成功
-        if(queryResult.success()) {
+        if (queryResult.success()) {
 
             List<CustomerGridForStrangerResultDTO> queryList = queryResult.getData();
             if (null != queryResult && queryList.size() > 0) {
@@ -179,9 +187,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
                 //没有查询出结果
                 return new Result<List<CustomerGridForStrangerResultDTO>>().ok(new ArrayList<>());
             }
-        }else{
+        } else {
             //Feign调用失败
-            return new Result<List<CustomerGridForStrangerResultDTO>>().error(queryResult.getCode(),queryResult.getMsg());
+            return new Result<List<CustomerGridForStrangerResultDTO>>().error(queryResult.getCode(), queryResult.getMsg());
         }
 
 
@@ -189,42 +197,44 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
 
     /**
      * 居民端-网格链接获取客户首页配置
+     *
      * @return void
      * @author sun
      */
     @Override
-    public Result<HomeDesignByCustomerResultDTO> getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception {
+    public Result<HomeDesignByCustomerResultDTO> getGridHome(TokenDto tokenDTO, StrangerFormDTO strangerFormDTO) {
+        //1.先判断参数
+        //居民端 所以参数必须是居民端的参数 否则就是参数错误s
+        /*if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) {
+            return new Result<HomeDesignByCustomerResultDTO>().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
+        }*/
         //token里边有所属端 userId这些参数 前台传递customerID和gridId
-        //1:调用epmet-user服务查询数据 新建网格记录数据
-        VisitedFormDTO vi = new VisitedFormDTO();
-        vi.setGridId(formDTO.getGridId());
-        vi.setCustomerId(formDTO.getCustomerId());
-        vi.setUserId(tokenDTO.getUserId());//token中获取userId
-        epmetUserFeignClient.saveLatestAndVisited(vi);
-
-        //2:调用ope-customize服务 获取首页发布数据
-        Result<HomeDesignByCustomerResultDTO> res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getApp());
-        return res;
-
+        //2:调用epmet-user服务查询数据 新建网格记录数据
+        VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
+        visitedFormDTO.setGridId(strangerFormDTO.getGridId());
+        visitedFormDTO.setCustomerId(strangerFormDTO.getCustomerId());
+        visitedFormDTO.setUserId(tokenDTO.getUserId());//token中获取userId
+        Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
+        if (!re.success()) {
+            log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
+        }
+        //3:调用ope-customize服务 获取首页发布数据
+        Result<HomeDesignByCustomerResultDTO> result = getCustomerHomeData(strangerFormDTO.getCustomerId());
+        return result;
     }
 
     /**
      * 调用oper-customize服务 获取首页发布数据
-     * @param customerId  客户Id
-     * @param clientType  所属端
+     *
+     * @param customerId 客户Id
      * @return
      * @author sun
      */
-    public Result<HomeDesignByCustomerResultDTO> getCustomerHomeData(String customerId,String clientType) throws Exception {
-        CustomerHomeFormDTO dto = new CustomerHomeFormDTO();
-        dto.setCustomerId(customerId);
-        //居民端 所以参数必须是居民端的参数 否则就是参数错误s
-        if (AppClientConstant.APP_RESI.equals(clientType)){//居民端
-            dto.setClientType(NumConstant.ZERO_STR);
-        }else {
-            throw new Exception("参数异常，app端不是指定的居民端，请检查token信息！");
-        }
-        return operCustomizeFeignClient.getHomeReleaseByCustomer(dto);
+    public Result<HomeDesignByCustomerResultDTO> getCustomerHomeData(String customerId) {
+        CustomerHomeFormDTO customerHomeFormDTO = new CustomerHomeFormDTO();
+        customerHomeFormDTO.setCustomerId(customerId);
+        customerHomeFormDTO.setClientType(NumConstant.ZERO_STR);
+        return operCustomizeFeignClient.getHomeReleaseByCustomer(customerHomeFormDTO);
     }
 
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
new file mode 100644
index 0000000000..c21ad1761e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface GridVisitedConstant {
+    /**
+     * 查询异常
+     */
+    String QUERY_EXCEPTION = "查询客户网格表数据失败！";
+    /**
+     * 网格访问记录表新增数据失败
+     */
+    String SAVE_VISITED = "网格访问记录表新增数据失败！";
+    /**
+     * 最近访问网格表新增数据失败
+     */
+    String SAVE_LATEST = "最近访问网格表新增数据失败！";
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
index 1f3d09d73c..140f673d74 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
@@ -46,24 +46,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("gridvisited")
 public class GridVisitedController {
-    
+
     @Autowired
     private GridVisitedService gridVisitedService;
 
     @GetMapping("page")
-    public Result<PageData<GridVisitedDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GridVisitedDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<GridVisitedDTO> page = gridVisitedService.page(params);
         return new Result<PageData<GridVisitedDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<GridVisitedDTO> get(@PathVariable("id") String id){
+    public Result<GridVisitedDTO> get(@PathVariable("id") String id) {
         GridVisitedDTO data = gridVisitedService.get(id);
         return new Result<GridVisitedDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody GridVisitedDTO dto){
+    public Result save(@RequestBody GridVisitedDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         gridVisitedService.save(dto);
@@ -71,7 +71,7 @@ public class GridVisitedController {
     }
 
     @PutMapping
-    public Result update(@RequestBody GridVisitedDTO dto){
+    public Result update(@RequestBody GridVisitedDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         gridVisitedService.update(dto);
@@ -79,7 +79,7 @@ public class GridVisitedController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         gridVisitedService.delete(ids);
@@ -96,11 +96,12 @@ public class GridVisitedController {
      * 网格访问记录表、最近访问网格表新增数据
      * 网格访问记录表新增数据(一天一条)
      * 最近访问表更新访问时间字段
-     * @param formDTO
+     *
+     * @param visitedFormDTO
      */
-    @PostMapping("savelatestandvisited")
-    public void saveLatestAndVisited(@RequestBody VisitedFormDTO formDTO) throws Exception {
-        gridVisitedService.saveLatestAndVisited(formDTO);
+    @PostMapping("savevisitedrecord")
+    public Result saveVisitedRecord(@RequestBody VisitedFormDTO visitedFormDTO) {
+        return gridVisitedService.saveVisitedRecord(visitedFormDTO);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
index b246bdabd5..5f37083bda 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
@@ -33,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
 
-    GridVisitedDTO getGridVisitedByIds(GridVisitedDTO formDTO);
+    GridVisitedDTO selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 5625a3ee76..acbb5833f7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
-	/**
-	 * @param
-	 * @Description 根据客户Id查询客户用户表数据
-	 * @Date 2020/3/17
-	 **/
-	@PostMapping("/gov/org/customergrid/getcustomergridbygridid")
-	Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO);
+    /**
+     * @param
+     * @Description 根据客户Id查询客户用户表数据
+     * @Date 2020/3/17
+     **/
+    @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
+    Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO);
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index c5e04129bf..8b4d87717f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -16,8 +16,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
-	@Override
-	public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",formDTO);
-	}
+    @Override
+    public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId", formDTO);
+    }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
index 138f4c9483..41321a1e1c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
@@ -99,5 +99,5 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * 最近访问网格表新增数据
      * @param formDTO
      */
-    void saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
+    boolean saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
index b324356f94..717edcb011 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
@@ -19,6 +19,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.GridVisitedDTO;
 import com.epmet.dto.form.VisitedFormDTO;
@@ -95,23 +96,8 @@ public interface GridVisitedService extends BaseService<GridVisitedEntity> {
      */
     void delete(String[] ids);
 
-
-
-
-
-
-    /**
-     * 网格访问记录表新增数据
-     * @param formDTO
-     */
-    //void saveGridVisited(GridVisitedDTO formDTO);
-
-
-
-
-
     /**
      * @param formDTO
      */
-    void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception;
+    Result saveVisitedRecord(VisitedFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index ba4dcea6a1..f2f2b98555 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -68,8 +68,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         return ConvertUtils.sourceToTarget(entityList, GridLatestDTO.class);
     }
 
-    private QueryWrapper<GridLatestEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<GridLatestEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<GridLatestEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -106,28 +106,28 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu) {
+    public boolean saveGridLatest(VisitedFormDTO visitedFormDTO, CustomerGridDTO customerGridDTO) {
         Date date = new Date();
-        GridLatestDTO la = new GridLatestDTO();
-        la.setCustomerId(cu.getCustomerId());
-        la.setGridId(cu.getId());
-        //la.setCustomerUserId(formDTO.getUserId());//token传递的值
-        la.setCustomerUserId("1111111111");//token传递的值
-        la.setAreaCode(cu.getAreaCode());
-        la.setPid(cu.getPid());
-        la.setLatestTime(date);
-        la.setUpdatedTime(date);
+        GridLatestDTO gridLatestDTO = new GridLatestDTO();
+        gridLatestDTO.setCustomerId(customerGridDTO.getCustomerId());
+        gridLatestDTO.setGridId(customerGridDTO.getId());
+        gridLatestDTO.setCustomerUserId(visitedFormDTO.getUserId());
+        gridLatestDTO.setAreaCode(customerGridDTO.getAreaCode());
+        gridLatestDTO.setPid(customerGridDTO.getPid());
+        gridLatestDTO.setLatestTime(date);
+        gridLatestDTO.setUpdatedTime(date);
         //查询是否存在历史数据（一个用户对一个网格的访问只记录一条数据）
-        GridLatestEntity dto = baseDao.getGridLatestByIds(la);
+        GridLatestEntity gridLatestEntity = baseDao.getGridLatestByIds(gridLatestDTO);
         GridLatestEntity entity = null;
-        if(dto==null||dto.getId()==null){
-            entity = ConvertUtils.sourceToTarget(la, GridLatestEntity.class);
-            insert(entity);
-        }else{
-            entity = ConvertUtils.sourceToTarget(dto, GridLatestEntity.class);
-            entity.setLatestTime(date);//最近访问时间
+        if (null == gridLatestEntity || null == gridLatestEntity.getId()) {
+            entity = ConvertUtils.sourceToTarget(gridLatestDTO, GridLatestEntity.class);
+            return insert(entity);
+        } else {
+            entity = ConvertUtils.sourceToTarget(gridLatestEntity, GridLatestEntity.class);
+            entity.setLatestTime(date);
+            entity.setUpdatedBy(visitedFormDTO.getUserId());
             entity.setUpdatedTime(date);
-            updateById(entity);
+            return updateById(entity);
         }
 
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
index a3810e7268..bdfab8161f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.GridVisitedConstant;
 import com.epmet.dao.GridVisitedDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridVisitedDTO;
@@ -34,6 +35,8 @@ import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.GridLatestService;
 import com.epmet.service.GridVisitedService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +55,7 @@ import java.util.Map;
 @Service
 public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, GridVisitedEntity> implements GridVisitedService {
 
+    private static final Logger log = LoggerFactory.getLogger(GridVisitedServiceImpl.class);
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
@@ -73,8 +77,8 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
         return ConvertUtils.sourceToTarget(entityList, GridVisitedDTO.class);
     }
 
-    private QueryWrapper<GridVisitedEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<GridVisitedEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<GridVisitedEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -111,63 +115,74 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
 
     /**
      * 网格记录表新增数据
-     *  @author  sun
-     * @param formDTO
+     *
+     * @param visitedFormDTO
      * @throws Exception
+     * @author sun
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception {
+    public Result saveVisitedRecord(VisitedFormDTO visitedFormDTO) {
+        Result result = new Result();
         //1:调用gov-org服务 查询客户网格表数据
         CustomerGridFormDTO dto = new CustomerGridFormDTO();
-        dto.setGridId(formDTO.getGridId());
-        Result<CustomerGridDTO> result = govOrgFeignClient.getCustomerGridByGridId(dto);
-        if(!result.success()){
-            throw new Exception("查询客户网格表数据失败！");
+        dto.setGridId(visitedFormDTO.getGridId());
+        Result<CustomerGridDTO> gridDTO = govOrgFeignClient.getCustomerGridByGridId(dto);
+        if (!gridDTO.success()) {
+            log.warn(GridVisitedConstant.QUERY_EXCEPTION);
+            result.error(GridVisitedConstant.QUERY_EXCEPTION);
         }
-        CustomerGridDTO cu = result.getData();
-
+        CustomerGridDTO customerGridDTO = gridDTO.getData();
         //2:网格访问记录表新增数据
-        saveGridVisited(formDTO,cu);
-
+        if (!saveGridVisited(visitedFormDTO, customerGridDTO)) {
+            log.warn(GridVisitedConstant.SAVE_VISITED);
+            result.error(GridVisitedConstant.SAVE_VISITED);
+        }
         //3：最近访问网格表新增数据
-        gridLatestService.saveGridLatest(formDTO,cu);
-
+        if (!gridLatestService.saveGridLatest(visitedFormDTO, customerGridDTO)) {
+            log.warn(GridVisitedConstant.SAVE_LATEST);
+            result.error(GridVisitedConstant.SAVE_LATEST);
+        }
+        return result;
     }
 
     /**
      * 网格记录表和最近访问网格表新增数据
-     * @param formDTO
-     * @param cu
+     *
+     * @param visitedFormDTO
+     * @param customerGridDTO
      */
-    public void saveGridVisited(VisitedFormDTO formDTO,CustomerGridDTO cu) {
+    private boolean saveGridVisited(VisitedFormDTO visitedFormDTO, CustomerGridDTO customerGridDTO) {
         Date date = new Date();
-        GridVisitedDTO vi = new GridVisitedDTO();
-        vi.setIsRegister(getRegister("0"));//后续再其他服务中获取这个状态值
-        vi.setCustomerId(cu.getCustomerId());
-        vi.setGridId(cu.getId());
-        vi.setCustomerUserId(formDTO.getUserId());
-        vi.setVisitTime(date);
-        vi.setUpdatedTime(date);
+        GridVisitedDTO gridVisitedDTO = new GridVisitedDTO();
+        //TODO:预留方法 根据userId查询用户是否认证（注册）
+        gridVisitedDTO.setIsRegister(getRegisterByUserId(visitedFormDTO.getUserId()));
+        gridVisitedDTO.setCustomerId(customerGridDTO.getCustomerId());
+        gridVisitedDTO.setGridId(customerGridDTO.getId());
+        gridVisitedDTO.setCustomerUserId(visitedFormDTO.getUserId());
+        gridVisitedDTO.setVisitTime(date);
+        gridVisitedDTO.setUpdatedTime(date);
         //查询是否存在历史数据( 一个用户一天对一个网格只存在一条访问记录)
-        GridVisitedDTO dto = baseDao.getGridVisitedByIds(vi);
+        GridVisitedDTO dto = baseDao.selectGridVisitedByGridIdAndUserId(gridVisitedDTO);
         GridVisitedEntity entity = null;
-        if(dto==null||dto.getId()==null){
-            entity = ConvertUtils.sourceToTarget(vi, GridVisitedEntity.class);
-            insert(entity);
-        }else{
+        if (dto == null || dto.getId() == null) {
+            entity = ConvertUtils.sourceToTarget(gridVisitedDTO, GridVisitedEntity.class);
+            return insert(entity);
+        } else {
             entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class);
+            entity.setUpdatedBy(visitedFormDTO.getUserId());
             entity.setUpdatedTime(date);
-            updateById(entity);
+            return updateById(entity);
         }
     }
 
     /**
-     * (预留方法)查询是否注册状态值
-     * @param str
+     * (预留方法)查询是否注册的状态值
+     *
+     * @param userId
      * @return
      */
-    public Integer getRegister(String str){
+    public Integer getRegisterByUserId(String userId) {
         return 0;
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
index 12c9ebcfeb..222aed24ee 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
@@ -18,7 +18,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="getGridVisitedByIds" parameterType="com.epmet.dto.GridVisitedDTO"
+    <select id="selectGridVisitedByGridIdAndUserId" parameterType="com.epmet.dto.GridVisitedDTO"
             resultType="com.epmet.dto.GridVisitedDTO">
         SELECT
             vi.id,

From 73e7898bb79bef0a9d2dfa387779ae5306dbdb37 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 Mar 2020 12:50:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/StrangerAccessRecordServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index 15d79aed99..5c58c1c071 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -205,9 +205,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     public Result<HomeDesignByCustomerResultDTO> getGridHome(TokenDto tokenDTO, StrangerFormDTO strangerFormDTO) {
         //1.先判断参数
         //居民端 所以参数必须是居民端的参数 否则就是参数错误s
-        /*if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) {
+        if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) {
             return new Result<HomeDesignByCustomerResultDTO>().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
-        }*/
+        }
         //token里边有所属端 userId这些参数 前台传递customerID和gridId
         //2:调用epmet-user服务查询数据 新建网格记录数据
         VisitedFormDTO visitedFormDTO = new VisitedFormDTO();

From 207b180398555d5dfb96aec8853cdfae835e8669 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 24 Mar 2020 13:27:39 +0800
Subject: [PATCH 3/7] =?UTF-8?q?resi-guide=E9=99=8C=E7=94=9F=E4=BA=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=99=84=E8=BF=91=E7=BD=91=E6=A0=BC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4,=E5=B0=86=E6=9C=AC=E5=9C=B0=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E7=9A=84redis=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=88=B0=E8=BF=9C=E7=A8=8B=E4=B8=BB=E6=9C=BA10.10.10.?=
 =?UTF-8?q?79:6379?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-admin/epmet-admin-server/pom.xml        |  2 +-
 epmet-auth/pom.xml                            |  2 +-
 epmet-gateway/pom.xml                         |  4 ++--
 .../epmet-activiti-server/pom.xml             |  2 +-
 .../epmet-demo/epmet-demo-server/pom.xml      |  2 +-
 .../epmet-job/epmet-job-server/pom.xml        |  2 +-
 .../epmet-message-server/pom.xml              |  2 +-
 .../epmet-oss/epmet-oss-server/pom.xml        |  2 +-
 epmet-module/gov-org/gov-org-server/pom.xml   |  2 +-
 .../controller/CustomerGridController.java    |  6 +++---
 .../java/com/epmet/dao/CustomerGridDao.java   |  8 --------
 .../epmet/service/CustomerGridService.java    |  2 +-
 .../service/impl/CustomerGridServiceImpl.java |  9 +++++----
 .../java/com/epmet/util/ModuleConstant.java   | 16 ++++++++++++++++
 .../main/resources/mapper/CustomerGridDao.xml | 19 ++-----------------
 .../oper-access/oper-access-server/pom.xml    | 11 ++++++-----
 epmet-module/oper-crm/oper-crm-server/pom.xml |  2 +-
 .../oper-customize-server/pom.xml             |  2 +-
 .../resi-guide/resi-guide-server/pom.xml      |  2 +-
 .../com/epmet/feign/GovOrgFeignClient.java    |  4 ++--
 .../feign/fallback/GovOrgFeignFallBack.java   |  4 ++--
 .../impl/StrangerAccessRecordServiceImpl.java | 14 +++++++-------
 .../java/com/epmet/utils/ModuleConstant.java  |  8 ++++++++
 epmet-user/epmet-user-server/pom.xml          |  2 +-
 24 files changed, 66 insertions(+), 63 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java

diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index fe4e0c2c1f..773ee4729d 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -99,7 +99,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 3e4795a590..3d8c615718 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -123,7 +123,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 8acbdd9bf6..d7e9638269 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -95,9 +95,9 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
+               <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
index 09fe3a2d76..eebb530f54 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
@@ -175,7 +175,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index 94c098a1b6..06fdbd6546 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index a4268477af..207e7d95d2 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index e56877b3fb..195c274f3a 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -135,7 +135,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index b8d7899541..49a297e1f5 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -143,7 +143,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 066e5ecb0f..164cf5387f 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -106,7 +106,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
index fec741f5e4..65aca7f594 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
@@ -112,11 +112,11 @@ public class CustomerGridController {
      * @Author wangc
      * @Date 2020.03.19 15:23
      **/
-    @PostMapping("queryListForStrangerByOrder")
-    public Result<List<CustomerGridForStrangerResultDTO>> queryListForStrangerByOrder(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO ){
+    @PostMapping("querygridlistbyareacode")
+    public Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO ){
 
         ValidatorUtils.validateEntity(listCustomerGridFormDTO);
-        return customerGridService.listGridForStrangerByOrder(listCustomerGridFormDTO);
+        return customerGridService.listGridByAreaCode(listCustomerGridFormDTO);
     }
 
     @GetMapping("getcustomergrid/{id}")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index 41951995ff..2ed4edcdae 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -39,14 +39,6 @@ import java.util.Map;
 public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
 
 
-    /**
-     * @Description 查特定区的网格
-     * @Param areaCode
-     * @return CustomerGridForStrangerResultDTO
-     * @Author wangc
-     * @Date 2020.03.19 15:53
-     **/
-    List<CustomerGridForStrangerResultDTO> selectGridByAreaCode(@Param("areaCode")String areaCode);
 
     /**
      * @Description 查整个城市的网格
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index ceb317d455..4d65c455a3 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -105,7 +105,7 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @author wangc
      * @date 2020-03-16
      * */
-    Result<List<CustomerGridForStrangerResultDTO>> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO);
+    Result<List<CustomerGridForStrangerResultDTO>> listGridByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO);
 
     /** 根据网格Id查询用户数据
      * @param formDTO
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index d94eb029cf..cd6805cdd9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -33,6 +33,7 @@ import com.epmet.entity.CustomerGridEntity;
 
 import com.epmet.redis.CustomerGridRedis;
 import com.epmet.service.CustomerGridService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -108,7 +109,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     @Override
-    public Result<List<CustomerGridForStrangerResultDTO>> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+    public Result<List<CustomerGridForStrangerResultDTO>> listGridByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO) {
 
         Result<List<CustomerGridForStrangerResultDTO>> result = new Result<>();
 
@@ -116,17 +117,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         String areaCode = listCustomerGridFormDTO.getAreaCode();
         listCustomerGridFormDTO.setPageNo((listCustomerGridFormDTO.getPageNo() - 1) * listCustomerGridFormDTO.getPageSize());
 
-        if(areaCode.endsWith("00")){
+        if(areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)){
            //城市 - 查全部
             listCustomerGridFormDTO.setAreaCode(areaCode.substring(0,areaCode.length()-2));
             List<CustomerGridForStrangerResultDTO> gridList
                     = baseDao.selectGridByCityLike(listCustomerGridFormDTO);
 
             result.setData(gridList);
-            result.setCode(0);
+            result.setCode(ModuleConstant.SUCCESS_CODE_RESULT);
             return result;
         }else{
-           //行政区
+           //行政区 - 指定行政区在前，所属城市下其余行政区在后
 
             Map<String,Object> map = new HashMap<>();
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java
new file mode 100644
index 0000000000..2ec505ac11
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java
@@ -0,0 +1,16 @@
+package com.epmet.util;/**
+ * Created by 11 on 2020/3/23.
+ */
+
+/**
+ * @Description
+ * @IntefaceName ModuleConstant
+ * @Author wangc
+ * @date 2020.03.23 18:34
+ */
+public interface ModuleConstant {
+
+    String LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE = "00";
+
+    int SUCCESS_CODE_RESULT = 0;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 6350399a83..a9722bf3a4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -22,22 +22,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <!-- 根据区县地区码匹配到当前区县下所有网格 -->
-    <select id="selectGridByAreaCode" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
-         SELECT
-            id AS grid_id,
-            customer_id,
-            grid_name
-        FROM
-            CUSTOMER_GRID
-        WHERE
-            del_flag = 0
-        AND
-            area_code = #{areaCode}
-        ORDER BY
-            customer_id,
-            CONVERT ( grid_name USING gbk ) ASC
-    </select>
+
     <select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
             resultType="com.epmet.dto.CustomerGridDTO">
         SELECT
@@ -80,7 +65,7 @@
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
-    <!-- 根据区县地区码匹配到该地区置顶其余区域在后这种特定排序的数据集 -->
+    <!-- 根据区县地区码匹配到特定排序的网格数据集 -->
     <select id="selectRestGridWithoutGivenAreaCode" parameterType="map" resultType="com.epmet.dto.result.CustomerGridForStrangerResultDTO">
 
 
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index 18362708dc..f99583619f 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -95,10 +95,10 @@
             <id>dev</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>8093</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
+        </activation>
+        <properties>
+            <server.port>8093</server.port>
+            <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
@@ -108,7 +108,8 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <!--<spring.redis.host>127.0.0.1</spring.redis.host>-->
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 39feec80f4..a7d55f5520 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -107,7 +107,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 96ef6bb929..acd7a063cb 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -101,7 +101,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index f5959bc1c1..4cf1999e78 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -119,7 +119,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index c6721d4c14..cf5dc8344a 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -29,8 +29,8 @@ public interface GovOrgFeignClient {
      * @Param pageNo   当前页
      * @Param pageSize 每页数据量
      * */
-    @PostMapping("/gov/org/customergrid/queryListForStrangerByOrder")
-    Result<List<CustomerGridForStrangerResultDTO>> getPageForStrangerGuideInterface(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
+    @PostMapping("/gov/org/customergrid/querygridlistbyareacode")
+    Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
 
 
 
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
index 0554f8be50..f616ede85c 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
@@ -26,7 +26,7 @@ public class GovOrgFeignFallBack implements GovOrgFeignClient {
      * @return Result<List<CustomerGridForStrangerResultDTO>>
      * */
     @Override
-    public Result<List<CustomerGridForStrangerResultDTO>> getPageForStrangerGuideInterface(ListCustomerGridFormDTO listCustomerGridFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",listCustomerGridFormDTO);
+    public Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryGridListByAreaCode",listCustomerGridFormDTO);
     }
 }
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index 06975cc16d..785815453c 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -18,6 +18,7 @@ import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.service.StrangerAccessRecordService;
+import com.epmet.utils.ModuleConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,6 +56,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
     @Override
     public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
 
+        //当前陌生人访客记录查询只能查询最近三天，无法查询三天以外的数据，需要完善功能
         IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
                 getPage(params, "VISIT_TIME",false),
                 getWrapper(params)
@@ -139,17 +141,17 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
 
 
         ListCustomerGridFormDTO listCustomerGridFormDTO = new ListCustomerGridFormDTO();
-        listCustomerGridFormDTO.setAreaCode(0 == customerGridListFormDTO.getIsAuthorized() ?
+        listCustomerGridFormDTO.setAreaCode(ModuleConstant.NOT_POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized() ?
                 customerGridListFormDTO.getSelectedAreaCode() : customerGridListFormDTO.getAreaCode());
 
-        listCustomerGridFormDTO.setPageNo(null == customerGridListFormDTO.getPageNo() ? 1 : customerGridListFormDTO.getPageNo());
+        listCustomerGridFormDTO.setPageNo(null == customerGridListFormDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : customerGridListFormDTO.getPageNo());
 
         listCustomerGridFormDTO.setPageSize(customerGridListFormDTO.getPageSize());
 
 
         Result<List<CustomerGridForStrangerResultDTO>> queryResult =
             govOrgFeignClient
-                    .getPageForStrangerGuideInterface(listCustomerGridFormDTO);
+                    .queryGridListByAreaCode(listCustomerGridFormDTO);
 
         //Feign调用成功
         if(queryResult.success()) {
@@ -158,13 +160,11 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
             if (null != queryResult && queryList.size() > 0) {
                 StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
                 //未授权，手动选择
-                if (0 == customerGridListFormDTO.getIsAuthorized()) {
+                if (ModuleConstant.NOT_POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized()) {
                     strangerTrance.setSelectedAreaCode(customerGridListFormDTO.getSelectedAreaCode());
-                    strangerTrance.setLocationAreaCode("");
-                } else if (1 == customerGridListFormDTO.getIsAuthorized()) {
+                } else if (ModuleConstant.POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized()) {
                     //已授权，自动选择
                     strangerTrance.setLocationAreaCode(customerGridListFormDTO.getAreaCode());
-                    strangerTrance.setSelectedAreaCode("");
                 }
                 strangerTrance.setIsAuthorized(customerGridListFormDTO.getIsAuthorized());
                 strangerTrance.setGridNumber(queryList.size());
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
index d9f96aa25d..3c83277662 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -18,4 +18,12 @@ import com.epmet.commons.tools.constant.Constant;
  */
 public interface ModuleConstant extends Constant {
 
+    //位置未授权
+    int NOT_POSITION_AUTHORIZED = 0;
+
+    //位置授权
+    int POSITION_AUTHORIZED = 1;
+
+    //当前页最小值
+    int MIN_CURRENT_PAGE_NO = 1;
 }
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index fbca8c6fdb..f1f3a8cda1 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.79</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

From c4cd37bca863905ea7cb55e58a8b86af6e25cabc Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 24 Mar 2020 13:29:19 +0800
Subject: [PATCH 4/7] =?UTF-8?q?oper-access=E7=9A=84pom.xml=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BD=99=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/oper-access/oper-access-server/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index f99583619f..21efec9f84 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -109,7 +109,6 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>10.10.10.79</spring.redis.host>
-                <!--<spring.redis.host>127.0.0.1</spring.redis.host>-->
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->

From 65dea28661f12a7d2ba067aba3a137b82b3bc7c9 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 Mar 2020 14:00:57 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/GridLatestDao.java |  3 ++-
 .../main/java/com/epmet/dao/GridVisitedDao.java    |  1 +
 .../epmet/service/impl/GridLatestServiceImpl.java  | 14 +++++++-------
 .../epmet/service/impl/GridVisitedServiceImpl.java |  9 +++++----
 .../src/main/resources/mapper/GridLatestDao.xml    | 12 ++++++++++--
 .../src/main/resources/mapper/GridVisitedDao.xml   |  7 +++++++
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
index 52af37226a..3960d5edbe 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
@@ -31,5 +31,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GridLatestDao extends BaseDao<GridLatestEntity> {
 
-    GridLatestEntity getGridLatestByIds(GridLatestDTO formDTO);
+    GridLatestDTO selectGridLatestByGridAndUserId(GridLatestDTO formDTO);
+    int updateByLatestId(GridLatestDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
index 5f37083bda..efa4fb8189 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
@@ -34,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
 
     GridVisitedDTO selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
+    int updateByVisitedId(GridVisitedDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index f2f2b98555..d5a28ea5fe 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -51,6 +51,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
 
     @Autowired
     private GridLatestRedis gridLatestRedis;
+    @Autowired
+    private GridLatestDao gridLatestDao;
 
     @Override
     public PageData<GridLatestDTO> page(Map<String, Object> params) {
@@ -117,17 +119,15 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         gridLatestDTO.setLatestTime(date);
         gridLatestDTO.setUpdatedTime(date);
         //查询是否存在历史数据（一个用户对一个网格的访问只记录一条数据）
-        GridLatestEntity gridLatestEntity = baseDao.getGridLatestByIds(gridLatestDTO);
+        GridLatestDTO dto = baseDao.selectGridLatestByGridAndUserId(gridLatestDTO);
         GridLatestEntity entity = null;
-        if (null == gridLatestEntity || null == gridLatestEntity.getId()) {
+        if (null == dto || null == dto.getId()) {
             entity = ConvertUtils.sourceToTarget(gridLatestDTO, GridLatestEntity.class);
             return insert(entity);
         } else {
-            entity = ConvertUtils.sourceToTarget(gridLatestEntity, GridLatestEntity.class);
-            entity.setLatestTime(date);
-            entity.setUpdatedBy(visitedFormDTO.getUserId());
-            entity.setUpdatedTime(date);
-            return updateById(entity);
+            dto.setUpdatedBy(visitedFormDTO.getUserId());
+            dto.setUpdatedTime(date);
+            return BaseServiceImpl.retBool(gridLatestDao.updateByLatestId(dto));
         }
 
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
index bdfab8161f..58aeea85cf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
@@ -60,6 +60,8 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
     private GridLatestService gridLatestService;
+    @Autowired
+    private GridVisitedDao gridVisitedDao;
 
     @Override
     public PageData<GridVisitedDTO> page(Map<String, Object> params) {
@@ -169,10 +171,9 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
             entity = ConvertUtils.sourceToTarget(gridVisitedDTO, GridVisitedEntity.class);
             return insert(entity);
         } else {
-            entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class);
-            entity.setUpdatedBy(visitedFormDTO.getUserId());
-            entity.setUpdatedTime(date);
-            return updateById(entity);
+            dto.setUpdatedBy(visitedFormDTO.getUserId());
+            dto.setUpdatedTime(date);
+            return BaseServiceImpl.retBool(gridVisitedDao.updateByVisitedId(dto));
         }
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index ed9eaa6398..11333747e8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -19,8 +19,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="getGridLatestByIds" parameterType="com.epmet.dto.GridLatestDTO"
-            resultType="com.epmet.entity.GridLatestEntity">
+    <select id="selectGridLatestByGridAndUserId" parameterType="com.epmet.dto.GridLatestDTO"
+            resultType="com.epmet.dto.GridLatestDTO">
         SELECT
             la.id,
             la.customer_id,
@@ -49,4 +49,12 @@
         </if>
     </select>
 
+    <update id="updateByLatestId">
+        UPDATE grid_latest
+        SET latest_time = #{latestTime},
+            updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
index 222aed24ee..8eb0c72a93 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
@@ -50,4 +50,11 @@
         </if>
     </select>
 
+    <update id="updateByVisitedId">
+        UPDATE grid_visited
+        SET updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id}
+    </update>
+
 </mapper>
\ No newline at end of file

From 4276d44c1994651fc0d43febe12156284903dc37 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 24 Mar 2020 17:36:30 +0800
Subject: [PATCH 6/7] =?UTF-8?q?FeignClient=E5=8E=BB=E6=8E=89url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/EpmetUserFeignClient.java    | 2 +-
 .../src/main/java/com/epmet/feign/GovOrgFeignClient.java       | 2 +-
 .../epmet/service/impl/StrangerAccessRecordServiceImpl.java    | 3 ++-
 .../src/main/java/com/epmet/feign/OperRoleUserFeignClient.java | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 434c1124c4..406ed01e48 100644
--- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @Author yinzuomei
  * @Date 2020/3/16 14:48
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class )
 public interface EpmetUserFeignClient {
 
 	/**
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index cf5dc8344a..41f1a26efe 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -20,7 +20,7 @@ import java.util.List;
  * @Author wangc
  * @date 2020.03.17 14:29
  */
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class )
 public interface GovOrgFeignClient {
 
     /**
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index b33c0dba05..148394dad2 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -22,10 +22,10 @@ import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.service.StrangerAccessRecordService;
-import com.epmet.utils.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.epmet.utils.ModuleConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +53,7 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
 
     /**
      * 查询陌生人访问记录
+     *
      * @param params
      * @return PageData<StrangerAccessRecordDTO>
      * @author yangshaoping
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
index a81e182f73..6cb0e54197 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @dscription
  * @date 2020/3/20 17:19
  */
-@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class )
 public interface OperRoleUserFeignClient {
 
 	/**

From 12f23a770b009524d1c1812a07881c61d9b02207 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 24 Mar 2020 18:08:16 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E5=A2=9Eresi-mine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                         |   4 +
 .../src/main/resources/bootstrap.yml          |  11 ++
 epmet-module/pom.xml                          |   1 +
 epmet-module/resi-mine/pom.xml                |  21 +++
 .../resi-mine/resi-mine-client/pom.xml        |  35 ++++
 .../com/epmet/resi/mine/dto/form/.gitkeep     |   0
 .../com/epmet/resi/mine/dto/result/.gitkeep   |   0
 .../resi-mine/resi-mine-server/pom.xml        | 154 +++++++++++++++++
 .../java/com/epmet/ResiMineApplication.java   |  31 ++++
 .../com/epmet/config/ModuleConfigImpl.java    |  26 +++
 .../java/com/epmet/config/SwaggerConfig.java  |  68 ++++++++
 .../controller/ResiMineGridController.java    |  35 ++++
 .../src/main/java/com/epmet/dao/.gitkeep      |   0
 .../src/main/java/com/epmet/entity/.gitkeep   |   0
 .../src/main/java/com/epmet/excel/.gitkeep    |   0
 .../com/epmet/exception/ModuleErrorCode.java  |  25 +++
 .../com/epmet/feign/EpmetUserFeignClient.java |  27 +++
 .../EpmetUserFeignClientFallBack.java         |  29 ++++
 .../epmet/service/ResiMineGridService.java    |  21 +++
 .../service/impl/ResiMineGridServiceImpl.java |  42 +++++
 .../java/com/epmet/utils/ModuleConstant.java  |  30 ++++
 .../src/main/resources/bootstrap.yml          | 106 ++++++++++++
 .../main/resources/i18n/messages.properties   |   1 +
 .../resources/i18n/messages_en_US.properties  |   1 +
 .../resources/i18n/messages_zh_CN.properties  |   1 +
 .../resources/i18n/messages_zh_TW.properties  |   1 +
 .../main/resources/i18n/validation.properties |   1 +
 .../i18n/validation_en_US.properties          |   1 +
 .../i18n/validation_zh_CN.properties          |   1 +
 .../i18n/validation_zh_TW.properties          |   1 +
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../dto/result/LatestGridInfoResultDTO.java   |  25 +++
 .../epmet/constant/GridVisitedConstant.java   |   8 +
 .../controller/GridLatestController.java      |  16 +-
 .../java/com/epmet/dao/GridLatestDao.java     |  12 +-
 .../com/epmet/service/GridLatestService.java  |  14 +-
 .../service/impl/GridLatestServiceImpl.java   |  20 ++-
 .../main/resources/mapper/GridLatestDao.xml   |  16 +-
 38 files changed, 937 insertions(+), 7 deletions(-)
 create mode 100644 epmet-module/resi-mine/pom.xml
 create mode 100644 epmet-module/resi-mine/resi-mine-client/pom.xml
 create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep
 create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep
 create mode 100644 epmet-module/resi-mine/resi-mine-server/pom.xml
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 8acbdd9bf6..907c1d62f7 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -148,6 +148,8 @@
                 <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>http://127.0.0.1:8093</gateway.routes.oper-access-server.uri>
+                <!--   15、居民端个人信息            -->
+                <gateway.routes.resi-mine-server.uri>http://127.0.0.1:8094</gateway.routes.resi-mine-server.uri>
             </properties>
         </profile>
 
@@ -201,6 +203,8 @@
                 <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
+                <!--   15、居民端个人信息            -->
+                <gateway.routes.resi-mine-server.uri>http://resi-mine-server</gateway.routes.resi-mine-server.uri>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 6f15b8e5c7..067ec4dd30 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -147,6 +147,15 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+        #居民端个人信息
+        - id: resi-mine-server
+          uri: @gateway.routes.resi-mine-server.uri@
+          order: 15
+          predicates:
+            - Path=${server.servlet.context-path}/resi/mine/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -183,6 +192,7 @@ renren:
     - /oper/access/**
     - /sys/**
     - /resi/guide/**
+    - /resi/mine/**
 management:
   endpoints:
     web:
@@ -245,6 +255,7 @@ epmet:
     - /oper/access/**
     - /resi/guide/stranger/getgridhome
     - /auth/login/logout
+    - /resi/mine/**
   swaggerUrls:
 
 jwt:
diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml
index a35e85adb9..4ace2972f1 100644
--- a/epmet-module/pom.xml
+++ b/epmet-module/pom.xml
@@ -24,6 +24,7 @@
 		<module>resi-guide</module>
 		<module>gov-org</module>
         <module>oper-access</module>
+		<module>resi-mine</module>
     </modules>
 
 </project>
diff --git a/epmet-module/resi-mine/pom.xml b/epmet-module/resi-mine/pom.xml
new file mode 100644
index 0000000000..ad431995d0
--- /dev/null
+++ b/epmet-module/resi-mine/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.epmet</groupId>
+		<artifactId>epmet-module</artifactId>
+		<version>2.0.0</version>
+	</parent>
+
+	<groupId>com.epmet</groupId>
+	<artifactId>resi-mine</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>resi-mine-client</module>
+		<module>resi-mine-server</module>
+	</modules>
+
+</project>
diff --git a/epmet-module/resi-mine/resi-mine-client/pom.xml b/epmet-module/resi-mine/resi-mine-client/pom.xml
new file mode 100644
index 0000000000..3841644651
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>resi-mine</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>resi-mine-client</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
new file mode 100644
index 0000000000..6e973e581e
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.epmet</groupId>
+        <artifactId>resi-mine</artifactId>
+        <version>2.0.0</version>
+    </parent>
+    <artifactId>resi-mine-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-mine-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-mybatis</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>8094</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <!--<activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>-->
+            <properties>
+                <server.port>8094</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
+                <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
new file mode 100644
index 0000000000..a8e461d66a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class ResiMineApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ResiMineApplication.class, args);
+    }
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
new file mode 100644
index 0000000000..91a66e87be
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "resimine";
+    }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java
new file mode 100644
index 0000000000..262f1bc07b
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.constant.Constant;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+/**
+ * Swagger配置
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig implements WebMvcConfigurer {
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+            .apiInfo(apiInfo())
+            .select()
+            //加了ApiOperation注解的类，才生成接口文档
+            .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+            .paths(PathSelectors.any())
+            .build()
+            .directModelSubstitute(java.util.Date.class, String.class)
+            .securitySchemes(security());
+
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+            .title("人人开源")
+            .description("模块接口文档")
+            .termsOfServiceUrl("https://www.renren.io")
+            .version("1.1.0")
+            .build();
+    }
+
+    private List<ApiKey> security() {
+        return newArrayList(
+            new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
+        );
+    }
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
new file mode 100644
index 0000000000..7348057d21
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
@@ -0,0 +1,35 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.service.ResiMineGridService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端用户网格信息相关接口入口
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:02
+ */
+@RestController
+@RequestMapping("minegrid")
+public class ResiMineGridController {
+	@Autowired
+	private ResiMineGridService resiMineGridService;
+
+	/**
+	 * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+	 * @param tokenDto
+	 * @Author yinzuomei
+	 * @Description 获取用户最近访问网格
+	 * @Date 2020/3/24 11:10
+	 **/
+	@GetMapping("getlatestgridinfo")
+	public Result<LatestGridInfoResultDTO> getLatestGridInfo(@LoginUser TokenDto tokenDto){
+		return resiMineGridService.getLatestGridInfo(tokenDto);
+	}
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
new file mode 100644
index 0000000000..1206c71b9a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.exception;
+
+
+import com.epmet.commons.tools.exception.ErrorCode;
+
+/**
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ * <p>
+ * 如：100001001（100001代表模块，001代表业务代码）
+ * </p>
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ModuleErrorCode extends ErrorCode {
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
new file mode 100644
index 0000000000..0143c55acd
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -0,0 +1,27 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @Description 居民端陌生人导览  调用epmet-user服务
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+	/**
+	 * @param userId
+	 * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+	 * @Author yinzuomei
+	 * @Description 根据居民id查询最后一次访问的网格信息
+	 * @Date 2020/3/24 13:05
+	 **/
+	@GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}")
+	Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(@PathVariable("userId") String userId);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
new file mode 100644
index 0000000000..6e912e7417
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,29 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 居民端-陌生人导览 调用epmet-user服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+	/**
+	 * @param userId
+	 * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+	 * @Author yinzuomei
+	 * @Description 根据居民id查询最后一次访问的网格信息
+	 * @Date 2020/3/24 13:05
+	 **/
+	@Override
+	public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestGridInfoByUserId", userId);
+	}
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
new file mode 100644
index 0000000000..33c5f4d73d
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
@@ -0,0 +1,21 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+
+/**
+ * @Description 居民端用户网格信息service
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:04
+ */
+public interface ResiMineGridService {
+	/**
+	 * 获取用户最近访问网格
+	 *
+	 * @Author yinzuomei
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO>
+	 */
+	Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
new file mode 100644
index 0000000000..891d41bf51
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
@@ -0,0 +1,42 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.service.ResiMineGridService;
+import com.epmet.utils.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description  居民端用户网格信息service
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:04
+ */
+@Service
+public class ResiMineGridServiceImpl implements ResiMineGridService {
+
+	@Autowired
+	private EpmetUserFeignClient epmetUserFeignClient;
+
+	/**
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO>
+	 * @Author yinzuomei
+	 * @Description 获取用户最近访问网格
+	 * @Date 2020/3/24 11:11
+	 **/
+	@Override
+	public Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto) {
+		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
+			return new Result<LatestGridInfoResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+		}
+		if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
+			return new Result<LatestGridInfoResultDTO>().error(ModuleConstant.FOR_RESI_CALL);
+		}
+		return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+	}
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
new file mode 100644
index 0000000000..eb482b07f3
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.utils;
+
+import com.epmet.commons.tools.constant.Constant;
+
+/**
+ * 模块常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface ModuleConstant extends Constant {
+
+	/**
+	 * tokenDto不能为null userId不能为空
+	 */
+	String USER_NOT_NULL="用户信息不能为空";
+
+	/**
+	 * 接口只限居民端调用
+	 */
+	String FOR_RESI_CALL="当前接口只限居民端调用";
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000..f602718744
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,106 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /resi/mine
+
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  application:
+    name: resi-mine-server
+  #环境 dev|test|prod
+  profiles:
+    active: dev
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: @spring.redis.index@
+    host: @spring.redis.host@
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+    timeout: 30s
+  datasource:
+    druid:
+      #MySQL
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        #nacos的命名空间ID，默认是public
+        namespace: @nacos.discovery.namespace@
+        #不把自己注册到注册中心的地址
+        register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+      config:
+        enabled: @nacos.config-enabled@
+        server-addr: @nacos.server-addr@
+        namespace: @nacos.config.namespace@
+        group: @nacos.config.group@
+        file-extension: yaml
+        #指定共享配置，且支持动态刷新
+#        ext-config:
+#          - data-id: datasource.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+#          - data-id: common.yaml
+#            group: ${spring.cloud.nacos.config.group}
+#            refresh: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.epmet.resi.mine.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+
+feign:
+  hystrix:
+    enabled: true
+  client:
+    config:
+      default:
+        loggerLevel: BASIC
+  httpclient:
+    enabled: true
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000 #缺省为1000
+
+ribbon:
+  ReadTimeout: 300000
+  ConnectTimeout: 300000
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 0000000000..a7091dbb43
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties
@@ -0,0 +1 @@
+#Default
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 0000000000..9e895e4281
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 0000000000..b21fd22eca
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 0000000000..4433dba45a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 0000000000..56ca909c46
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties
@@ -0,0 +1 @@
+#Default
\ No newline at end of file
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 0000000000..9e895e4281
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 0000000000..b21fd22eca
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 0000000000..4433dba45a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000..a038b82fe7
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/resi-mine"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="INFO"/>
+        <logger name="com.epmet.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.epmet.dao" level="INFO"/>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java
new file mode 100644
index 0000000000..829a1cd2d5
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 获取用户最近访问网格返参DTO
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:09
+ */
+@Data
+public class LatestGridInfoResultDTO implements Serializable {
+	private static final long serialVersionUID = 8548569698676898706L;
+
+	/**
+	 * 用户最后一次访问的网格对应的客户id
+	 */
+	private String customerId;
+
+	/**
+	 * 用户最后一次访问的网格
+	 */
+	private String gridId;
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
index c21ad1761e..cfd7228e97 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
@@ -14,16 +14,24 @@ package com.epmet.constant;
  * @since 1.0.0
  */
 public interface GridVisitedConstant {
+
     /**
      * 查询异常
      */
     String QUERY_EXCEPTION = "查询客户网格表数据失败！";
+
     /**
      * 网格访问记录表新增数据失败
      */
     String SAVE_VISITED = "网格访问记录表新增数据失败！";
+
     /**
      * 最近访问网格表新增数据失败
      */
     String SAVE_LATEST = "最近访问网格表新增数据失败！";
+
+    /**
+     * tokenDto中的userId不能为空
+     */
+    String USER_ID_NOTNULL="用户id不能为空";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
index a6c1500b02..6ef6cdab25 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.excel.GridLatestExcel;
 import com.epmet.service.GridLatestService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("gridlatest")
 public class GridLatestController {
-    
+
     @Autowired
     private GridLatestService gridLatestService;
 
@@ -91,4 +92,15 @@ public class GridLatestController {
         ExcelUtils.exportExcelToTarget(response, null, list, GridLatestExcel.class);
     }
 
-}
\ No newline at end of file
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.LatestGridInfoResultDTO>
+     * @param userId
+     * @Author yinzuomei
+     * @Description 根据居民id查询最后一次访问的网格信息
+     * @Date 2020/3/24 13:09
+     **/
+    @GetMapping("getLatestGridInfoByUserId/{userId}")
+    public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(@PathVariable("userId") String userId){
+        return gridLatestService.getLatestGridInfoByUserId(userId);
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
index 52af37226a..8c4b30eeac 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -32,4 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
 public interface GridLatestDao extends BaseDao<GridLatestEntity> {
 
     GridLatestEntity getGridLatestByIds(GridLatestDTO formDTO);
-}
\ No newline at end of file
+
+    /**
+     * @return com.epmet.dto.result.LatestGridInfoResultDTO
+     * @param userId
+     * @Author yinzuomei
+     * @Description 根据居民id查询最后一次访问的网格信息
+     * @Date 2020/3/24 13:17
+     **/
+	LatestGridInfoResultDTO selectLatestGridInfoByUserId(String userId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
index 41321a1e1c..fc41f0c32d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
@@ -19,9 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 
 import java.util.List;
@@ -100,4 +102,14 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @param formDTO
      */
     boolean saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
-}
\ No newline at end of file
+
+    /**
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.LatestGridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据居民id查询最后一次访问的网格信息
+     * @Date 2020/3/24 13:10
+     **/
+    Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index f2f2b98555..449407f058 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -23,10 +23,13 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.GridVisitedConstant;
 import com.epmet.dao.GridLatestDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
 import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 import com.epmet.redis.GridLatestRedis;
 import com.epmet.service.GridLatestService;
@@ -132,5 +135,18 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
 
     }
 
-
-}
\ No newline at end of file
+    /**
+     * @param userId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.LatestGridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据居民id查询最后一次访问的网格信息
+     * @Date 2020/3/24 13:10
+     **/
+    @Override
+    public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
+        if(StringUtils.isBlank(userId)){
+            return new Result<LatestGridInfoResultDTO>().error(GridVisitedConstant.USER_ID_NOTNULL);
+        }
+        return new Result<LatestGridInfoResultDTO>().ok(baseDao.selectLatestGridInfoByUserId(userId));
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index ed9eaa6398..8aecc2fc5a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -49,4 +49,18 @@
         </if>
     </select>
 
-</mapper>
\ No newline at end of file
+    <!--   根据居民id查询最后一次访问的网格信息 -->
+    <select id="selectLatestGridInfoByUserId" resultType="com.epmet.dto.result.LatestGridInfoResultDTO" parameterType="java.lang.String">
+        SELECT
+            gl.GRID_ID,
+            gl.CUSTOMER_ID
+        FROM
+            grid_latest gl
+        WHERE
+            gl.DEL_FLAG = '0'
+            AND gl.CUSTOMER_USER_ID = #{userId}
+        ORDER BY
+            gl.LATEST_TIME DESC
+            LIMIT 1
+    </select>
+</mapper>