diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr index a7e5771..b52ecbc 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_month.ktr @@ -647,7 +647,7 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set(${commId}, n.ALL_DEPT_IDS) - AND MONTH(n.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -869,7 +869,7 @@ WHERE i.DEL_FLAG = '0' AND ISSUE_STATE ='2' AND find_in_set(${commId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -981,7 +981,7 @@ WHERE i.DEL_FLAG = '0' AND i.ITEM_STATE = '10' AND find_in_set(${commId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1092,7 +1092,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${commId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1203,7 +1203,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${commId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr index 22352d4..166e58f 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query.ktr @@ -586,6 +586,81 @@ + + source_ys_group + ${db.mysql.epdc.source.ys.host} + MYSQL + Native + ${db.mysql.source.schema.ys.group} + ${db.mysql.epdc.source.ys.port} + ${db.mysql.epdc.source.ys.username} + ${db.mysql.epdc.source.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + utf8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.source.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + source_ys_user ${db.mysql.epdc.source.ys.host} @@ -668,13 +743,13 @@ Y - 日新增议题数 - 设置日新增议题数变量 + 总议题数 + 设置议题数变量 Y - 日新增项目数 - 设置日新增项目数变量 + 项目数 + 设置项目数变量 Y @@ -682,10 +757,1057 @@ 设置社区ID，社区name Y + + 本月用户注册党员数 + 设置上月用户注册党员数 + Y + + + 本月用户注册数 + 设置上月用户注册数 + Y + + + 上月用户注册社群数 + 设置上月用户注册社群数 + Y + + + 设置变量 3 + 本月用户注册数 + Y + + + 设置变量 4 + 本月用户注册党员数 + Y + + + 设置变量 5 + 上月用户注册社群数 + Y + + + 当月总议题数项目数 + 设置上月总议题数项目数变量 + Y + + + 设置变量 + 当月总议题数项目数 + Y + - 日新增议题数 - TableInput + 上月用户注册社群数 + TableInput + + Y + + 1 + + none + + + source_ys_group + SELECT + COUNT(id) as reg_group_num +FROM + epdc_group +WHERE + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') + AND find_in_set(${gridId}, ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + topic_num + 42 + 0 + 今年总议题数 + topic_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + project_num + 41 + 0 + 今年总议题数 + project_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + grid_id + 15 + 0 + 今年总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 今年总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 928 + 432 + Y + + + + 本月用户注册党员数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.ID) as reg_party_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' +AND u.PARTY_FLAG = '1' +AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') +AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + topic_num + 42 + 0 + 今年总议题数 + topic_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + project_num + 41 + 0 + 今年总议题数 + project_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + grid_id + 15 + 0 + 今年总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 今年总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 928 + 320 + Y + + + + 本月用户注册数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.ID) as reg_user_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' + AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + topic_num + 42 + 0 + 今年总议题数 + topic_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + project_num + 41 + 0 + 今年总议题数 + project_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + grid_id + 15 + 0 + 今年总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 今年总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 928 + 208 + Y + + + + 注册用户数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.id) register_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' +AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + + + + + + + + + 352 + 320 + Y + + + + 社区ID，社区name + TableInput + + Y + + 1 + + none + + + source_ys_admin + SELECT + id AS commId, + NAME AS commName +FROM + sys_dept +WHERE + id = ( + SELECT + pid + FROM + sys_dept + WHERE + del_flag = '0' + AND id = ${gridId} + ) +AND del_flag = '0' + 0 + + N + Y + N + N + + + BigNumber + normal + topic_num + 42 + 0 + 上月总议题数 + topic_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + project_num + 41 + 0 + 上月总议题数 + project_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + grid_id + 15 + 0 + 上月总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 上月总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 352 + 96 + Y + + + + 总议题数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + COUNT(i.ID) AS case_num +FROM + epdc_issue i +WHERE + i.DEL_FLAG = '0' + AND find_in_set(${gridId}, i.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + participate_of_news + 34 + 0 + 新闻参与量阅读量点赞量 + participate_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + read_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + read_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + like_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + like_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 352 + 208 + Y + + + + 设置上月用户注册党员数 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num + reg_party_num + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 320 + Y + + + + 设置上月用户注册数 + SetVariable + + Y + + 1 + + none + + + + + reg_user_num + reg_user_num + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 208 + Y + + + + 设置上月用户注册社群数 + SetVariable + + Y + + 1 + + none + + + + + reg_group_num + reg_group_num + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 432 + Y + + + + 设置变量 3 + SetVariable + + Y + + 1 + + none + + + + + reg_user_num + reg_user_num + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 208 + Y + + + + 设置变量 4 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num + reg_party_num + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 320 + Y + + + + 设置变量 5 + SetVariable + + Y + + 1 + + none + + + + + reg_group_num + reg_group_num + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 432 + Y + + + + 设置注册用户数变量 + SetVariable + + Y + + 1 + + none + + + + + register_num + register_num + PARENT_JOB + + + + Y + + + + + + + + + + 592 + 320 + Y + + + + 设置社区ID，社区name + SetVariable + + Y + + 1 + + none + + + + + commId + commId + PARENT_JOB + + + + commName + commName + PARENT_JOB + + + + Y + + + + + + + + + + 592 + 96 + Y + + + + 设置议题数变量 + SetVariable + + Y + + 1 + + none + + + + + case_num + case_num + PARENT_JOB + + + + Y + + + + + + + + + + 592 + 208 + Y + + + + 设置项目数变量 + SetVariable Y @@ -694,91 +1816,15 @@ none - source_ys_events - SELECT - COUNT(i.ID) AS case_num -FROM - epdc_issue i -WHERE - i.DEL_FLAG = '0' - AND find_in_set(${gridId}, i.ALL_DEPT_IDS); - 0 - - N - Y - N - N - - - BigNumber - normal - participate_of_news - 34 - 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - read_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - read_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - like_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - + + + project_num + project_num + PARENT_JOB + + + + Y @@ -788,13 +1834,13 @@ WHERE - 352 - 208 + 592 + 432 Y - 日新增项目数 + 项目数 TableInput Y @@ -904,47 +1950,7 @@ WHERE - 注册用户数 - TableInput - - Y - - 1 - - none - - - source_ys_user - SELECT - COUNT(u.id) register_num -FROM - epdc_user u -WHERE - u.DEL_FLAG = '0' -AND find_in_set(${gridId}, u.ALL_DEPT_IDS); - 0 - - N - Y - N - N - - - - - - - - - - - 352 - 320 - Y - - - - 社区ID，社区name + 当月总议题数项目数 TableInput Y @@ -954,23 +1960,42 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); none - source_ys_admin + source_ys_events SELECT - id AS commId, - NAME AS commName + SUM(topic_num) AS topic_num_month, + SUM(project_num) AS project_num_month, + GRID_ID AS grid_id, + DATE_FORMAT(NOW(),'%Y-%m') AS cal_date FROM - sys_dept -WHERE - id = ( + ( SELECT - pid + COUNT(id) AS topic_num, + 0 AS project_num, + GRID_ID FROM - sys_dept + epdc_issue WHERE - del_flag = '0' - AND id = ${gridId} - ) -AND del_flag = '0' + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + AND GRID_ID = ${gridId} + GROUP BY + GRID_ID + UNION ALL + SELECT + 0 AS topic_num, + COUNT(id) AS project_num, + GRID_ID + FROM + epdc_item + WHERE + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + AND GRID_ID = ${gridId} + GROUP BY + GRID_ID + ) t +GROUP BY + t.GRID_ID 0 N @@ -1081,12 +2106,12 @@ AND del_flag = '0' 352 - 96 + 576 Y - 设置日新增议题数变量 + 设置上月总议题数项目数变量 SetVariable Y @@ -1098,76 +2123,26 @@ AND del_flag = '0' - case_num - case_num + cal_date + cal_date PARENT_JOB - - Y - - - - - - - - - - 592 - 208 - Y - - - - 设置日新增项目数变量 - SetVariable - - Y - - 1 - - none - - - - project_num - project_num + grid_id + grid_id PARENT_JOB - - Y - - - - - - - - - - 592 - 432 - Y - - - - 设置注册用户数变量 - SetVariable - - Y - - 1 - - none - - - - register_num - register_num + project_num_month + project_num_month + PARENT_JOB + + + + topic_num_month + topic_num_month PARENT_JOB @@ -1183,12 +2158,12 @@ AND del_flag = '0' 592 - 320 + 576 Y - 设置社区ID，社区name + 设置变量 SetVariable Y @@ -1200,16 +2175,16 @@ AND del_flag = '0' - commId - commId + topic_num_month + topic_num_month PARENT_JOB - + 0 - commName - commName + project_num_month + project_num_month PARENT_JOB - + 0 Y @@ -1222,8 +2197,8 @@ AND del_flag = '0' - 592 - 96 + 208 + 576 Y diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr index d3f30bd..96946d2 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_month.ktr @@ -850,7 +850,7 @@ FROM epdc_issue WHERE DEL_FLAG = '0' - AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY GRID_ID @@ -863,7 +863,7 @@ FROM epdc_item WHERE DEL_FLAG = '0' - AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY GRID_ID @@ -1003,7 +1003,7 @@ FROM WHERE u.DEL_FLAG = '0' AND u.PARTY_FLAG = '1' -AND MONTH(u.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) +AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 @@ -1137,7 +1137,7 @@ FROM epdc_user u WHERE u.DEL_FLAG = '0' - AND MONTH(u.REGISTER_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 @@ -1271,7 +1271,7 @@ FROM epdc_group WHERE DEL_FLAG = '0' - AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr index f220c22..aa67f37 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_update.ktr @@ -565,6 +565,135 @@ VALUES Y + + 网格排名表月度数据清空 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + delete from ys_grid_rank where grid_id = ${gridId} and cal_date = date_format(now(), '%Y-%m') + N + + + + + + + + + + + + + + + + 448 + 240 + Y + + + + 网格注册数统计月度数据清空 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + delete from ys_grid_reg where grid_id = ${gridId} and cal_date = date_format(now(), '%Y-%m') + N + + + + + + + + + + + + + + + + 448 + 368 + Y + + + + 网格注册信息表 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + INSERT INTO ys_grid_reg ( + comm_id, + comm_name, + cal_date, + name, + grid_id, + reg_user_num, + reg_party_num, + reg_group_num, + create_time, + update_time +) +VALUES + ( + ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null + ) + N + + + + + + + + + + + + + + + + 272 + 368 + Y + + diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr index b42ae72..e5df525 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_month.ktr @@ -867,7 +867,7 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set(${streetId}, n.ALL_DEPT_IDS) - AND MONTH(n.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1089,7 +1089,7 @@ WHERE i.DEL_FLAG = '0' AND ISSUE_STATE ='2' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1201,7 +1201,7 @@ WHERE i.DEL_FLAG = '0' AND i.ITEM_STATE = '10' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1312,7 +1312,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -1423,7 +1423,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND MONTH(i.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr index 6463fb5..8600c4a 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_query.ktr @@ -616,7 +616,7 @@ FROM epdc_volunteer_info WHERE DEL_FLAG = '0' -AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) +AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N @@ -680,7 +680,7 @@ FROM epdc_act_info WHERE DEL_FLAG = '0' -AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) +AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr index faf70cc..d6138e3 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr @@ -1803,8 +1803,8 @@ LIMIT 5 source_ys_property SELECT - ${commId} as comm_id, - '${commName}' as comm_name, + ${commId} as comm_id, + '${commName}' as comm_name, DATE_FORMAT(NOW(), '%Y') AS cal_date, avg(es.SCORE) AS score_num, sum( @@ -1822,7 +1822,7 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS good_rate, + ) / COUNT(pp.id) AS good_rate, sum( CASE WHEN es.SCORE < 60 THEN @@ -1838,20 +1838,18 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS bad_rate, - ep.PROPERTY_NAME AS NAME, + ) / COUNT(pp.id) AS bad_rate, + pp.PROJECT_NAME AS NAME, now() AS create_time FROM - epdc_property ep -LEFT JOIN epdc_property_project pp ON pp.PROPERTY_ID = ep.id -LEFT JOIN epdc_property_project_score es ON pp.id = es.PROJECT_ID + epdc_property_project_score es +LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE - ep.DEL_FLAG = '0' - AND pp.DEL_FLAG = '0' - AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND YEAR (ep.CREATED_TIME) = YEAR (NOW()) + pp.DEL_FLAG = '0' + AND find_in_set(${commId}, pp.ALL_DEPT_IDS) + AND YEAR (es.CREATED_TIME) = YEAR (NOW()) GROUP BY - ep.id; + pp.id; 0 N @@ -2059,7 +2057,7 @@ FROM WHERE DEL_FLAG = '0' AND find_in_set(${commId}, ALL_DEPT_IDS) - AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') GROUP BY NEWS_PROPERTY 0 @@ -2107,7 +2105,7 @@ FROM epdc_events WHERE DEL_FLAG = '0' -AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) +AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND find_in_set(${commId}, ALL_DEPT_IDS) ORDER BY COMMENT_NUM DESC @@ -2308,8 +2306,8 @@ LIMIT 5 source_ys_property SELECT - ${commId} as comm_id, - '${commName}' as comm_name, + ${commId} as comm_id, + '${commName}' as comm_name, DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') AS cal_date, avg(es.SCORE) AS score_num, sum( @@ -2327,7 +2325,7 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS good_rate, + ) / COUNT(pp.id) AS good_rate, sum( CASE WHEN es.SCORE < 60 THEN @@ -2343,20 +2341,18 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS bad_rate, - ep.PROPERTY_NAME AS NAME, + ) / COUNT(pp.id) AS bad_rate, + pp.PROJECT_NAME AS NAME, now() AS create_time FROM - epdc_property ep -LEFT JOIN epdc_property_project pp ON pp.PROPERTY_ID = ep.id -LEFT JOIN epdc_property_project_score es ON pp.id = es.PROJECT_ID + epdc_property_project_score es +LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE - ep.DEL_FLAG = '0' - AND pp.DEL_FLAG = '0' - AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND MONTH(ep.CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + pp.DEL_FLAG = '0' + AND find_in_set(${commId}, pp.ALL_DEPT_IDS) + AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') GROUP BY - ep.id; + pp.id; 0 N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_day.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_day.ktr new file mode 100644 index 0000000..66598c3 --- /dev/null +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_day.ktr @@ -0,0 +1,1403 @@ + + + + screen_ys_commu_hot_topic_update_day + + + + Normal + 0 + / + + + + + + + + + + + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + TRANSNAME + Y + TRANSNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + + LINES_UPDATED + Y + LINES_UPDATED + + + + LINES_INPUT + Y + LINES_INPUT + + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + + LINES_REJECTED + Y + LINES_REJECTED + + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + CLIENT + N + CLIENT + + + + + +
+ + + + ID_BATCH + Y + ID_BATCH + + + SEQ_NR + Y + SEQ_NR + + + LOGDATE + Y + LOGDATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + INPUT_BUFFER_ROWS + Y + INPUT_BUFFER_ROWS + + + OUTPUT_BUFFER_ROWS + Y + OUTPUT_BUFFER_ROWS + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + LOG_FIELD + N + LOG_FIELD + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + METRICS_DATE + Y + METRICS_DATE + + + METRICS_CODE + Y + METRICS_CODE + + + METRICS_DESCRIPTION + Y + METRICS_DESCRIPTION + + + METRICS_SUBJECT + Y + METRICS_SUBJECT + + + METRICS_TYPE + Y + METRICS_TYPE + + + METRICS_VALUE + Y + METRICS_VALUE + + + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2020/04/24 13:33:30.642 + - + 2020/04/24 13:33:30.642 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + N + + + + + source_ys_events + ${db.mysql.epdc.source.ys.host} + MYSQL + Native + ${db.mysql.source.schema.ys.events} + ${db.mysql.epdc.source.ys.port} + ${db.mysql.epdc.source.ys.username} + ${db.mysql.epdc.source.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + UTF-8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.source.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + source_ys_news + ${db.mysql.epdc.source.ys.host} + MYSQL + Native + ${db.mysql.source.schema.ys.news} + ${db.mysql.epdc.source.ys.port} + ${db.mysql.epdc.source.ys.username} + ${db.mysql.epdc.source.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + UTF-8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.source.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + source_ys_property + ${db.mysql.epdc.source.ys.host} + MYSQL + Native + ${db.mysql.source.schema.ys.property} + ${db.mysql.epdc.source.ys.port} + ${db.mysql.epdc.source.ys.username} + ${db.mysql.epdc.source.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + UTF-8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.source.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + target_yushan + ${db.mysql.epdc.target.ys.host} + MYSQL + Native + ${db.mysql.target.schema.yushandb} + ${db.mysql.epdc.target.ys.port} + ${db.mysql.epdc.target.ys.username} + ${db.mysql.epdc.target.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + UTF-8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.target.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + + 统计热议话题 + 字段选择 + Y + + + 字段选择 + 写入热议话题 + Y + + + 字段选择 3 + 写入新闻资讯 + Y + + + 统计新闻资讯 + 字段选择 3 + Y + + + 字段选择 3 2 + 写入物业考核 + Y + + + 统计物业考核 + 字段选择 3 2 + Y + + + + 写入新闻资讯 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} +
ys_news
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 464 + 464 + Y + + + + 写入热议话题 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} + ys_commu_hot_topic
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 464 + 320 + Y + + + + 写入物业考核 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} + ys_pro_chk_score
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 464 + 608 + Y + + + + 字段选择 + SelectValues + + Y + + 1 + + none + + + + + comm_id + + + comm_name + + + cal_date + + + name + + + topic_id + + + value + + + create_time + + N + + + + + + + + + + + 304 + 320 + Y + + + + 字段选择 3 + SelectValues + + Y + + 1 + + none + + + + + cal_date + + + name + + + value + + + create_time + + + comm_id + + + comm_name + + N + + + + + + + + + + + 304 + 464 + Y + + + + 字段选择 3 2 + SelectValues + + Y + + 1 + + none + + + + + comm_id + + + comm_name + + + cal_date + + + name + + + score_num + + + good_num + + + good_rate + + + bad_num + + + bad_rate + + + create_time + + N + + + + + + + + + + + 304 + 608 + Y + + + + 统计新闻资讯 + TableInput + + Y + + 1 + + none + + + source_ys_news + SELECT + ${commId} as comm_id, + '${commName}' as comm_name, + COUNT(id) AS value, + DATE_FORMAT(NOW(), '%Y-%m') AS cal_date, + NEWS_PROPERTY AS name, + now() AS create_time +FROM + epdc_news +WHERE + DEL_FLAG = '0' + AND find_in_set(${commId}, ALL_DEPT_IDS) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') +GROUP BY + NEWS_PROPERTY + 0 + + N + Y + N + N + + + + + + + + + + + 160 + 464 + Y + + + + 统计热议话题 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + ${commId} as comm_id, + '${commName}' as comm_name, + id AS topic_id, + EVENT_CONTENT AS name, + COMMENT_NUM AS value, + DATE_FORMAT(NOW(), '%Y-%m') AS cal_date, + now() AS create_time +FROM + epdc_events +WHERE + DEL_FLAG = '0' +AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') +AND find_in_set(${commId}, ALL_DEPT_IDS) +ORDER BY + COMMENT_NUM DESC +LIMIT 5 + 0 + + N + Y + N + N + + + String + normal + ID + 32 + -1 + 统计用户行为分析 + ID + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Timestamp + normal + created_time + 0 + -1 + 统计用户行为分析 + created_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Timestamp + normal + updated_time + 0 + -1 + 统计用户行为分析 + updated_time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + updated_by + 6 + -1 + 统计用户行为分析 + updated_by + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + created_by + 6 + -1 + 统计用户行为分析 + created_by + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + time + 10 + -1 + 统计用户行为分析 + time + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + visitor_num + 34 + 0 + 统计用户行为分析 + visitor_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 160 + 320 + Y + + + + 统计物业考核 + TableInput + + Y + + 1 + + none + + + source_ys_property + SELECT + ${commId} as comm_id, + '${commName}' as comm_name, + DATE_FORMAT(NOW(), '%Y-%m') AS cal_date, + avg(es.SCORE) AS score_num, + sum( + CASE + WHEN es.SCORE >= 60 THEN + 1 + ELSE + 0 + END + ) AS good_num, + sum( + CASE + WHEN es.SCORE >= 60 THEN + 1 + ELSE + 0 + END + ) / COUNT(pp.id) AS good_rate, + sum( + CASE + WHEN es.SCORE < 60 THEN + 1 + ELSE + 0 + END + ) AS bad_num, + sum( + CASE + WHEN es.SCORE < 60 THEN + 1 + ELSE + 0 + END + ) / COUNT(pp.id) AS bad_rate, + pp.PROJECT_NAME AS NAME, + now() AS create_time +FROM + epdc_property_project_score es +LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID +WHERE + pp.DEL_FLAG = '0' + AND find_in_set(${commId}, pp.ALL_DEPT_IDS) + AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') +GROUP BY + pp.id; + 0 + + N + Y + N + N + + + + + + + + + + + 160 + 608 + Y + + + + + + + N + + diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr index 3170ba5..24000fa 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update_year.ktr @@ -1328,8 +1328,8 @@ LIMIT 5 source_ys_property SELECT - ${commId} as comm_id, - '${commName}' as comm_name, + ${commId} as comm_id, + '${commName}' as comm_name, DATE_FORMAT(NOW(), '%Y') - 1 AS cal_date, avg(es.SCORE) AS score_num, sum( @@ -1347,7 +1347,7 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS good_rate, + ) / COUNT(pp.id) AS good_rate, sum( CASE WHEN es.SCORE < 60 THEN @@ -1363,21 +1363,19 @@ LIMIT 5 ELSE 0 END - ) / COUNT(ep.id) AS bad_rate, - ep.PROPERTY_NAME AS NAME, + ) / COUNT(pp.id) AS bad_rate, + pp.PROJECT_NAME AS NAME, now() AS create_time FROM - epdc_property ep -LEFT JOIN epdc_property_project pp ON pp.PROPERTY_ID = ep.id -LEFT JOIN epdc_property_project_score es ON pp.id = es.PROJECT_ID + epdc_property_project_score es +LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE - ep.DEL_FLAG = '0' - AND pp.DEL_FLAG = '0' - AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND ep.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) -AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) + pp.DEL_FLAG = '0' + AND find_in_set(${commId}, pp.ALL_DEPT_IDS) + AND es.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) + AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) GROUP BY - ep.id; + pp.id; 0 N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update_day.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update_day.ktr new file mode 100644 index 0000000..922d185 --- /dev/null +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update_day.ktr @@ -0,0 +1,574 @@ + + + + screen_ys_grid_rank_month_update_day + + + + Normal + 0 + / + + + + + + + + + + + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + TRANSNAME + Y + TRANSNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + + LINES_UPDATED + Y + LINES_UPDATED + + + + LINES_INPUT + Y + LINES_INPUT + + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + + LINES_REJECTED + Y + LINES_REJECTED + + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + CLIENT + N + CLIENT + + + + + +
+ + + + ID_BATCH + Y + ID_BATCH + + + SEQ_NR + Y + SEQ_NR + + + LOGDATE + Y + LOGDATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + INPUT_BUFFER_ROWS + Y + INPUT_BUFFER_ROWS + + + OUTPUT_BUFFER_ROWS + Y + OUTPUT_BUFFER_ROWS + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + LOG_FIELD + N + LOG_FIELD + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + METRICS_DATE + Y + METRICS_DATE + + + METRICS_CODE + Y + METRICS_CODE + + + METRICS_DESCRIPTION + Y + METRICS_DESCRIPTION + + + METRICS_SUBJECT + Y + METRICS_SUBJECT + + + METRICS_TYPE + Y + METRICS_TYPE + + + METRICS_VALUE + Y + METRICS_VALUE + + + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2020/04/27 09:32:01.126 + - + 2020/04/27 09:32:01.126 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + N + + + + + target_yushan + ${db.mysql.epdc.target.ys.host} + MYSQL + Native + ${db.mysql.target.schema.yushandb} + ${db.mysql.epdc.target.ys.port} + ${db.mysql.epdc.target.ys.username} + ${db.mysql.epdc.target.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + utf8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.target.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + + + 网格排名表 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + INSERT INTO ys_grid_rank ( + cal_date, + name, + grid_id, + comm_id, + comm_name, + topic_num, + project_num, + create_time, + update_time +) +VALUES + ( + DATE_FORMAT(NOW(), '%Y-%m'), '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num_month}, ${project_num_month}, NOW(), null + ) + N + + + + + + + + + + + + + + + + 543 + 193 + Y + + + + + + + N + + diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr index 4d3a961..ab575d8 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_year_update.ktr @@ -542,7 +542,7 @@ ) VALUES ( - DATE_FORMAT(NOW(),'%Y') - 1, '${communityGrid}', ${gridId}, ${commId}, ${commName}, ${topic_num}, ${project_num}, NOW(), null + DATE_FORMAT(NOW(),'%Y') - 1, '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num}, ${project_num}, NOW(), null ) N diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr index 0073a28..43189fc 100644 --- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr +++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr @@ -1006,7 +1006,7 @@ FROM WHERE DEL_FLAG = '0' AND find_in_set(${streetId}, ALL_DEPT_IDS) - AND MONTH(CREATED_TIME) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') GROUP BY NEWS_PROPERTY 0 diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb index dcb9eb5..bf5ba06 100644 --- a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb +++ b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_day.kjb @@ -359,7 +359,7 @@ N Y 0 - 432 + 560 208 @@ -397,7 +397,7 @@ N Y 0 - 624 + 752 208 @@ -423,11 +423,105 @@ 208 + + 清空表 + + TRANS + + filename + + ${Internal.Entry.Current.Directory}/yushan_day_delete_co.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + Pentaho local + + Y + + N + Y + 0 + 416 + 208 + + + + 写入表 + + TRANS + + filename + + ${Internal.Entry.Current.Directory}/screen_ys_commu_hot_topic_update_day.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + Pentaho local + + Y + + N + Y + 0 + 560 + 320 + + + + 获取社区信息变量 + 写入表-社区 + 0 + 0 + Y + Y + N + + + Start + 社区ID,NAME + 0 + 0 + Y + Y + Y + 社区ID,NAME - 获取社区信息变量 + 清空表 0 0 Y @@ -435,8 +529,8 @@ N - 获取社区信息变量 - 写入表-社区 + 清空表 + 获取社区信息变量 0 0 Y @@ -444,13 +538,13 @@ N - Start - 社区ID,NAME + 清空表 + 写入表 0 0 Y Y - Y + N diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb index 3ea0932..beaccba 100644 --- a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb +++ b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_month.kjb @@ -359,7 +359,7 @@ N Y 0 - 416 + 496 208 @@ -419,7 +419,7 @@ N Y 0 - 608 + 688 208 @@ -457,7 +457,7 @@ N Y 0 - 608 + 496 320 @@ -495,21 +495,12 @@ N Y 0 - 416 - 320 + 368 + 208 - - 社区ID,NAME - 获取社区信息变量 - 0 - 0 - Y - Y - N - Start 社区ID,NAME @@ -546,6 +537,15 @@ Y N + + 清空表 + 获取社区信息变量 + 0 + 0 + Y + Y + N + diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_day_delete_co.ktr b/epdc-cloud-property/doc/yushan-kettle/yushan_day_delete_co.ktr new file mode 100644 index 0000000..6ad079e --- /dev/null +++ b/epdc-cloud-property/doc/yushan-kettle/yushan_day_delete_co.ktr @@ -0,0 +1,636 @@ + + + + yushan_day_delete_co + + + + Normal + 0 + / + + + + + + +
+ + + + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + TRANSNAME + Y + TRANSNAME + + + STATUS + Y + STATUS + + + LINES_READ + Y + LINES_READ + + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + + LINES_UPDATED + Y + LINES_UPDATED + + + + LINES_INPUT + Y + LINES_INPUT + + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + + LINES_REJECTED + Y + LINES_REJECTED + + + + ERRORS + Y + ERRORS + + + STARTDATE + Y + STARTDATE + + + ENDDATE + Y + ENDDATE + + + LOGDATE + Y + LOGDATE + + + DEPDATE + Y + DEPDATE + + + REPLAYDATE + Y + REPLAYDATE + + + LOG_FIELD + Y + LOG_FIELD + + + EXECUTING_SERVER + N + EXECUTING_SERVER + + + EXECUTING_USER + N + EXECUTING_USER + + + CLIENT + N + CLIENT + + + + + +
+ + + + ID_BATCH + Y + ID_BATCH + + + SEQ_NR + Y + SEQ_NR + + + LOGDATE + Y + LOGDATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + INPUT_BUFFER_ROWS + Y + INPUT_BUFFER_ROWS + + + OUTPUT_BUFFER_ROWS + Y + OUTPUT_BUFFER_ROWS + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + LOGGING_OBJECT_TYPE + Y + LOGGING_OBJECT_TYPE + + + OBJECT_NAME + Y + OBJECT_NAME + + + OBJECT_COPY + Y + OBJECT_COPY + + + REPOSITORY_DIRECTORY + Y + REPOSITORY_DIRECTORY + + + FILENAME + Y + FILENAME + + + OBJECT_ID + Y + OBJECT_ID + + + OBJECT_REVISION + Y + OBJECT_REVISION + + + PARENT_CHANNEL_ID + Y + PARENT_CHANNEL_ID + + + ROOT_CHANNEL_ID + Y + ROOT_CHANNEL_ID + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + TRANSNAME + Y + TRANSNAME + + + STEPNAME + Y + STEPNAME + + + STEP_COPY + Y + STEP_COPY + + + LINES_READ + Y + LINES_READ + + + LINES_WRITTEN + Y + LINES_WRITTEN + + + LINES_UPDATED + Y + LINES_UPDATED + + + LINES_INPUT + Y + LINES_INPUT + + + LINES_OUTPUT + Y + LINES_OUTPUT + + + LINES_REJECTED + Y + LINES_REJECTED + + + ERRORS + Y + ERRORS + + + LOG_FIELD + N + LOG_FIELD + + + + + +
+ + + ID_BATCH + Y + ID_BATCH + + + CHANNEL_ID + Y + CHANNEL_ID + + + LOG_DATE + Y + LOG_DATE + + + METRICS_DATE + Y + METRICS_DATE + + + METRICS_CODE + Y + METRICS_CODE + + + METRICS_DESCRIPTION + Y + METRICS_DESCRIPTION + + + METRICS_SUBJECT + Y + METRICS_SUBJECT + + + METRICS_TYPE + Y + METRICS_TYPE + + + METRICS_VALUE + Y + METRICS_VALUE + + + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2020/04/27 09:32:01.126 + - + 2020/04/27 09:32:01.126 + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + N + + + + + target_yushan + ${db.mysql.epdc.target.ys.host} + MYSQL + Native + ${db.mysql.target.schema.yushandb} + ${db.mysql.epdc.target.ys.port} + ${db.mysql.epdc.target.ys.username} + ${db.mysql.epdc.target.ys.password} + + + + + + EXTRA_OPTION_MYSQL.allowMultiQueries + true + + + EXTRA_OPTION_MYSQL.characterEncoding + utf8 + + + EXTRA_OPTION_MYSQL.serverTimezone + Asia/Shanghai + + + EXTRA_OPTION_MYSQL.useSSL + false + + + EXTRA_OPTION_MYSQL.useUnicode + true + + + FORCE_IDENTIFIERS_TO_LOWERCASE + N + + + FORCE_IDENTIFIERS_TO_UPPERCASE + N + + + IS_CLUSTERED + N + + + PORT_NUMBER + ${db.mysql.epdc.target.ys.port} + + + PRESERVE_RESERVED_WORD_CASE + Y + + + QUOTE_ALL_FIELDS + N + + + STREAM_RESULTS + Y + + + SUPPORTS_BOOLEAN_DATA_TYPE + Y + + + SUPPORTS_TIMESTAMP_DATA_TYPE + Y + + + USE_POOLING + N + + + + + + + 清空月度热议话题信息 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + delete from ys_commu_hot_topic where comm_id = ${commId} and cal_date = date_format(now(), '%Y-%m') + N + + + + + + + + + + + + + + + + 728 + 274 + Y + + + + 清空月度议题项目趋势信息 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + delete from ys_trend_month where comm_id = ${commId} and cal_date = date_format(now(), '%Y-%m') + N + + + + + + + + + + + + + + + + 528 + 336 + Y + + + + 清空月度新闻信息 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + delete from ys_news where comm_id = ${commId} and cal_date = date_format(now(), '%Y-%m') + N + + + + + + + + + + + + + + + + 655 + 497 + Y + + + + + + + N + + diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb index bb33104..47f0229 100644 --- a/epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb +++ b/epdc-cloud-property/doc/yushan-kettle/yushan_grid_day.kjb @@ -364,7 +364,7 @@ - 写入网格数据表 + 写入网格数据表-清空月度数据 TRANS @@ -423,6 +423,44 @@ 208 + + 写入表-月度 + + TRANS + + filename + + ${Internal.Entry.Current.Directory}/screen_ys_grid_rank_month_update_day.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + Pentaho local + + Y + + N + Y + 0 + 800 + 208 + + @@ -436,7 +474,7 @@ 获取网格信息变量 - 写入网格数据表 + 写入网格数据表-清空月度数据 0 0 Y @@ -452,6 +490,15 @@ Y Y + + 写入网格数据表-清空月度数据 + 写入表-月度 + 0 + 0 + Y + Y + N +