diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GisGridDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GisGridDTO.java
index 26b96cebd..f5db0decf 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GisGridDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GisGridDTO.java
@@ -38,6 +38,16 @@ public class GisGridDTO implements Serializable {
*/
private String id;
+ /**
+ * 街道ID
+ */
+ private Long streetId;
+
+ /**
+ * 社区ID
+ */
+ private Long communityId;
+
/**
* 网格ID
*/
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml
index ff5545a48..c3b3b806c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml
@@ -34,13 +34,17 @@
g.GRID_NAME AS GIS_GRID_NAME,
g.GRID_ID AS GIS_GRID_ID,
d.id AS GRID_ID,
- d.`name` AS GRID_NAME
+ d.`name` AS GRID_NAME,
+ p.id AS communityId,
+ p.pid AS streetId
FROM
epdc_gis g
INNER JOIN sys_dept d ON d.area_code = g.GRID_ID
+ INNER JOIN sys_dept p ON d.pid = p.id
WHERE
d.del_flag = '0'
AND d.type_key = 'grid_party'
AND g.GRID_ID = #{gisGridId}
+ LIMIT 1
\ No newline at end of file
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index 35c6687ec..abeae74ce 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -115,9 +115,9 @@
CJ!redis@elink
- true
+ false
47.104.92.53:8848
- 47.104.92.53
+
dda4cc4b-ac6c-4a58-acc5-d64e667f039f
http://localhost:9411
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index cabcbc6bd..ea7a03593 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -184,9 +184,9 @@
CJ!redis@elink
- true
+ false
47.104.92.53:8848
- 47.104.92.53
+
dda4cc4b-ac6c-4a58-acc5-d64e667f039f
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 8a9a8c061..736599d2c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -164,9 +164,9 @@
CJ!redis@elink
- true
+ false
47.104.92.53:8848
- 47.104.92.53
+
dda4cc4b-ac6c-4a58-acc5-d64e667f039f