resi-guide陌生人查询附近网格信息部分代码规范调整,将本地开发环境的redis库连接到远程主机10.10.10.79:6379

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 -->

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 -->

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>

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 -->

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 -->

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 -->

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 -->

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 -->

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 -->

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")
+    @PostMapping("querygridlistbyareacode")
-    public Result<List<CustomerGridForStrangerResultDTO>> queryListForStrangerByOrder(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO ){
+    public Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO ){
 
         ValidatorUtils.validateEntity(listCustomerGridFormDTO);
-        return customerGridService.listGridForStrangerByOrder(listCustomerGridFormDTO);
+        return customerGridService.listGridByAreaCode(listCustomerGridFormDTO);
     }
 
     @GetMapping("getcustomergrid/{id}")

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 查整个城市的网格

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

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<>();
 

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;
+}

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">
 
 

epmet-module/oper-access/oper-access-server/pom.xml

@@ -95,10 +95,10 @@
             <id>dev</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-            </activation>
+        </activation>
-            <properties>
+        <properties>
-                <server.port>8093</server.port>
+            <server.port>8093</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
+            <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 -->

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 -->

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 -->

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 -->

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")
+    @PostMapping("/gov/org/customergrid/querygridlistbyareacode")
-    Result<List<CustomerGridForStrangerResultDTO>> getPageForStrangerGuideInterface(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
+    Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
 
 
 

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) {
+    public Result<List<CustomerGridForStrangerResultDTO>> queryGridListByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",listCustomerGridFormDTO);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryGridListByAreaCode",listCustomerGridFormDTO);
     }
 }

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 (ModuleConstant.POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized()) {
-                } else if (1 == customerGridListFormDTO.getIsAuthorized()) {
                     //已授权，自动选择
                     strangerTrance.setLocationAreaCode(customerGridListFormDTO.getAreaCode());
-                    strangerTrance.setSelectedAreaCode("");
                 }
                 strangerTrance.setIsAuthorized(customerGridListFormDTO.getIsAuthorized());
                 strangerTrance.setGridNumber(queryList.size());

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;
 }

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 -->