From 12e23d20dac7d0dc0b5f09de447492eaecd09cf9 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Thu, 13 Sep 2018 14:32:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?voip=20IP=20=EF=BC=8Caccount=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=20=E8=B7=AF=E5=BE=84=EF=BC=8C=E6=9D=83=E9=99=90sql?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/20180913/update-sys_menu-voip.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/resources/sql/20180913/update-sys_menu-voip.sql diff --git a/src/main/resources/sql/20180913/update-sys_menu-voip.sql b/src/main/resources/sql/20180913/update-sys_menu-voip.sql new file mode 100644 index 000000000..a9080ac42 --- /dev/null +++ b/src/main/resources/sql/20180913/update-sys_menu-voip.sql @@ -0,0 +1,6 @@ +UPDATE sys_menu set permission='avVoipIp:config',href='/ntc/av/voipList' where id=629; +UPDATE sys_menu set permission='avVoipAccount:config',href='/ntc/av/voipAccountList' where id=630; +UPDATE sys_menu set permission='avVoipIp:confirm',href='/ntc/av/voipList' where id=662; +UPDATE sys_menu set permission='avVoipAccount:confirm',href='/ntc/av/voipAccountList' where id=663; +UPDATE sys_menu set permission='avVoipIp:audit',href='/ntc/av/voipList' where id=832; +UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833; \ No newline at end of file From e0611b57153436a1ff34ac3c02c3b0e4c8fc6a07 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 13 Sep 2018 14:39:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=87=8F1=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/report/NtcPzReportController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java index 86bde2ca0..0c6f37d17 100644 --- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java @@ -86,7 +86,7 @@ public class NtcPzReportController extends BaseController{ } Calendar endTimeCal=Calendar.getInstance(); endTimeCal.setTimeInMillis(cal.getTimeInMillis()); - endTimeCal.add(Calendar.SECOND, -1); + //endTimeCal.add(Calendar.SECOND, -1); endDate=endTimeCal.getTime(); cal.add(Calendar.MINUTE, -interval); startDate=cal.getTime(); From 0869a02ad34da8b34780b3f13a34200abc77558c Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Thu, 13 Sep 2018 15:36:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 4 +++- src/main/resources/messages/message_ru.properties | 4 +++- src/main/resources/messages/message_zh_CN.properties | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index ff7a35546..de3b7feac 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1146,4 +1146,6 @@ MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization preset=Preset -ip_must_select=IP Configuration must select \ No newline at end of file +ip_must_select=IP Configuration must select +av_voip_account_reject=VoIP Account Control +av_voip_account_monit=VoIP Account Monitoring \ 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 c67825cec..ee1347b84 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1137,4 +1137,6 @@ MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization preset=Preset -ip_must_select=IP配置必选 \ No newline at end of file +ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 +av_voip_account_reject=VoIP \u8D26\u53F7\u7BA1\u63A7 +av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B \ 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 900df1bd7..96dfd49df 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1144,4 +1144,6 @@ MM_SPEAKER_RECOGNIZATION=\u8BF4\u8BDD\u4EBA\u8BC6\u522B MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B preset=\u9884\u7F6E -ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 \ No newline at end of file +ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 +av_voip_account_reject=VoIP \u8D26\u53F7\u7BA1\u63A7 +av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B \ No newline at end of file