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] =?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,