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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
0
- 122.152.200.70
+ 10.10.10.79
6379
- 123456
+ 123456
false
122.152.200.70:8848
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
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> queryListForStrangerByOrder(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO ){
+ @PostMapping("querygridlistbyareacode")
+ public Result> 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 {
- /**
- * @Description 查特定区的网格
- * @Param areaCode
- * @return CustomerGridForStrangerResultDTO
- * @Author wangc
- * @Date 2020.03.19 15:53
- **/
- List 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 {
* @author wangc
* @date 2020-03-16
* */
- Result> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO);
+ Result> 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> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+ public Result> listGridByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO) {
Result> result = new Result<>();
@@ -116,17 +117,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl gridList
= baseDao.selectGridByCityLike(listCustomerGridFormDTO);
result.setData(gridList);
- result.setCode(0);
+ result.setCode(ModuleConstant.SUCCESS_CODE_RESULT);
return result;
}else{
- //行政区
+ //行政区 - 指定行政区在前,所属城市下其余行政区在后
Map 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 @@
-
-
+
-
+