数据统计xml表名由外部导入，修改数据源

epdc-cloud-analysis-pc/pom.xml

@@ -127,11 +127,11 @@
                 <spring.profiles.active>dev</spring.profiles.active>
                 <docker.tag>dev</docker.tag>
 
-                <!-- redis -->
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <!-- redis配置 -->
+                <spring.redis.index>9</spring.redis.index>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>

epdc-cloud-analysis-pc/src/main/resources/application-dev.yml

@@ -4,52 +4,52 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     druid:
       first:  #数据源1
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       second:  #数据源2
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       third:  #数据源3
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       fourth:  #数据源4
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       fifth:  #数据源5
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       sixth:  #数据源6
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       seventh:  #数据源7
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       eighth:  #数据源8
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       ninth:  #数据源9
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       tenth:  #数据源10
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       eleventh:  #数据源11
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       twelve:  #数据源12
-        url: jdbc:mysql://118.190.232.100:3308/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: epdc
+        url: jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: epdcyushan
         password: elink833066
       initial-size: 10
       max-active: 100

epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml

@@ -10,4 +10,5 @@
     <sql id="tb_group">yushan_esua_epdc_group</sql>
     <sql id="tb_mutuality">yushan_esua_epdc_mutuality</sql>
     <sql id="tb_news">yushan_esua_epdc_news</sql>
+    <sql id="tb_user">yushan_esua_epdc_user</sql>
 </mapper>

epdc-cloud-analysis-pc/src/main/resources/mapper/issue/IssueAnalysisDao.xml

@@ -16,8 +16,8 @@
         ee.BROWSE_NUM,
         ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
         FROM
-        esua_epdc_events.epdc_issue ei
-        LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_events ee ON ee.ID = ei.EVENT_ID
         AND ee.DEL_FLAG = '0'
         WHERE
         ei.DEL_FLAG = '0'
@@ -64,8 +64,8 @@
         ee.BROWSE_NUM,
         ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
         FROM
-        esua_epdc_events.epdc_issue ei
-        LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_events ee ON ee.ID = ei.EVENT_ID
         AND ee.DEL_FLAG = '0'
         WHERE
         ei.DEL_FLAG = '0'
@@ -142,7 +142,7 @@
         SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
         '1' as categoryLevel
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE ei.DEL_FLAG = '0'
         <include refid="common_where_if"/>
         GROUP BY
@@ -160,7 +160,7 @@
         SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
         '2' as categoryLevel
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0
@@ -180,7 +180,7 @@
         SUM( ei.ISSUE_STATE = 4 ) AS itemNum,
         '3' as categoryLevel
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1
@@ -195,7 +195,7 @@
         SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) AS cotegoryName,
         COUNT( ei.ID ) AS count
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ei.GRID_ID IN
@@ -217,7 +217,7 @@
         SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ) AS cotegoryName,
         COUNT( ei.ID ) AS count
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0
@@ -240,7 +240,7 @@
         SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ) AS cotegoryName,
         COUNT( ei.ID ) AS count
         FROM
-        esua_epdc_events.epdc_issue ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1
@@ -276,8 +276,8 @@
         ei.ALL_DEPT_NAMES AS deptName,
         ei.CREATED_TIME
         FROM
-        esua_epdc_events.epdc_issue ei
-        LEFT JOIN esua_epdc_events.epdc_img eimg ON eimg.REFERENCE_ID = ei.EVENT_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_img eimg ON eimg.REFERENCE_ID = ei.EVENT_ID
         AND eimg.DEL_FLAG = '0'
         WHERE
         ei.ID IN (
@@ -288,7 +288,7 @@
         SELECT
         t.ID
         FROM
-        esua_epdc_events.epdc_issue t
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue t
         WHERE
         t.DEL_FLAG = '0'
         AND t.ISSUE_STATE IN (0, 2)
@@ -316,8 +316,8 @@
         ei.ISSUE_CONTENT AS content,
         ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS statementNum
         FROM
-        esua_epdc_events.epdc_issue ei
-        LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue ei
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_events ee ON ee.ID = ei.EVENT_ID
         AND ee.DEL_FLAG = '0'
         WHERE
         ei.DEL_FLAG = '0'

epdc-cloud-analysis-pc/src/main/resources/mapper/item/ItemAnalysisDao.xml

@@ -127,21 +127,21 @@
         ei.ID,
         ei.ITEM_CONTENT,
         ei.CREATED_TIME,
-        ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT COUNT( eihp.ID ) FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = ei.ID ) AS operatNum,
-        ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM esua_epdc_events.epdc_item_grid_platform eigp
+        ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_grid_platform eigp
         WHERE eigp.DEL_FLAG = '0' AND eigp.REFERENCE_ID = ei.ID ) AS reportFlag,
-        ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID
+        ( SELECT COUNT(eid.ID) FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID
         ) AS deptNum,
         ei.ITEM_STATE,
-        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.CREATED_TIME FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = ei.ID AND eihp.STATE IN (5, 10) LIMIT 1 ) AS processedTime,
         ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM
-        esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime,
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime,
         ei.ALL_DEPT_NAMES,
         ei.EVALUATION_SCORE
         FROM
-        esua_epdc_events.epdc_item ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
         WHERE
         ei.DEL_FLAG = '0'
         AND ei.GRID_ID IN
@@ -200,16 +200,16 @@
         ei.ITEM_CONTENT as itemContent,
         ei.CREATED_TIME as createdTime,
         ei.GRID as grid,
-        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
         eigp.CREATED_TIME AS reportTime,
-        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.CREATED_TIME FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
-        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerDept
         FROM
-        esua_epdc_events.epdc_item_grid_platform eigp
-        LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_grid_platform eigp
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
         AND ei.DEL_FLAG = '0'
         WHERE
         eigp.DEL_FLAG = '0'
@@ -238,7 +238,7 @@
         </if>
         <if test='reportDept != null and reportDept != ""'>
             AND EXISTS (
-            SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
+            SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp
             WHERE eihp.DEL_FLAG = '0'
             AND eihp.STATE = 15
             AND eihp.ITEM_ID = eigp.REFERENCE_ID
@@ -258,18 +258,18 @@
         ei.ITEM_CONTENT as itemContent,
         ei.CREATED_TIME as createdTime,
         ei.GRID as grid,
-        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.STATE = 15 AND eihp.ITEM_ID = eigp.REFERENCE_ID LIMIT 1 ) AS reportDept,
         eigp.CREATED_TIME AS reportTime,
-        ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.CREATED_TIME FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerTime,
-        ( SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
+        ( SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND
         eihp.ITEM_ID = eigp.REFERENCE_ID ORDER BY eihp.CREATED_TIME DESC LIMIT 1 ) AS lastHandlerDept,
         ei.ITEM_STATE as itemState,
         ei.EVALUATION_SCORE as evaluationScore
         FROM
-        esua_epdc_events.epdc_item_grid_platform eigp
-        LEFT JOIN esua_epdc_events.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_grid_platform eigp
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei ON ei.ID = eigp.REFERENCE_ID
         AND ei.DEL_FLAG = '0'
         WHERE
         eigp.DEL_FLAG = '0'
@@ -298,7 +298,7 @@
         </if>
         <if test='reportDept != null and reportDept != ""'>
             AND EXISTS (
-            SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp
+            SELECT eihp.HANDLER_DEPT FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp
             WHERE eihp.DEL_FLAG = '0'
             AND eihp.STATE = 15
             AND eihp.ITEM_ID = eigp.REFERENCE_ID
@@ -321,7 +321,7 @@
         SELECT
         COUNT( ei.ID ) AS unsolvedCount
         FROM
-        esua_epdc_events.epdc_item ei
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
         WHERE
         ei.ITEM_STATE = 0
         AND ei.DEL_FLAG = '0'
@@ -339,13 +339,13 @@
         COUNT( DISTINCT ei1.ID ) AS solvingCount,
         COUNT( DISTINCT ei2.ID ) AS solvedCount
         FROM
-        esua_epdc_events.epdc_item_grid_platform eigp
-        LEFT JOIN esua_epdc_events.epdc_item ei ON eigp.REFERENCE_ID = ei.ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_grid_platform eigp
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei ON eigp.REFERENCE_ID = ei.ID
         AND ei.DEL_FLAG = '0'
-        LEFT JOIN esua_epdc_events.epdc_item ei1 ON eigp.REFERENCE_ID = ei1.ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei1 ON eigp.REFERENCE_ID = ei1.ID
         AND ei1.DEL_FLAG = 0
         AND ei1.ITEM_STATE = 0
-        LEFT JOIN esua_epdc_events.epdc_item ei2 ON eigp.REFERENCE_ID = ei2.ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei2 ON eigp.REFERENCE_ID = ei2.ID
         AND ei2.DEL_FLAG = 0
         AND ( ei2.ITEM_STATE = 5 OR ei2.ITEM_STATE = 10 )
         WHERE
@@ -394,14 +394,14 @@
             ei.EVENT_ID,
             ei.ITEM_CONTENT AS content,
             ei.CREATED_TIME,
-            ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS handleCount,
-            ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID ) AS deptCount,
+            ( SELECT COUNT( eihp.ID ) FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS handleCount,
+            ( SELECT COUNT(eid.ID) FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID ) AS deptCount,
             ei.ITEM_STATE,
-            ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS spendTime,
+            ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS spendTime,
             ei.ALL_DEPT_NAMES AS deptName,
             ei.CATEGORY_FULL_NAME AS categoryName
             FROM
-            esua_epdc_events.epdc_item ei
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
             WHERE
             ei.DEL_FLAG = '0'
             AND ei.GRID_ID IN
@@ -441,7 +441,7 @@
             </if>
             CREATED_TIME DESC
             LIMIT #{pageIndex}, #{pageSize}) t
-            LEFT JOIN esua_epdc_events.epdc_img eimg ON eimg.REFERENCE_ID = t.EVENT_ID
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_img eimg ON eimg.REFERENCE_ID = t.EVENT_ID
             AND eimg.DEL_FLAG = '0';
     </select>
 
@@ -451,8 +451,8 @@
             ei.ITEM_CONTENT AS content,
             ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS statementNum
         FROM
-            esua_epdc_events.epdc_item ei
-        LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_events ee ON ee.ID = ei.EVENT_ID
             AND ee.DEL_FLAG = '0'
         WHERE
             ei.DEL_FLAG = '0'

epdc-cloud-analysis-pc/src/main/resources/mapper/topic/TopicAnalysisDao.xml

@@ -95,7 +95,7 @@
         et.TOPIC_CONTENT AS content,
         ( et.COMMENT_NUM + et.BROWSE_NUM ) AS statementNum
         FROM
-        esua_epdc_group.epdc_topic et
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic et
         WHERE
         et.DEL_FLAG = '0'
         AND et.STATE = 0
@@ -142,8 +142,8 @@
         et.ALL_DEPT_NAMES AS deptName,
         et.CREATED_TIME
         FROM
-        esua_epdc_group.epdc_topic et
-        LEFT JOIN esua_epdc_group.epdc_topic_img timg ON timg.REFERENCE_ID = et.ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic et
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic_img timg ON timg.REFERENCE_ID = et.ID
         AND timg.DEL_FLAG = '0'
         WHERE
         et.ID IN (
@@ -154,7 +154,7 @@
         SELECT
         t.ID
         FROM
-        esua_epdc_group.epdc_topic t
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic t
         WHERE
         t.DEL_FLAG = '0'
         AND t.STATE = 0

epdc-cloud-analysis-pc/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml

@@ -52,11 +52,11 @@
           SELECT
              ad2.id streetId
             FROM
-                esua_epdc_user.epdc_user uu
-            LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
+                <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID
             AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
-            LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
-            LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad1.id = ad.pid
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad2.id = ad1.pid
             WHERE
                 uu.DEL_FLAG = '0'
                 <if test="deptIdList!=null and deptIdList.size()>0">

epdc-cloud-analysis-pc/src/main/resources/mapper/user/OldMemberRankDao.xml

@@ -31,11 +31,11 @@ FROM (
 				uu.ID userId,
 				TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()) age
 			FROM
-				esua_epdc_user.epdc_user uu
-				LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
+				<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID
 				AND ad.type_key = 'grid_party'
-				LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-				LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
 			WHERE
 				uu.DEL_FLAG = '0'
 				AND uu.PARTY_FLAG = '1'

epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -27,8 +27,8 @@
                     IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
                     ad2.`name` streetName, ad2.id streetId
                 FROM
-                    esua_epdc_user.epdc_user uu
-                    LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
                     <include refid="joinCommunityStreet"></include>
                 WHERE uu.DEL_FLAG = '0'
                     <if test='partyFlag != null and partyFlag == "1"'>AND uu.PARTY_FLAG = '1'</if>
@@ -72,9 +72,9 @@
             ad2.id AS DISTINCTstreetId,
             COUNT( DISTINCT uf.USER_ID ) partyAuthFailureCount
         FROM
-            esua_epdc_user.epdc_user uu
-            LEFT JOIN esua_epdc_user.epdc_party_authentication_failed uf ON uu.id = uf.user_id
-            LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_party_authentication_failed uf ON uu.id = uf.user_id
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
             <include refid="joinCommunityStreet"></include>
         WHERE
             uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '0' AND ad.id IS NOT NULL
@@ -100,14 +100,14 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                     ad.type_key = 'grid_party'
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id AND ug.DEL_FLAG = '0'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id AND ug.DEL_FLAG = '0'
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad1.id = t0.pid
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad2.id = ad1.pid
         GROUP BY
             t0.id
         ORDER BY
@@ -122,13 +122,13 @@
 <!--             COUNT( DISTINCT nnn.ID ) noticeCount,-->
 <!--             COUNT( DISTINCT eee.ID ) eventCount-->
 <!--        FROM-->
-<!--        esua_epdc_admin.sys_dept dept-->
-<!--        LEFT JOIN	esua_epdc_news.epdc_news nne  ON  nne.DEPT_ID = dept.id AND nne.DEL_FLAG = '0'-->
-<!--        LEFT JOIN esua_epdc_news.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'-->
+<!--        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept dept-->
+<!--        LEFT JOIN	<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_news"/>.epdc_news nne  ON  nne.DEPT_ID = dept.id AND nne.DEL_FLAG = '0'-->
+<!--        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_news"/>.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'-->
 <!--        <if test="startTime != null and endTime != null and endTime != ''">-->
 <!--            AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
 <!--        </if>-->
-<!--        LEFT JOIN esua_epdc_events.epdc_issue eee ON eee.GRID_ID = dept.id AND eee.DEL_FLAG = '0'-->
+<!--        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue eee ON eee.GRID_ID = dept.id AND eee.DEL_FLAG = '0'-->
 <!--        <if test="startTime != null and endTime != null and endTime != ''">-->
 <!--            AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
 <!--        </if>-->
@@ -149,7 +149,7 @@
         SELECT
         count(1)
         FROM
-        esua_epdc_news.epdc_news
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_news"/>.epdc_news
         WHERE
         DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
@@ -162,7 +162,7 @@
         SELECT
         count(1)
         FROM
-        esua_epdc_news.epdc_notice
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_news"/>.epdc_notice
         WHERE
         DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
@@ -174,7 +174,7 @@
         (SELECT
         count(1)
         FROM
-        esua_epdc_events.epdc_issue
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue
         WHERE
         DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
@@ -183,7 +183,7 @@
         AND GRID_ID = dept.id
         ) AS eventCount
         FROM
-        esua_epdc_admin.sys_dept dept
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept dept
         WHERE
         dept.DEL_FLAG = '0'
         AND dept.type_key = 'grid_party'
@@ -207,8 +207,8 @@
             (SELECT DISTINCT
             item.*,handle.STATE
             FROM
-            esua_epdc_events.epdc_item item
-            LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item item
+            LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process
             WHERE
             DEL_FLAG = '0' and (state=0 or state=5 or state=10 )
             <if test="endTime != null and endTime != ''">
@@ -216,7 +216,7 @@
             </if>
             GROUP BY ITEM_ID
             ) maxitem ON maxitem.ITEM_ID = item.ID
-        LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
             AND maxitem.CREATED_TIME = handle.CREATED_TIME)t
         WHERE
             DEL_FLAG = '0'
@@ -238,12 +238,12 @@
         COUNT( DISTINCT ug.user_id ) communityMemberCount,
         COUNT( DISTINCT ut.ID ) communityTopicCount
         FROM
-        esua_epdc_group.epdc_group epgr
-        LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_group epgr
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
             AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        LEFT JOIN esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0'
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
             AND DATE_FORMAT(ut.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
@@ -274,11 +274,11 @@
         COUNT( u.STATE != '0' OR NULL ) residentCount,
         COUNT( u.party_flag = '1' OR NULL ) partyMemberCount
         FROM
-        esua_epdc_user.epdc_user u
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON u.DEPT_ID = ad.ID
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user u
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON u.DEPT_ID = ad.ID
         AND ad.type_key = 'grid_party'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         u.DEL_FLAG = '0'
         <if test="deptIdList != null and deptIdList.size() > 0">
@@ -300,10 +300,10 @@
         COUNT( ac.ID) gridCount
 
         FROM
-        esua_epdc_admin.sys_dept ad
-        LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ac ON ad.id = ac.GRID_ID
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.epdc_dept_ma_code ac ON ad.id = ac.GRID_ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         ad.type_key = 'grid_party'
         <if test="deptIdList != null and deptIdList.size() > 0">
@@ -335,10 +335,10 @@
         COUNT( uu.id ) residentCount,
         COUNT( uu.PARTY_FLAG = '1' OR NULL ) partyMemberCount
         FROM
-        esua_epdc_user.epdc_user uu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         uu.DEL_FLAG = '0'
         AND ad.id IS NOT NULL
@@ -394,11 +394,11 @@
             GROUP_CONCAT( DISTINCT u.real_name ) gridLeader
         FROM
             <include refid="fromGridCommunityStreet"></include>
-            LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
-            LEFT JOIN esua_epdc_admin.sys_role_data_scope ards ON ards.dept_id = ad.id
-            LEFT JOIN esua_epdc_admin.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
-            LEFT JOIN esua_epdc_admin.sys_role_user ru ON r.id = ru.role_id
-            LEFT JOIN esua_epdc_admin.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_role_data_scope ards ON ards.dept_id = ad.id
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader'
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_role_user ru ON r.id = ru.role_id
+            LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_user u ON ru.user_id = u.id AND u.del_flag = 0
         WHERE
             ad.type_key = 'grid_party'
             <if test="deptIdList != null and deptIdList.size() > 0">
@@ -412,7 +412,7 @@
     </select>
 
     <select id="selectListReigistData" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
-        <!--SELECT
+        SELECT
             t.DEPT_ID gridId, COUNT( t.ID ) registerCount,
             COUNT(t.PARTY_FLAG = '0' OR NULL) residentCount,
             COUNT(t.PARTY_FLAG = '1' OR NULL) partyCount
@@ -420,7 +420,7 @@
             SELECT
                 uu.ID, uu.DEPT_ID, uu.STATE, uu.PARTY_FLAG
             FROM
-                esua_epdc_user.epdc_user uu
+                <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
             WHERE
                 uu.DEL_FLAG = '0'
                 <if test="gridIdList != null and gridIdList.size() > 0">
@@ -431,84 +431,84 @@
                 </if>
                 AND uu.DEPT_ID IS NOT NULL
             ) t
-        GROUP BY t.DEPT_ID-->
-        SELECT
-        user.DEPT_ID gridId,
-        COUNT(user.ID) AS registerCount,
-        COUNT((user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '1') OR (user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '0' AND user.HistoryCount > 0) OR NULL) AS residentCount ,
-        COUNT((user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '1') OR NULL) AS partyCount
-        FROM
-        (
-        select newuu.ID,newuu.AUTHENTICATED_TYPE,newuu.AUTHENTICATED_FLAG,newuu.HistoryCount,newuu.DEPT_ID from (
-        SELECT
-        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,
-        (
-            SELECT
-            AUTHENTICATED_TYPE
-            FROM
-            esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-            ORDER BY
-            CREATED_TIME DESC,
-            id
-            LIMIT 1
-        ) AS AUTHENTICATED_TYPE,
-        (
-            SELECT
-            AUTHENTICATED_FLAG
-            FROM
-            esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-            ORDER BY
-            CREATED_TIME DESC ,
-            id
-            LIMIT 1
-        ) AS AUTHENTICATED_FLAG,
-        (
-            SELECT
-            count( id ) AS HistoryCount
-            FROM
-            esua_epdc_user.epdc_user_authenticate_history
-            WHERE
-            DEL_FLAG = '0'
-            AND AUTHENTICATED_TYPE IN ( '0', '1' )
-            AND AUTHENTICATED_FLAG = '1'
-            <if test="endTime != ''">
-                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
-            AND USER_ID = uu.ID
-        ) AS HistoryCount,
-        ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
-            SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
-            WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
-            ORDER BY
-            CREATED_TIME,
-            id
-            LIMIT 1
-        )) AS DEPT_ID
-        FROM
-        esua_epdc_user.epdc_user uu ) newuu
-        where  newuu.DEL_FLAG = '0'
-        <if test="gridIdList != null and gridIdList.size() > 0">
-            AND newuu.DEPT_ID in <include refid="foreachGridIdList"></include>
-        </if>
-        <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-        </if>
-        ) user
-        GROUP BY user.DEPT_ID
+        GROUP BY t.DEPT_ID
+<!--        SELECT-->
+<!--        user.DEPT_ID gridId,-->
+<!--        COUNT(user.ID) AS registerCount,-->
+<!--        COUNT((user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '1') OR (user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '0' AND user.HistoryCount > 0) OR NULL) AS residentCount ,-->
+<!--        COUNT((user.AUTHENTICATED_TYPE = '1' AND user.AUTHENTICATED_FLAG = '1') OR NULL) AS partyCount-->
+<!--        FROM-->
+<!--        (-->
+<!--        select newuu.ID,newuu.AUTHENTICATED_TYPE,newuu.AUTHENTICATED_FLAG,newuu.HistoryCount,newuu.DEPT_ID from (-->
+<!--        SELECT-->
+<!--        DISTINCT uu.ID,uu.DEL_FLAG,uu.CREATED_TIME,-->
+<!--        (-->
+<!--            SELECT-->
+<!--            AUTHENTICATED_TYPE-->
+<!--            FROM-->
+<!--            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_authenticate_history-->
+<!--            WHERE-->
+<!--            DEL_FLAG = '0'-->
+<!--            AND AUTHENTICATED_TYPE IN ( '0', '1' )-->
+<!--            <if test="endTime != ''">-->
+<!--                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}-->
+<!--            </if>-->
+<!--            AND USER_ID = uu.ID-->
+<!--            ORDER BY-->
+<!--            CREATED_TIME DESC,-->
+<!--            id-->
+<!--            LIMIT 1-->
+<!--        ) AS AUTHENTICATED_TYPE,-->
+<!--        (-->
+<!--            SELECT-->
+<!--            AUTHENTICATED_FLAG-->
+<!--            FROM-->
+<!--            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_authenticate_history-->
+<!--            WHERE-->
+<!--            DEL_FLAG = '0'-->
+<!--            AND AUTHENTICATED_TYPE IN ( '0', '1' )-->
+<!--            <if test="endTime != ''">-->
+<!--                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}-->
+<!--            </if>-->
+<!--            AND USER_ID = uu.ID-->
+<!--            ORDER BY-->
+<!--            CREATED_TIME DESC ,-->
+<!--            id-->
+<!--            LIMIT 1-->
+<!--        ) AS AUTHENTICATED_FLAG,-->
+<!--        (-->
+<!--            SELECT-->
+<!--            count( id ) AS HistoryCount-->
+<!--            FROM-->
+<!--            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_authenticate_history-->
+<!--            WHERE-->
+<!--            DEL_FLAG = '0'-->
+<!--            AND AUTHENTICATED_TYPE IN ( '0', '1' )-->
+<!--            AND AUTHENTICATED_FLAG = '1'-->
+<!--            <if test="endTime != ''">-->
+<!--                and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}-->
+<!--            </if>-->
+<!--            AND USER_ID = uu.ID-->
+<!--        ) AS HistoryCount,-->
+<!--        ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (-->
+<!--            SELECT  GRID_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation-->
+<!--            WHERE DEL_FLAG = '0' AND USER_ID = uu.ID-->
+<!--            ORDER BY-->
+<!--            CREATED_TIME,-->
+<!--            id-->
+<!--            LIMIT 1-->
+<!--        )) AS DEPT_ID-->
+<!--        FROM-->
+<!--        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu ) newuu-->
+<!--        where  newuu.DEL_FLAG = '0'-->
+<!--        <if test="gridIdList != null and gridIdList.size() > 0">-->
+<!--            AND newuu.DEPT_ID in <include refid="foreachGridIdList"></include>-->
+<!--        </if>-->
+<!--        <if test="startTime != null and endTime != null and endTime != ''">-->
+<!--            AND DATE_FORMAT(newuu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
+<!--        </if>-->
+<!--        ) user-->
+<!--        GROUP BY user.DEPT_ID-->
     </select>
 
     <select id="selectCountGridWorkOrNot"
@@ -520,7 +520,7 @@
                 IFNULL( ama.id, 'unwork' ) id
             FROM
                 <include refid="fromGridCommunityStreet"></include>
-                LEFT JOIN esua_epdc_admin.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
+                LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0'
             WHERE
                 ad.type_key = 'grid_party'
                 AND ad.del_flag = 0
@@ -534,13 +534,13 @@
     </select>
 
     <sql id="fromGridCommunityStreet">
-        esua_epdc_admin.sys_dept ad
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
         <include refid="joinCommunityStreet"></include>
     </sql>
 
     <sql id="joinCommunityStreet">
-        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad1.id = ad.pid
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad2.id = ad1.pid
     </sql>
 
     <select id="selectListUnAuthorizedCountByStreetId"  resultType="com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO">
@@ -551,11 +551,11 @@
                 SELECT
                     u.NICKNAME, ad2.id streetId, ad2.`name` streetName, u.ID userId, gr.CREATED_TIME
                 FROM
-                    esua_epdc_user.epdc_user_grid_relation gr
-                    LEFT JOIN esua_epdc_admin.sys_dept ad ON gr.grid_id = ad.id
-                    LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-                    LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
-                    LEFT JOIN esua_epdc_user.epdc_user u ON gr.USER_ID = u.ID
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation gr
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON gr.grid_id = ad.id
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user u ON gr.USER_ID = u.ID
                 WHERE
                     u.STATE = '0' AND u.ID IS NOT NULL
                     <if test="startTime != null and endTime != null and endTime != ''">
@@ -577,8 +577,8 @@
                 SELECT
                     gr.grid_id gridId, u.ID userId, gr.CREATED_TIME
                 FROM
-                    esua_epdc_user.epdc_user_grid_relation gr
-                    LEFT JOIN esua_epdc_user.epdc_user u ON gr.USER_ID = u.ID
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation gr
+                    LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user u ON gr.USER_ID = u.ID
                 WHERE
                     u.STATE = '0' AND u.ID IS NOT NULL
                     <if test="startTime != null and endTime != null and endTime != ''">
@@ -605,7 +605,7 @@
             ad.`name`,
             ad.pid
             FROM
-            esua_epdc_admin.sys_dept ad
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
             WHERE
             ad.id IN <include refid="foreachAllDeptIdsShow"></include>
             AND ad.del_flag = 0
@@ -623,7 +623,7 @@
                     SELECT
                     AUTHENTICATED_TYPE
                     FROM
-                    esua_epdc_user.epdc_user_authenticate_history
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_authenticate_history
                     WHERE
                     DEL_FLAG = '0'
                     AND AUTHENTICATED_TYPE IN ( '0', '1' )
@@ -643,7 +643,7 @@
                     SELECT
                     AUTHENTICATED_FLAG
                     FROM
-                    esua_epdc_user.epdc_user_authenticate_history
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_authenticate_history
                     WHERE
                     DEL_FLAG = '0'
                     AND AUTHENTICATED_TYPE IN ( '0', '1' )
@@ -660,7 +660,7 @@
                     LIMIT 1
                 ) AS AUTHENTICATED_FLAG,
                 ifnull(if(uu.DEPT_ID = 0, NULL, uu.DEPT_ID), (
-                    SELECT  GRID_ID FROM esua_epdc_user.epdc_user_grid_relation
+                    SELECT  GRID_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation
                     WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
                     ORDER BY
                     CREATED_TIME,
@@ -668,7 +668,7 @@
                     LIMIT 1
                 )) AS DEPT_ID,
                 ifnull(if(uu.ALL_DEPT_IDS = '', NULL, uu.ALL_DEPT_IDS), (
-                    SELECT  ALL_DEPT_IDS FROM esua_epdc_user.epdc_user_grid_relation
+                    SELECT  ALL_DEPT_IDS FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation
                     WHERE DEL_FLAG = '0' AND USER_ID = uu.ID
                     ORDER BY
                     CREATED_TIME,
@@ -676,7 +676,7 @@
                     LIMIT 1
                 )) AS ALL_DEPT_IDS
                 FROM
-                esua_epdc_user.epdc_user uu
+                <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
                 where uu.DEL_FLAG = '0'
                 <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
                     AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -692,7 +692,7 @@
                 ad.`name`,
                 ad.pid
                 FROM
-                esua_epdc_admin.sys_dept ad
+                <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                 ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
@@ -716,13 +716,13 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON find_in_set(t0.id, ug.ALL_DEPT_IDS)
-        LEFT JOIN esua_epdc_user.epdc_user uu ON uu.STATE = '0' AND ug.USER_ID=uu.ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user_grid_relation ug ON find_in_set(t0.id, ug.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu ON uu.STATE = '0' AND ug.USER_ID=uu.ID
         AND uu.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND uu.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -749,12 +749,12 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_news.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_news"/>.epdc_news un ON find_in_set(t0.id, un.ALL_DEPT_IDS)
         AND un.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(un.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -787,13 +787,13 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN (select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from esua_epdc_events.epdc_issue eie
-                    left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID
+        LEFT JOIN (select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_issue eie
+                    left join <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept sd on eie.GRID_ID=sd.ID
                     where sd.del_flag='0')epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
         AND epen.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
@@ -820,7 +820,7 @@
             ad.`name`,
             ad.pid
             FROM
-            esua_epdc_admin.sys_dept ad
+            <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
             WHERE
             ad.id IN <include refid="foreachAllDeptIdsShow"></include>
             AND ad.del_flag = 0
@@ -830,10 +830,10 @@
         item.*,handle.STATE
         FROM
         (select eie.*
-        from esua_epdc_events.epdc_item eie
-        left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID
+        from <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item eie
+        left join <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept sd on eie.GRID_ID=sd.ID
         where sd.del_flag='0') item
-        LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process WHERE
+        LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process WHERE
         DEL_FLAG = '0' and (state=0 or state=5 or state=10 )
         <if test="endTime != null and endTime != ''">
             AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
@@ -843,7 +843,7 @@
         </if>
         GROUP BY ITEM_ID
         ) maxitem ON maxitem.ITEM_ID = item.ID
-        LEFT JOIN esua_epdc_events.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item_handle_process handle ON maxitem.ITEM_ID = handle.ITEM_ID
         AND maxitem.CREATED_TIME = handle.CREATED_TIME)epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
         AND epen.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
@@ -869,12 +869,12 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
         AND epgr.DEL_FLAG = '0'
         AND (
             epgr.STATE = '10'
@@ -892,7 +892,7 @@
                 #{deptId}
             </foreach>
         </if>
-        LEFT JOIN esua_epdc_group.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_user_group ugp ON ugp.GROUP_ID = epgr.ID
         AND ugp.DEL_FLAG = '0'
         AND ugp.LORD_FLAG = '1'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
@@ -924,12 +924,12 @@
         ad.`name`,
         ad.pid
         FROM
-        esua_epdc_admin.sys_dept ad
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
         WHERE
         ad.id IN<include refid="foreachAllDeptIdsShow"></include>
         AND ad.del_flag = 0
         ) t0
-        LEFT JOIN esua_epdc_group.epdc_group epgr ON FIND_IN_SET(t0.id,epgr.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_group epgr ON FIND_IN_SET(t0.id,epgr.ALL_DEPT_IDS)
         AND epgr.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -948,7 +948,7 @@
                 #{deptId}
             </foreach>
         </if>
-        LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_user_group ug ON epgr.id = ug.group_id
         AND ug.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -978,12 +978,12 @@
         ad.`name`,
         ad.pid
         FROM
-        esua_epdc_admin.sys_dept ad
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
         WHERE
         ad.id IN <include refid="foreachAllDeptIdsShow"></include>
         AND ad.del_flag = 0
         ) t0
-        LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
         AND epgr.DEL_FLAG = '0'
         AND (
         epgr.STATE = '10'
@@ -1001,7 +1001,7 @@
                 #{deptId}
             </foreach>
         </if>
-        LEFT JOIN esua_epdc_group.epdc_topic ug ON epgr.id = ug.group_id
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_group"/>.epdc_topic ug ON epgr.id = ug.group_id
         AND ug.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -1026,12 +1026,12 @@
                     ad.`name`,
                     ad.pid
                 FROM
-                    esua_epdc_admin.sys_dept ad
+                    <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
                 WHERE
         ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_custom.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_custom"/>.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
         AND uu.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
@@ -1122,7 +1122,7 @@
         FROM
         epdc_user uu
         ) newuu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
         <include refid="joinCommunityStreet"></include>
 
         WHERE newuu.DEL_FLAG = '0'
@@ -1258,7 +1258,7 @@
         FROM
         epdc_user uu
         ) newuu
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON newuu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0'
         <include refid="joinCommunityStreet"></include>
         where
         newuu.DEL_FLAG = '0'
@@ -1309,7 +1309,7 @@
         ad.`name`,
         ad.pid
         FROM
-        esua_epdc_admin.sys_dept ad
+        <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad
         WHERE
         ad.del_flag = 0
         AND ad.type_key = 'grid_party'
@@ -1317,7 +1317,7 @@
             AND  ad.id in <include refid="foreachGridIdList"></include>
         </if>
         ) t0
-        LEFT JOIN esua_epdc_custom.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
+        LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_custom"/>.epdc_enterprise_info uu ON  find_in_set(t0.id,uu.ALL_DEPT_IDS)
         AND uu.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
             AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}

epdc-cloud-analysis-pc/src/main/resources/mapper/user/YoungMemberRankDao.xml

@@ -31,11 +31,11 @@ FROM (
 				uu.ID userId,
 				TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()) age
 			FROM
-				esua_epdc_user.epdc_user uu
-				LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID
+				<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_user"/>.epdc_user uu
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad ON uu.DEPT_ID = ad.ID
 				AND ad.type_key = 'grid_party'
-				LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-				LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad1 ON ad.pid = ad1.id
+				LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept ad2 ON ad1.pid = ad2.id
 			WHERE
 				uu.DEL_FLAG = '0'
 				AND uu.PARTY_FLAG = '1'