From cf29b7ec04bb0fe968dd971fcd27de95a45c0db0 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Thu, 23 May 2019 11:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=93=8D=E6=8E=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AF=BC=E5=87=BA=E7=BC=BA=E5=B0=91=E7=9A=84action?= =?UTF-8?q?=E3=80=81response=20code=E5=88=97.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ManipulatCfgExport.java | 31 ++++++++++ .../proxy/ManipulatPolicyController.java | 58 ++++++++----------- 2 files changed, 54 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/nis/domain/configuration/ManipulatCfgExport.java diff --git a/src/main/java/com/nis/domain/configuration/ManipulatCfgExport.java b/src/main/java/com/nis/domain/configuration/ManipulatCfgExport.java new file mode 100644 index 000000000..2fc2012d1 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/ManipulatCfgExport.java @@ -0,0 +1,31 @@ +package com.nis.domain.configuration; + +import com.nis.util.excel.ExcelField; + +public class ManipulatCfgExport extends CfgIndexInfo { + + /** + * + */ + private static final long serialVersionUID = -842585769617969577L; + + @ExcelField(title="action_export",dictType="SERVICE_ACTION",sort=2) + private String actionExport; + + @ExcelField(title="response_code",sort=2) + private String responseCode; + + public String getResponseCode() { + return responseCode; + } + public void setResponseCode(String responseCode) { + this.responseCode = responseCode; + } + public String getActionExport() { + return actionExport; + } + public void setActionExport(String actionExport) { + this.actionExport = actionExport; + } + +} diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java index 3a2e9f9de..fb58f7986 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java @@ -33,6 +33,7 @@ import com.nis.domain.configuration.HttpReqHeadCfg; import com.nis.domain.configuration.HttpResHeadCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; +import com.nis.domain.configuration.ManipulatCfgExport; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; @@ -284,7 +285,7 @@ public class ManipulatPolicyController extends BaseController { return "redirect:" + adminPath + "/proxy/control/manipulatPolicy/list?functionId=" + functionId; } - // http配置导出 + // 配置导出 @RequestMapping(value = "exportPolicy") public void exportPolicy(Model model,@ModelAttribute("cfg") CfgIndexInfo entity, String ids, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) { @@ -309,7 +310,6 @@ public class ManipulatPolicyController extends BaseController { ipLists = page.getList(); } - //日志总量 List> logTotals=new ArrayList>(); StringBuilder compileIds=new StringBuilder(",");//配置ids @@ -320,8 +320,18 @@ public class ManipulatPolicyController extends BaseController { Map replaceDict = DictUtils.getDictMap("CONTROL_REPLACE_ZONE"); // Replace Properties prop = getMsgProp(); - for (CfgIndexInfo str : ipLists) { - //str.setAction(Integer.valueOf(str.getUserRegion5())); + List baseLists = new ArrayList(); + for (CfgIndexInfo source : ipLists) { + ManipulatCfgExport str = new ManipulatCfgExport(); + BeanUtils.copyProperties(source, str); + + if(str.getUserRegion5().equals("85")) { + str.setActionExport("Hijack"); + }else if(str.getUserRegion5().equals("90")) { + str.setActionExport("Insert"); + }else { + str.setActionExport(str.getUserRegion5()); + } if(str.getIsAudit()!=0){ set.add(str.getServiceId()); @@ -334,26 +344,16 @@ public class ManipulatPolicyController extends BaseController { } if (!str.getUserRegion5().equals("85") && !str.getUserRegion5().equals("90")) { - - /*String type = "RESPONSE_CODE"; - if (entity.getFunctionId() == 207) { // Block - type = "RESPONSE_CODE"; - } else if (entity.getFunctionId() == 208) { // Redirect - type = "REDIRECT_RESPONSE_CODE"; - } else if (entity.getFunctionId() == 209) { // Replace - type = "CONTROL_REPLACE_ZONE"; - }*/ - String value = ""; if(str.getUserRegion5().equals("16")) {// Block value = blockDict.get(str.getUserRegion1()); - str.setDetail(prop.getProperty(value)); + str.setResponseCode(prop.getProperty(value)); str.setUserRegion1(str.getUserRegion2()); str.setUserRegion2(null); }else if(str.getUserRegion5().equals("48")) {// Redirect value = redirectDict.get(str.getUserRegion1()); - str.setDetail(prop.getProperty(value)); + str.setResponseCode(prop.getProperty(value)); str.setUserRegion1(null); }else if(str.getUserRegion5().equals("80")) {// Replace @@ -388,6 +388,7 @@ public class ManipulatPolicyController extends BaseController { } str.setUserRegion5(null); } + baseLists.add(str); } //获取日志总量 @@ -404,16 +405,8 @@ public class ManipulatPolicyController extends BaseController { } } - String cfgIndexInfoNoExport = ",block_type,policy_name,group_name,&detail:response_code-userregion1:response_content-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-"; - /*if (entity.getFunctionId() == 207) { - cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-"; - } else if (entity.getFunctionId() == 208) { - cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-"; - } else if (entity.getFunctionId() == 209) { - cfgIndexInfoNoExport = ",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-"; - } else if (entity.getFunctionId() == 211) { - cfgIndexInfoNoExport = ",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; - }*/ + String cfgIndexInfoNoExport = ",block_type,policy_name,group_name,&action_export:block_type-responseCode:response_code-userregion1:response_content-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-"; + String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" + ",config_time,editor,edit_time,auditor,audit_time" + ",letter,whether_area_block,classification,attribute,label" @@ -464,7 +457,7 @@ public class ManipulatPolicyController extends BaseController { List httpResBodyList = new ArrayList<>(); List ipPortList = new ArrayList<>(); List subscribeIdList = new ArrayList<>(); - for (CfgIndexInfo cfg : ipLists) { + for (ManipulatCfgExport cfg : baseLists) { Map maps = manipulatPolicyService.exportHttpCfg(cfg); httpUrlList.addAll(maps.get("NTC_HTTP_URL")); httpReqHdrList.addAll(maps.get("NTC_HTTP_REQ_HDR")); @@ -491,13 +484,13 @@ public class ManipulatPolicyController extends BaseController { titleList.add(entity.getMenuNameCode()); titleList.add("NTC_HTTP_URL"); titleList.add("NTC_HTTP_REQ_HDR"); - classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class); + classMap.put(entity.getMenuNameCode(), ManipulatCfgExport.class); classMap.put("NTC_HTTP_URL", HttpUrlCfg.class); classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class); noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport); noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport); - dataMap.put(entity.getMenuNameCode(), ipLists); + dataMap.put(entity.getMenuNameCode(), baseLists); dataMap.put("NTC_HTTP_URL", httpUrlList); dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList); if (entity.getFunctionId() != 208 && entity.getFunctionId() != 211) { @@ -524,8 +517,6 @@ public class ManipulatPolicyController extends BaseController { dataMap.put("NTC_UNIVERSAL_IP", ipPortList); dataMap.put("NTC_SUBSCRIBE_ID", subscribeIdList); - /* } */ - String timeRange = initTimeMap(entity); noExportMap.put("timeRange", timeRange); if ("csv".equals(entity.getExType())) { @@ -540,10 +531,7 @@ public class ManipulatPolicyController extends BaseController { addMessage(redirectAttributes, "error", "export_failed"); LogUtils.saveLog(request, null, e, null); } - /* - * return "redirect:" + adminPath - * +"/ntc/website/httpList?functionId="+entity.getFunctionId(); - */ + } @ResponseBody