Browse Source

Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

feature/dangjian
wanggongfeng 3 years ago
parent
commit
6a3f824e20
  1. 10
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/GisGridDTO.java
  2. 6
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GisGridDao.xml
  3. 4
      esua-epdc/epdc-auth/pom.xml
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  5. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

10
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
*/

6
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
</select>
</mapper>

4
esua-epdc/epdc-auth/pom.xml

@ -115,9 +115,9 @@
<spring.redis.password>CJ!redis@elink</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.92.53:8848</nacos.server-addr>
<nacos.ip>47.104.92.53</nacos.ip>
<nacos.ip></nacos.ip>
<nacos.namespace>dda4cc4b-ac6c-4a58-acc5-d64e667f039f</nacos.namespace>
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -184,9 +184,9 @@
<spring.redis.password>CJ!redis@elink</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.92.53:8848</nacos.server-addr>
<nacos.ip>47.104.92.53</nacos.ip>
<nacos.ip></nacos.ip>
<nacos.namespace>dda4cc4b-ac6c-4a58-acc5-d64e667f039f</nacos.namespace>
<spring.datasource.druid.url>

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@ -164,9 +164,9 @@
<spring.redis.password>CJ!redis@elink</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.92.53:8848</nacos.server-addr>
<nacos.ip>47.104.92.53</nacos.ip>
<nacos.ip></nacos.ip>
<nacos.namespace>dda4cc4b-ac6c-4a58-acc5-d64e667f039f</nacos.namespace>
<spring.datasource.druid.url>

Loading…
Cancel
Save