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 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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 {
 
 	/**