diff --git a/epdc-cloud-analysis-pc/pom.xml b/epdc-cloud-analysis-pc/pom.xml index b365469..7e205a3 100644 --- a/epdc-cloud-analysis-pc/pom.xml +++ b/epdc-cloud-analysis-pc/pom.xml @@ -127,11 +127,11 @@ dev dev - - 2 - 47.104.224.45 - 6379 - elink@888 + + 9 + 114.215.125.123 + 9603 + epdc!redis@master1405 false diff --git a/epdc-cloud-analysis-pc/src/main/resources/application-dev.yml b/epdc-cloud-analysis-pc/src/main/resources/application-dev.yml index 0c2503c..034857b 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/application-dev.yml +++ b/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 diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml index 5030308..b17490e 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/common/EpdcTableName.xml @@ -10,4 +10,5 @@ yushan_esua_epdc_group yushan_esua_epdc_mutuality yushan_esua_epdc_news + yushan_esua_epdc_user diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/issue/IssueAnalysisDao.xml index 03a8f7e..f79f209 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/issue/IssueAnalysisDao.xml +++ b/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 + .epdc_issue ei + LEFT JOIN .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 + .epdc_issue ei + LEFT JOIN .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 + .epdc_issue ei WHERE ei.DEL_FLAG = '0' GROUP BY @@ -160,7 +160,7 @@ SUM( ei.ISSUE_STATE = 4 ) AS itemNum, '2' as categoryLevel FROM - esua_epdc_events.epdc_issue ei + .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 + .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 + .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 + .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 + .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 + .epdc_issue ei + LEFT JOIN .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 + .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 + .epdc_issue ei + LEFT JOIN .epdc_events ee ON ee.ID = ei.EVENT_ID AND ee.DEL_FLAG = '0' WHERE ei.DEL_FLAG = '0' diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/item/ItemAnalysisDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/item/ItemAnalysisDao.xml index 4da8ddd..69125cd 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/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 .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 .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 .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 .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, + .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 + .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 .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 .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 .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 + .epdc_item_grid_platform eigp + LEFT JOIN .epdc_item ei ON ei.ID = eigp.REFERENCE_ID AND ei.DEL_FLAG = '0' WHERE eigp.DEL_FLAG = '0' @@ -238,7 +238,7 @@ AND EXISTS ( - SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp + SELECT eihp.HANDLER_DEPT FROM .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 .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 .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 .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 + .epdc_item_grid_platform eigp + LEFT JOIN .epdc_item ei ON ei.ID = eigp.REFERENCE_ID AND ei.DEL_FLAG = '0' WHERE eigp.DEL_FLAG = '0' @@ -298,7 +298,7 @@ AND EXISTS ( - SELECT eihp.HANDLER_DEPT FROM esua_epdc_events.epdc_item_handle_process eihp + SELECT eihp.HANDLER_DEPT FROM .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 + .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 + .epdc_item_grid_platform eigp + LEFT JOIN .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 .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 .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 .epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS handleCount, + ( SELECT COUNT(eid.ID) FROM .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 .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 + .epdc_item ei WHERE ei.DEL_FLAG = '0' AND ei.GRID_ID IN @@ -441,7 +441,7 @@ CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize}) t - LEFT JOIN esua_epdc_events.epdc_img eimg ON eimg.REFERENCE_ID = t.EVENT_ID + LEFT JOIN .epdc_img eimg ON eimg.REFERENCE_ID = t.EVENT_ID AND eimg.DEL_FLAG = '0'; @@ -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 + .epdc_item ei + LEFT JOIN .epdc_events ee ON ee.ID = ei.EVENT_ID AND ee.DEL_FLAG = '0' WHERE ei.DEL_FLAG = '0' diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/topic/TopicAnalysisDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/topic/TopicAnalysisDao.xml index dcdfda2..7b179ac 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/topic/TopicAnalysisDao.xml +++ b/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 + .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 + .epdc_topic et + LEFT JOIN .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 + .epdc_topic t WHERE t.DEL_FLAG = '0' AND t.STATE = 0 diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml index 6f64985..3ea103d 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/MetaUserRegisterRankDao.xml +++ b/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 + .epdc_user uu + LEFT JOIN .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 .sys_dept ad1 ON ad1.id = ad.pid + LEFT JOIN .sys_dept ad2 ON ad2.id = ad1.pid WHERE uu.DEL_FLAG = '0' diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/OldMemberRankDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/OldMemberRankDao.xml index 69e8600..cd95e8d 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/OldMemberRankDao.xml +++ b/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 + .epdc_user uu + LEFT JOIN .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 .sys_dept ad1 ON ad.pid = ad1.id + LEFT JOIN .sys_dept ad2 ON ad1.pid = ad2.id WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml index b8b620e..96798b6 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/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' + .epdc_user uu + LEFT JOIN .sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' AND ad.DEL_FLAG = '0' WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' @@ -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' + .epdc_user uu + LEFT JOIN .epdc_party_authentication_failed uf ON uu.id = uf.user_id + LEFT JOIN .sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' 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 + .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 .epdc_user_grid_relation ug ON ug.GRID_ID = t0.id AND ug.DEL_FLAG = '0' + LEFT JOIN .sys_dept ad1 ON ad1.id = t0.pid + LEFT JOIN .sys_dept ad2 ON ad2.id = ad1.pid GROUP BY t0.id ORDER BY @@ -122,13 +122,13 @@ - - - + + + - + @@ -149,7 +149,7 @@ SELECT count(1) FROM - esua_epdc_news.epdc_news + .epdc_news WHERE DEL_FLAG = '0' @@ -162,7 +162,7 @@ SELECT count(1) FROM - esua_epdc_news.epdc_notice + .epdc_notice WHERE DEL_FLAG = '0' @@ -174,7 +174,7 @@ (SELECT count(1) FROM - esua_epdc_events.epdc_issue + .epdc_issue WHERE DEL_FLAG = '0' @@ -183,7 +183,7 @@ AND GRID_ID = dept.id ) AS eventCount FROM - esua_epdc_admin.sys_dept dept + .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 + .epdc_item item + LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM .epdc_item_handle_process WHERE DEL_FLAG = '0' and (state=0 or state=5 or state=10 ) @@ -216,7 +216,7 @@ 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 .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' + .epdc_group epgr + LEFT JOIN .epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0' AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} - LEFT JOIN esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0' + LEFT JOIN .epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0' AND DATE_FORMAT(ut.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} @@ -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 + .epdc_user u + LEFT JOIN .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 .sys_dept ad1 ON ad.pid = ad1.id + LEFT JOIN .sys_dept ad2 ON ad1.pid = ad2.id WHERE u.DEL_FLAG = '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 + .sys_dept ad + LEFT JOIN .epdc_dept_ma_code ac ON ad.id = ac.GRID_ID + LEFT JOIN .sys_dept ad1 ON ad.pid = ad1.id + LEFT JOIN .sys_dept ad2 ON ad1.pid = ad2.id WHERE ad.type_key = 'grid_party' @@ -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 + .epdc_user uu + LEFT JOIN .sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' + LEFT JOIN .sys_dept ad1 ON ad.pid = ad1.id + LEFT JOIN .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 - 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 .epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' + LEFT JOIN .sys_role_data_scope ards ON ards.dept_id = ad.id + LEFT JOIN .sys_role r ON ards.role_id = r.id AND r.DEL_FLAG = 0 and r.type_key = 'gridLeader' + LEFT JOIN .sys_role_user ru ON r.id = ru.role_id + LEFT JOIN .sys_user u ON ru.user_id = u.id AND u.del_flag = 0 WHERE ad.type_key = 'grid_party' @@ -412,7 +412,7 @@ - esua_epdc_admin.sys_dept ad + .sys_dept ad - 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 .sys_dept ad1 ON ad1.id = ad.pid + LEFT JOIN .sys_dept ad2 ON ad2.id = ad1.pid