diff --git a/src/main/java/com/nis/domain/log/DkBehaviorLog.java b/src/main/java/com/nis/domain/log/DkBehaviorLog.java index b526a73c0..5e462981e 100644 --- a/src/main/java/com/nis/domain/log/DkBehaviorLog.java +++ b/src/main/java/com/nis/domain/log/DkBehaviorLog.java @@ -14,13 +14,11 @@ import com.wordnik.swagger.annotations.ApiModelProperty; */ public class DkBehaviorLog extends BaseLogEntity { private static final long serialVersionUID = -589390375816690510L; - @ExcelField(title="basic_protocol",sort=8) + protected Integer labelProtoId; //协议类型id protected Integer labelOsId;//操作系统id protected Integer labelBsId; //浏览器id - @ExcelField(title="behaviour_type",sort=9) protected Integer labelBehavId; //行为id - @ExcelField(title="social_app",sort=10) protected Integer labelAppId; //应用id protected Integer labelProtoSource; //应用id protected Integer labelBehavSource; //应用id @@ -34,8 +32,32 @@ public class DkBehaviorLog extends BaseLogEntity { protected String c2sByteNum; @ApiModelProperty(value = "s2c字节数", required = true) protected String s2cByteNum; + @ExcelField(title="basic_protocol",sort=8) + protected String labelProtoName; + @ExcelField(title="behaviour_type",sort=9) + protected String labelBehavName; + @ExcelField(title="social_app",sort=10) + protected String labelAppName; + public String getLabelProtoName() { + return labelProtoName; + } + public void setLabelProtoName(String labelProtoName) { + this.labelProtoName = labelProtoName; + } + public String getLabelBehavName() { + return labelBehavName; + } + public void setLabelBehavName(String labelBehavName) { + this.labelBehavName = labelBehavName; + } + public String getLabelAppName() { + return labelAppName; + } + public void setLabelAppName(String labelAppName) { + this.labelAppName = labelAppName; + } public Integer getLabelProtoId() { return labelProtoId; } diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java index c33601f09..69febc59a 100644 --- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java +++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,8 +27,6 @@ import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.SysUser; import com.nis.domain.log.DkBehaviorLog; -import com.nis.domain.log.NtcHttpLog; -import com.nis.domain.log.DkBehaviorLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.CodeDicUtils; import com.nis.util.Constants; @@ -109,7 +108,7 @@ public class DkBehaviorLogController extends BaseController{ // Stream配置导出 @RequestMapping(value = "exportStream") - public void exportStream(@ModelAttribute("log") DkBehaviorLog log, Model model, String hColumns, String type, + public void exportStream(@ModelAttribute("log") DkBehaviorLog entry, Model model, String hColumns, String type, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { String name= "Stream"; try { @@ -120,39 +119,60 @@ public class DkBehaviorLogController extends BaseController{ Map noExportMap = new HashMap(); // --------------------------- PageLog page = new PageLog(request, response); + Map params=new HashMap<>(); + List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); + model.addAttribute("serviceList", serviceList); + if(StringUtil.isEmpty(entry.getAction())){ + for(int i=0;i params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); - initLogSearchValue(log, params); - - List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); - System.out.print(log.getFunctionId()); - model.addAttribute("serviceList", serviceList); + //查询值判断 + initLogSearchValue(entry,params); - - String url = Constants.LOG_BASE_URL + Constants.NTC_DKBEHAVIOR_LOG; - String recv = HttpClientUtil.getMsg(url, params, request); - List list = new ArrayList(); - if (StringUtils.isNotBlank(recv)) { - Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>() { - }.getType()); - if (fromJson.getStatus().intValue() == 200) { + //获取字典信息 + List protocolList=CodeDicUtils.getCodeList("protocolCode"); + List behaviorList=CodeDicUtils.getCodeList("behaviorCode"); + List appList=CodeDicUtils.getCodeList("appCode"); + String url = ""; + url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG; + String jsonString = HttpClientUtil.getMsg(url,params,request); + + Gson gson = new GsonBuilder().create(); + //gson泛型支持 + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + List list=new ArrayList(); + if (fromJson.getStatus().intValue() == 200) { Page data = fromJson.getData(); list = data.getList(); } - } for (DkBehaviorLog l : list) { - l.setFunctionId(log.getFunctionId()); + l.setFunctionId(entry.getFunctionId()); setLogAction(l, serviceList); + if(l.getLabelProtoId()!=null){ + l.setLabelProtoName(getName(l.getLabelProtoId(),protocolList)); + } + if(l.getLabelBehavId()!=null){ + l.setLabelBehavName(getName(l.getLabelBehavId(),behaviorList)); + } + if(l.getLabelAppId()!=null){ + l.setLabelAppName(getName(l.getLabelAppId(),appList)); + } } - if(log.getFunctionId()==407){ + if(entry.getFunctionId()==407){ + hColumns+=",behaviour_type,"; name="protocol_identify"; - }else if(log.getFunctionId()==63){ + }else if(entry.getFunctionId()==63){ name="social_app_control"; - }else if(log.getFunctionId()==408){ + }else if(entry.getFunctionId()==408){ name="encrypted_tunnel_behavior"; } titleList.add(name); @@ -180,5 +200,16 @@ public class DkBehaviorLogController extends BaseController{ } } + public String getName(Integer id,List list){ + String name=""; + Properties msgProp = getMsgProp(); + for (int i = 0; i < list.size(); i++) { + if(String.valueOf(id).equals(list.get(i).getCode())){ + name=msgProp.getProperty(list.get(i).getItem(),list.get(i).getItem()); + break; + } + } + return name; + } } diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index 911c24199..9a98ad502 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -31,12 +31,12 @@ - + - +