gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
leijun
2018-09-13 16:35:34 +08:00
parent 90c1e45cc0 90b419e989
commit 25577ee70b
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/report/NtcPzReportController.java
View File

@@ -86,7 +86,7 @@ public class NtcPzReportController extends BaseController{
} }
Calendar endTimeCal=Calendar.getInstance(); Calendar endTimeCal=Calendar.getInstance();
endTimeCal.setTimeInMillis(cal.getTimeInMillis()); endTimeCal.setTimeInMillis(cal.getTimeInMillis());
endTimeCal.add(Calendar.SECOND, -1); //endTimeCal.add(Calendar.SECOND, -1);
endDate=endTimeCal.getTime(); endDate=endTimeCal.getTime();
cal.add(Calendar.MINUTE, -interval); cal.add(Calendar.MINUTE, -interval);
startDate=cal.getTime(); startDate=cal.getTime();

4
src/main/resources/messages/message_en.properties
View File

@@ -1146,4 +1146,6 @@ MM_SPEAKER_RECOGNIZATION=Speaker Recognization
MM_LOGO_DETECTION=Logo Detection MM_LOGO_DETECTION=Logo Detection
MM_FACE_RECOGNIZATION=Face Recognization MM_FACE_RECOGNIZATION=Face Recognization
preset=Preset preset=Preset
ip_must_select=IP Configuration must select ip_must_select=IP Configuration must select
av_voip_account_reject=VoIP Account Control
av_voip_account_monit=VoIP Account Monitoring

4
src/main/resources/messages/message_ru.properties
View File

@@ -1137,4 +1137,6 @@ MM_SPEAKER_RECOGNIZATION=Speaker Recognization
MM_LOGO_DETECTION=Logo Detection MM_LOGO_DETECTION=Logo Detection
MM_FACE_RECOGNIZATION=Face Recognization MM_FACE_RECOGNIZATION=Face Recognization
preset=Preset preset=Preset
ip_must_select=IP配置必选 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

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1144,4 +1144,6 @@ MM_SPEAKER_RECOGNIZATION=\u8BF4\u8BDD\u4EBA\u8BC6\u522B
MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B
MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B
preset=\u9884\u7F6E preset=\u9884\u7F6E
ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 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

6
src/main/resources/sql/20180913/update-sys_menu-voip.sql Normal file
View File

@@ -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;