diff --git a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml index 9fa01a7e6..0070ac773 100644 --- a/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml @@ -4,11 +4,12 @@ diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 96b31650b..aad27ea02 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1502,4 +1502,5 @@ schedule=Scheduler cancel_all=Cancel all configurations! pre_version=Previous Version approved_all=Approve all configurations! -protection_list_manage=Protection List Manage \ No newline at end of file +protection_list_manage=Protection List Manage +effective=Effective \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 0661058db..8514bf337 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1507,4 +1507,5 @@ schedule=Scheduler cancel_all=Cancel all configurations! pre_version=Previous Version approved_all=Approve all configurations! -protection_list_manage=Protection List Manage \ No newline at end of file +protection_list_manage=Protection List Manage +effective=Effective \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 84cc65b02..5e0770daa 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1500,4 +1500,5 @@ cancel_all=\u53D6\u6D88\u6240\u6709\u914D\u7F6E! pre_version=\u4e0a\u4e00\u7248 is_schduler=\u5b9a\u65f6\u5668 approved_all=\u5BA1\u6838\u901A\u8FC7\u6240\u6709\u914D\u7F6E! -protection_list_manage=\u5185\u7F6E\u4FDD\u62A4\u540D\u5355\u7BA1\u7406 \ No newline at end of file +protection_list_manage=\u5185\u7F6E\u4FDD\u62A4\u540D\u5355\u7BA1\u7406 +effective=\u6709\u6548 \ No newline at end of file diff --git a/src/main/resources/sql/20190328/alert_proc_statistics_config.sql b/src/main/resources/sql/20190328/alert_proc_statistics_config.sql index cc102e10b..a305c06ca 100644 --- a/src/main/resources/sql/20190328/alert_proc_statistics_config.sql +++ b/src/main/resources/sql/20190328/alert_proc_statistics_config.sql @@ -1,3 +1,4 @@ +drop PROCEDURE proc_statistics_config; CREATE DEFINER=`root`@`%` PROCEDURE `proc_statistics_config`() BEGIN @@ -64,10 +65,8 @@ BEGIN COMMIT; - #没有定时任务前的统计:is_audit=1 && is_valid=1为approved - #set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,audit_time,function_id,service_id,action,compile_id,cfg_state) select ','''',ntime,'''',',','audit_time,function_id,service_id,action,compile_id,if(is_audit=3,3,if(is_audit=2,2,if(is_audit=1,1,if(is_valid=0,0,if(is_valid,-1,-1))))) cfg_state from ',tabName); - #20190328 增加定时任务后is_audit=1 && (is_valid=1 || is_valid=0) 即为approved (为与界面显示保持一致,更改统计条件,此时的结果中approved并不代表所有有效的配置总数) - set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,function_id,service_id,action,compile_id,cfg_state) select ','''',ntime,'''',',','function_id,service_id,action,compile_id,if(is_valid=-1,-1,if(is_valid=1,1,if(is_valid=0 && is_audit=0,0,if(is_valid=0 && is_audit=1,1,if(is_valid=0 && is_audit=2,2,if(is_valid=0 && is_audit=3,3,0)))))) cfg_state from ',tabName); + #20190328 增加定时任务后is_audit=1 && (is_valid=1 || is_valid=0) 即为approved (增加cfg_state=4[is_valid=0 && is_audit=1],代表定时任务审核过的),而cfg_state=1仅仅代表审核通过且有效的,界面展示的approved值实际包含cfg_state=4和cfg_state=1 + set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,function_id,service_id,action,compile_id,cfg_state) select ','''',ntime,'''',',','function_id,service_id,action,compile_id,if(is_valid=-1,-1,if(is_valid=1,1,if(is_audit=0,0,if(is_audit=1,4,if(is_audit=2,2,if(is_audit=3,3,0)))))) cfg_state from ',tabName); PREPARE execs FROM @insert_statistics_sql; diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 76208af97..185a1052b 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -472,6 +472,7 @@ + @@ -510,6 +511,9 @@ <%-- ${serviceName } --%> + + ${statistics.effective } + ${statistics.approved }