diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java index 785d76219..64a1ac784 100644 --- a/src/main/java/com/nis/domain/log/NtcBGPLog.java +++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java @@ -4,7 +4,7 @@ public class NtcBGPLog extends BaseLogEntity { private static final long serialVersionUID = 4597407682545926823L; private Integer type; - private String as; + private String asNum; private String route; public Integer getType() { return type; @@ -12,11 +12,11 @@ public class NtcBGPLog extends BaseLogEntity { public void setType(Integer type) { this.type = type; } - public String getAs() { - return as; + public String getAsNum() { + return asNum; } - public void setAs(String as) { - this.as = as; + public void setAsNum(String asNum) { + this.asNum = asNum; } public String getRoute() { return route; diff --git a/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java new file mode 100644 index 000000000..ad74410e7 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java @@ -0,0 +1,27 @@ +package com.nis.domain.log; + +/** + * @ClassName:NtcStreamMediaLog + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (wx) + * @date 2018年7月16日 下午3:11:42 + * @version V1.0 + */ +public class NtcStreamMediaLog extends BaseLogEntity { + + private static final long serialVersionUID = 1446933545638550170L; + protected String url; + protected String protocol; + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } +} diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index dc4ac98fd..d64e0ad20 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -234,13 +234,16 @@ public class SysDictInfoController extends BaseController { */ @ResponseBody @RequestMapping(value = "isItemCodeRepeat") - public boolean isItemCodeRepeat(String itemCode,String oldItemCode) { + public boolean isItemCodeRepeat(String itemCode,String oldItemCode,String itType) { List list = Lists.newArrayList(); if(oldItemCode!=null&&itemCode.trim().equals(oldItemCode.trim())){ return true; } if(!StringUtil.isEmpty(itemCode)){ - list = sysDictInfoService.findByItemCode(itemCode); + SysDictInfo dict=new SysDictInfo(); + dict.setItemCode(itemCode); + dict.setItemType(Integer.valueOf(itType)); + list = sysDictInfoService.findByItemCode(dict); } if(list==null||list.size()==0){ return true; diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index 80f30463d..b0b8fa217 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; -import com.nis.domain.log.MmAvUrlLog; +import com.nis.domain.log.NtcStreamMediaLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{ * @throws IOException */ @RequestMapping(value={"list",""}) - public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { try { - PageLog page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params=new HashMap<>(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{ Gson gson = new GsonBuilder().create(); //gson泛型支持 - LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - Page data = fromJson.getData(); + Page data = fromJson.getData(); page.setList(data.getList()); - List list = page.getList(); - for (MmAvUrlLog l : list) { + List list = page.getList(); + for (NtcStreamMediaLog l : list) { l.setFunctionId(entry.getFunctionId()); setLogAction(l,serviceList); } @@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{ logger.error("查询音视频url日志失败", e); addMessageLog(model, e.getMessage()); } - return "/log/ntc/mmAvUrlList"; + return "/log/ntc/ntcStreamMedia"; } } diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java index dd2daa119..47019b622 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java @@ -55,7 +55,7 @@ public interface SysDictInfoDao extends CrudDao { * @param itemCode * @return */ - List findByItemCode(String itemCode); + List findByItemCode(@Param("sysDictInfo")SysDictInfo sysDictInfo); /** * 根据上级id选出所有下级 diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml index 9521430ae..a77b242e9 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml @@ -232,10 +232,16 @@ - select - from sys_dict_info s where s.item_code = #{itemCode} + from sys_dict_info s where s.is_valid = 1 + + AND s.item_type = ${sysDictInfo.itemType} + + + AND s.item_code = ${sysDictInfo.itemCode} + diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index 3b0fb65df..4e343cfbd 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -206,8 +206,8 @@ public class SysDictInfoService extends BaseService{ * @param itemCode * @return */ - public List findByItemCode(String itemCode) { - return sysDictInfoDao.findByItemCode(itemCode); + public List findByItemCode(SysDictInfo sysDictInfo) { + return sysDictInfoDao.findByItemCode(sysDictInfo); } /** * 根据上级id选出所有下级 diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 2a2ca1c3a..76c3d3cdc 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1205,5 +1205,5 @@ transport_layer_protocol=TLS Protocol av_voip_monit=VoIP Monit av_voip_reject=VoIP Reject label_proto_source=Protocol Source -label_behav_source=Behavior Source -label_app_source=APP Source \ No newline at end of file +label_behav_source=Behavior Source +label_app_source=APP Source diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 62e909d1f..e8627c4ab 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1207,5 +1207,5 @@ transport_layer_protocol=TLS Protocol av_voip_monit=VoIP\u76D1\u6D4B av_voip_reject=VoIP\u7BA1\u63A7 label_proto_source=Protocol Source -label_behav_source=Behavior Source -label_app_source=APP Source \ No newline at end of file +label_behav_source=Behavior Source +label_app_source=APP Source diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4a4e23593..c9962e705 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1200,4 +1200,4 @@ av_voip_monit=VoIP\u76D1\u6D4B av_voip_reject=VoIP\u7BA1\u63A7 label_proto_source=\u534F\u8BAE\u6765\u6E90 label_behav_source=\u884C\u4E3A\u6765\u6E90 -label_app_source=\u5E94\u7528\u6765\u6E90 \ No newline at end of file +label_app_source=\u5E94\u7528\u6765\u6E90 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 734a94d30..be08925d4 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -250,7 +250,7 @@ ntcMailLog=ntcMailLogs ntcFtpLog=ntcFtpLogs ntcAppLog=ntcAppLogs ntcDdosLog=ntcDdosLogs -dkBehaviorLog=dkBehaviorLogs +dkBehaviorLog=ntcAppLogs mmVoipLog=mmVoipLogs mmAvIpLog=mmAvIpLogs mmAvUrlLog=mmAvUrlLogs diff --git a/src/main/resources/sql/20181010/add_bgp_message_type.sql b/src/main/resources/sql/20181010/add_bgp_message_type.sql new file mode 100644 index 000000000..7d17405e2 --- /dev/null +++ b/src/main/resources/sql/20181010/add_bgp_message_type.sql @@ -0,0 +1,2 @@ +INSERT INTO sys_data_dictionary_name (`id`,`module_name`,`mark`,`remark`,`revision`,`create_time`,`modify_time`,`status`) VALUES(115,'BGP消息类型','BGP_MESSAGE_TYPE','','','2018-10-10 16:28:05','2018-10-10 16:28:05',1); +insert into sys_data_dictionary_item (`id`,`item_code`,`item_value`,`item_desc`,`item_sort`,`status`,`type`,`dictionary_id`) values (2602,1,'open','',0,1,1,115),(2603,2,'keepalive','',0,1,1,115),(2604,3,'update','',0,1,1,115),(2605,4,'notification','',0,1,1,115) diff --git a/src/main/resources/sql/20181010/updateKeywords-district.sql b/src/main/resources/sql/20181010/updateKeywords-district.sql new file mode 100644 index 000000000..4f402d0f4 --- /dev/null +++ b/src/main/resources/sql/20181010/updateKeywords-district.sql @@ -0,0 +1,10 @@ +ALTER TABLE ssl_keyword_cfg MODIFY cfg_keywords VARCHAR(2048),MODIFY district varchar(128); +ALTER TABLE app_ssl_cert_cfg MODIFY cfg_keywords VARCHAR(2048); +ALTER TABLE app_string_feature_cfg MODIFY cfg_keywords VARCHAR(2048); +ALTER TABLE byte_features_cfg MODIFY cfg_desc VARCHAR(128); +ALTER TABLE complex_keyword_cfg MODIFY district VARCHAR(128); +ALTER TABLE dns_domain_cfg MODIFY district VARCHAR(128); +ALTER TABLE http_req_head_cfg MODIFY district VARCHAR(128); +ALTER TABLE http_res_head_cfg MODIFY district VARCHAR(128); +ALTER TABLE intercept_pkt_bin MODIFY district VARCHAR(128); +ALTER TABLE mail_keyword_cfg MODIFY district VARCHAR(128),MODIFY cfg_keywords VARCHAR(2048); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index f8c2c39eb..476d21819 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -61,7 +61,7 @@ validateForm = $("#inputForm").validate({ rules: { 'itemCode':{ - remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}' + remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}&itType=${itType}' }, 'itemType':{ remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}' diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp index f9b46e586..c05132b6c 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp @@ -10,7 +10,7 @@

- +

@@ -28,13 +28,13 @@
- +
- +
@@ -47,7 +47,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 5eb9aee46..c1ccf53b3 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -19,7 +19,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index c33373d1f..9798b5603 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -102,7 +102,7 @@ $(document).ready(function(){
- + @@ -174,7 +174,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 9836888c7..5112cc9df 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -97,7 +97,7 @@
- + @@ -172,7 +172,7 @@ - + @@ -248,8 +248,12 @@ ${log.dAsn} ${log.sSubscribeId} ${log.dSubscribeId} - ${log.type} - ${log.as} + + + ${type.itemValue} + + + ${log.asNum} ${log.route} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 125594b0f..a4185893f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -89,7 +89,7 @@ $(document).ready(function(){