From c0c3bbcbbab2fde5a29b3557266468dad576ba65 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 4 Jul 2018 14:08:44 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dip=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8D=8F=E8=AE=AE=E6=8F=90=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 60915cc9a..0ea4d30ad 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -658,7 +658,7 @@ public class BaseController { //protocol check start Integer protocol= value.getProtocol(); if(protocol==null){ - errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("direction"))+";"); + errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("protocol"))+";"); } //protocol check end // requestId check start From d3ed5f993a706ce900e5e486c8e2c71633995eb7 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 4 Jul 2018 14:26:21 +0800 Subject: [PATCH 02/16] =?UTF-8?q?http=E9=87=8D=E5=AE=9A=E5=90=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=92=E9=99=A4=E8=A3=85=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/sitemesh3.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml index 29b136461..7fbf8fd5b 100644 --- a/src/main/webapp/WEB-INF/sitemesh3.xml +++ b/src/main/webapp/WEB-INF/sitemesh3.xml @@ -25,6 +25,7 @@ + /articles/* From 2fbfedabc4e6f27d43323a96988a8edb00651004 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 4 Jul 2018 16:03:07 +0800 Subject: [PATCH 03/16] =?UTF-8?q?1=E3=80=81APP=E7=AD=96=E7=95=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0IP=E9=85=8D=E7=BD=AE=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9IP=E8=BD=AC=E6=8D=A2=E6=97=B6?= =?UTF-8?q?=EF=BC=8CIPV4=E7=9A=84IP/MASK=E6=A0=BC=E5=BC=8F=E6=97=B6?= =?UTF-8?q?=EF=BC=8CMASK=E4=B8=BA0=E5=BC=82=E5=B8=B8=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../domain/configuration/AppPolicyCfg.java | 27 ++- .../configuration/AppCfgController.java | 30 +++ .../nis/web/dao/configuration/AppCfgDao.java | 6 + .../nis/web/dao/configuration/AppCfgDao.xml | 147 +++++++++++++- .../java/com/nis/web/service/BaseService.java | 37 ++-- .../service/configuration/AppCfgService.java | 54 +++++- src/main/resources/jdbc.properties | 13 +- .../messages/message_zh_CN.properties | 3 +- src/main/resources/spring-mvc.xml | 16 +- src/main/webapp/WEB-INF/sitemesh3.xml | 1 + .../views/cfg/app/appPolicyCfgForm.jsp | 183 +++++++++++------- .../views/cfg/app/appPolicyCfgList.jsp | 46 +++++ .../WEB-INF/views/cfg/app/appPolicyIpList.jsp | 130 +++++++++++++ 13 files changed, 588 insertions(+), 105 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 0eddc6ea2..01235948e 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -8,6 +8,8 @@ */ package com.nis.domain.configuration; +import java.util.List; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -38,17 +40,20 @@ public class AppPolicyCfg extends BaseCfg { @Expose @ExcelField(title="expression_type") @SerializedName("exprType") - protected Integer exprType ; + private Integer exprType ; @Expose @ExcelField(title="match_method") @SerializedName("matchMethod") - protected Integer matchMethod ; + private Integer matchMethod ; @Expose @ExcelField(title="whether_hexbinary") @SerializedName("isHexbin") - protected Integer isHexbin; + private Integer isHexbin; + + private List ipPortList; + private IpPortCfg ipPort; public Integer getExprType() { return exprType; @@ -134,5 +139,21 @@ public class AppPolicyCfg extends BaseCfg { public void setBehavCode(Integer behavCode) { this.behavCode = behavCode; } + + public List getIpPortList() { + return ipPortList; + } + + public void setIpPortList(List ipPortList) { + this.ipPortList = ipPortList; + } + + public IpPortCfg getIpPort() { + return ipPort; + } + + public void setIpPort(IpPortCfg ipPort) { + this.ipPort = ipPort; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index f20367bf1..a291e635a 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1,6 +1,8 @@ package com.nis.web.controller.configuration; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,6 +21,9 @@ import com.nis.domain.configuration.AppDomainCfg; import com.nis.domain.configuration.AppHttpCfg; import com.nis.domain.configuration.AppIpCfg; import com.nis.domain.configuration.AppPolicyCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.MaatConvertException; import com.nis.web.controller.BaseController; @@ -52,6 +57,31 @@ public class AppCfgController extends BaseController { initPageCondition(model,cfg); return "/cfg/app/appPolicyCfgList"; } + /** + * 查询APP策略IP子配置 + * @param model + * @param cfgId + * @param index + * @return + */ + @RequestMapping(value = {"ajaxAppPolicyIpList"}) + public String ajaxSslSubList(Model model,Long cfgId,Integer index) { + AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId); + List tabList = new ArrayList(); + if(cfg.getIpPortList()!=null){ + String cfgType = null; + for(IpPortCfg ip:cfg.getIpPortList()){ + if(!ip.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"1",ip.getCfgType()}); + cfgType = ip.getCfgType(); + } + } + } + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/app/appPolicyIpList"; + } /** * 策略配置表单 * @param model diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java index 317336b02..f6b5214c5 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java @@ -18,6 +18,7 @@ import com.nis.domain.configuration.AppStringCfg; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.domain.configuration.IpPortCfg; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @@ -32,8 +33,13 @@ public interface AppCfgDao { //app策略配置增删改查 public List findAppPolicyList(AppPolicyCfg entity) ; public AppPolicyCfg getAppPolicyCfg(Long cfgId) ; + public IpPortCfg getAppPolicyIpCfg(AppPolicyCfg entity) ; + public List getAppPolicyIpList(AppPolicyCfg entity); public int insertAppPolicyCfg(AppPolicyCfg entity); public int updateAppPolicyCfg(AppPolicyCfg entity); + public int insertAppPolicyIpCfg(IpPortCfg entity); + public int deleteAppPolicyIpCfg(AppPolicyCfg entity); + //app协议IP配置增删改查 public List findAppIpList(AppIpCfg entity) ; public AppIpCfg getAppIpCfg(Long cfgId) ; diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 28f60c301..9c6f412e7 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -189,6 +189,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + r.CFG_ID, r.APP_CODE,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT, r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, @@ -248,6 +283,15 @@ #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER} + + + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address + ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id + ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, + a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable + ,a.area_effective_ids,a.function_id,a.cfg_region_code + + + + SELECT LAST_INSERT_ID() + + insert into ip_port_cfg ( + CFG_DESC, + ACTION, + IS_VALID, + IS_AUDIT, + CREATOR_ID, + CREATE_TIME, + EDITOR_ID, + EDIT_TIME, + AUDITOR_ID, + AUDIT_TIME, + SERVICE_ID, + REQUEST_ID, + COMPILE_ID, + IS_AREA_EFFECTIVE, + CLASSIFY, + ATTRIBUTE, + LABLE, + AREA_EFFECTIVE_IDS, + function_id, + ip_type, + src_ip_address, + ip_pattern, + port_pattern, + src_port, + protocol, + protocol_id, + direction, + dest_port, + dest_ip_address, + cfg_type, + cfg_region_code + )values ( + #{cfgDesc,jdbcType=VARCHAR}, + #{action,jdbcType=INTEGER}, + 0, + 0, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, + #{editorId,jdbcType=INTEGER}, + #{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER}, + #{auditTime,jdbcType=TIMESTAMP}, + #{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER}, + #{compileId,jdbcType=INTEGER}, + #{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR}, + #{attribute,jdbcType=VARCHAR}, + #{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR}, + #{functionId,jdbcType=INTEGER}, + #{ipType,jdbcType=INTEGER}, + #{srcIpAddress,jdbcType=VARCHAR}, + #{ipPattern,jdbcType=INTEGER}, + #{portPattern,jdbcType=INTEGER}, + #{srcPort,jdbcType=VARCHAR}, + #{protocol,jdbcType=INTEGER}, + #{protocolId,jdbcType=INTEGER}, + #{direction,jdbcType=INTEGER}, + #{destPort,jdbcType=VARCHAR}, + #{destIpAddress,jdbcType=VARCHAR}, + #{cfgType,jdbcType=VARCHAR}, + #{cfgRegionCode,jdbcType=INTEGER} + ) + + update app_policy_cfg @@ -1525,4 +1659,15 @@ + + + + delete from ip_port_cfg where compile_id=#{compileId} and protocol_id=21 and function_id=#{functionId} + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 8a17117a7..396f0970f 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -390,7 +390,12 @@ public abstract class BaseService { if(srcIp.getSrcIpAddress().indexOf("/")!=-1){ if(srcIp.getIpType()==4 || srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); - dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); + if(srcMaskNum==0){ + dstIp.setSrcIpMask("0.0.0.0"); + }else{ + dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); + } + dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress()); @@ -413,27 +418,31 @@ public abstract class BaseService { }else{ if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("0.0.0.0"); + dstIp.setSrcIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("::"); + dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } } }else{ if(srcIp.getIpType()==4|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("0.0.0.0"); + dstIp.setSrcIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setSrcIp(srcIp.getSrcIpAddress()); - dstIp.setSrcIpMask("::"); + dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } } if(srcIp.getDestIpAddress()!=null){ if(srcIp.getDestIpAddress().indexOf("/")!=-1){ if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); - dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum)); + if(dstMaskNum==0){ + dstIp.setDstIpMask("0.0.0.0"); + }else{ + dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; + } dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress()); @@ -456,20 +465,20 @@ public abstract class BaseService { }else{ if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("0.0.0.0"); + dstIp.setDstIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("::"); + dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } } }else{ if(srcIp.getIpType()==4|| srcIp.getIpType()==64){//64表示源ip为ipv6，目的ip为ipv4 dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("0.0.0.0"); + dstIp.setDstIpMask("255.255.255.255"); }else if(srcIp.getIpType()==6|| srcIp.getIpType()==46){//46表示源ip为ipv4，目的ip为ipv6 dstIp.setDstIp(srcIp.getDestIpAddress()); - dstIp.setDstIpMask("::"); + dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); } } if(srcIp.getSrcPort()!=null){ @@ -479,11 +488,11 @@ public abstract class BaseService { dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]); }else{ dstIp.setSrcPort(srcIp.getSrcPort()); - dstIp.setSrcPortMask("0"); + dstIp.setSrcPortMask("65535"); } }else{ dstIp.setSrcPort("0"); - dstIp.setSrcPortMask("0"); + dstIp.setSrcPortMask("65535"); } if(srcIp.getDestPort()!=null){ if(srcIp.getDestPort().indexOf("/")!=-1){ @@ -492,11 +501,11 @@ public abstract class BaseService { dstIp.setDstPort(srcIp.getDestPort().split("/")[0]); }else{ dstIp.setDstPort(srcIp.getDestPort()); - dstIp.setDstPortMask("0"); + dstIp.setDstPortMask("65535"); } }else{ dstIp.setDstPort("0"); - dstIp.setDstPortMask("0"); + dstIp.setDstPortMask("65535"); } return dstIp; } diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 51612bf97..9f4ee81ff 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -17,6 +17,7 @@ import com.nis.domain.configuration.AppHttpCfg; import com.nis.domain.configuration.AppIpCfg; import com.nis.domain.configuration.AppPolicyCfg; import com.nis.domain.configuration.AreaIpCfg; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.maat.MaatCfg; import com.nis.domain.maat.ToMaatBean; import com.nis.domain.maat.ToMaatResult; @@ -84,7 +85,10 @@ public class AppCfgService extends BaseService { return page; } public AppPolicyCfg getAppPolicyCfg(Long cfgId){ - return appCfgDao.getAppPolicyCfg(cfgId); + AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId); + List ipPortList = appCfgDao.getAppPolicyIpList(policy); + policy.setIpPortList(ipPortList); + return policy; } public AppIpCfg getAppIpCfg(Long cfgId){ return appCfgDao.getAppIpCfg(cfgId); @@ -116,6 +120,13 @@ public class AppCfgService extends BaseService { entity.setIsValid(0); entity.setIsAudit(0); appCfgDao.insertAppPolicyCfg(entity); + //保存策略IP配置 + if(entity.getIpPortList()!=null){ + for(IpPortCfg cfg:entity.getIpPortList()){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + appCfgDao.insertAppPolicyIpCfg(cfg); + } + } //保存区域IP信息 if(entity.getAreaCfg()!=null){ for(AreaIpCfg cfg:entity.getAreaCfg()){ @@ -134,15 +145,25 @@ public class AppCfgService extends BaseService { entity.setEditTime(new Date()); entity.setIsValid(0); entity.setIsAudit(0); - appCfgDao.updateAppPolicyCfg(entity); + appCfgDao.updateAppPolicyCfg(entity); + appCfgDao.deleteAppPolicyIpCfg(entity); //删除旧的区域IP，新增新的区域IP AreaIpCfg area = new AreaIpCfg(); area.setCompileId(entity.getCompileId()); area.setFunctionId(entity.getFunctionId()); areaIpCfgDao.deleteAreaIpCfg(area); + entity.setCreateTime(new Date()); entity.setCreatorId(entity.getCurrentUser().getId()); + //保存策略IP配置 + if(entity.getIpPortList()!=null){ + for(IpPortCfg cfg:entity.getIpPortList()){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + appCfgDao.insertAppPolicyIpCfg(cfg); + } + } + //保存区域IP信息 if(entity.getAreaCfg()!=null){ for(AreaIpCfg cfg:entity.getAreaCfg()){ @@ -390,19 +411,37 @@ public class AppCfgService extends BaseService { List areaIpRegionList = new ArrayList(); entity.setTableName(AppPolicyCfg.getTablename()); appCfgDao.auditCfg(entity); + if(isAudit==1){ if(entity.getBehavCode()!=null){ entity.setCfgKeywords(entity.getAppCode()+"&"+entity.getBehavCode()); }else{ entity.setCfgKeywords(entity.getAppCode()+""); } - List list = new ArrayList(); list.add(entity); Map map = cfgConvert(strRegionList,list,2,entity,groupRelationList); groupRelationList=map.get("groupList"); strRegionList=map.get("dstList"); } + + //查询子配置并修改审核状态 + entity = this.getAppPolicyCfg(entity.getCfgId()); + if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ + IpPortCfg cfg = new IpPortCfg(); + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + cfg.setTableName(IpPortCfg.getTablename()); + appCfgDao.auditCfg(cfg); + if(isAudit==1){ + Map map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList); + groupRelationList=map.get("groupList"); + ipRegionList=map.get("dstList"); + if(map.get("numRegionList")!=null){ + numRegionList.addAll(map.get("numRegionList")); + } + } + } + //保存区域IP信息 List areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId()); if(!StringUtil.isEmpty(areaIpCfgList)){ @@ -810,6 +849,15 @@ public class AppCfgService extends BaseService { entity.setTableName(AppPolicyCfg.getTablename()); entity.setFunctionId(functionId); appCfgDao.updateCfgValid(entity); + + //查询子配置 + entity = this.getAppPolicyCfg(Long.parseLong(id)); + if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ + IpPortCfg cfg = new IpPortCfg(); + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + cfg.setTableName(IpPortCfg.getTablename()); + appCfgDao.updateCfgValid(cfg); + } //保存区域IP信息 if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){ AreaIpCfg cfg = new AreaIpCfg(); diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 729e1993a..1ff053c22 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -6,14 +6,11 @@ jdbc.devlop.username=root jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q== jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g== -jdbc.product.driver=oracle.jdbc.driver.OracleDriver -#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180)))) -jdbc.product.url=jdbc:oracle:thin:@10.0.6.212:1523:app -#jdbc.product.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl -jdbc.product.username=gk_pz -#jdbc.product.username=z2_5x9pz -jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw== -jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A== +jdbc.product.driver=com.mysql.jdbc.Driver +jdbc.product.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.product.username=root +jdbc.product.key=pR3JFt5dsGCW0nZO3TLF7Q== +jdbc.product.password=JgW5tsiGBNAtcqCgSQIP0g== #jdbc.log.driver=oracle.jdbc.driver.OracleDriver #jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index bfd7eced1..3e4a92ebe 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -605,7 +605,7 @@ action=\u52A8\u4F5C has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7 -multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002 +multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u56DE\u8F66\u952E\u9694\u5F00\u3002 action_drop=\u4E22\u5F03 action_reject=\u963B\u65AD action_redirect=\u91CD\u5B9A\u5411 @@ -814,4 +814,5 @@ FTP_CONTENT=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E id_not_exists=id\u4E3A%s\u7684%s\u4E0D\u5B58\u5728 id_not_valid=id\u4E3A%s\u7684%s\u65E0\u6548 num_split_by_comma=%s\u4E3A\u9017\u53F7\u5206\u9694\u7684\u6570\u5B57 +no_data=\u65E0\u76F8\u5173\u6570\u636E #=============region_value,config form title================= \ No newline at end of file diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 44371dfc5..1d7acde45 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -172,29 +172,29 @@ - + - + - + - + diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml index 7fbf8fd5b..bc2cb8810 100644 --- a/src/main/webapp/WEB-INF/sitemesh3.xml +++ b/src/main/webapp/WEB-INF/sitemesh3.xml @@ -26,6 +26,7 @@ + /articles/* diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 90306b787..9d2ebd092 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -10,6 +10,7 @@ $(function(){ }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); + $("#protocolId").val($(this).attr("protocolId")); if($(".action:checked").val()==64){ $("#ratelimit").show(); }else{ @@ -17,6 +18,7 @@ $(function(){ } }); $("#serviceId").val($(".action:checked").attr("serviceId")); + $("#protocolId").val($(".action:checked").attr("protocolId")); if($(".action:checked").val()==64){ $("#ratelimit").show(); }else{ @@ -43,6 +45,10 @@ $(function(){ } }) if(flag){ + //将disable属性的元素删除 + $(".disabled").each(function(){ + $(this).remove(); + }); $("input[name$='exprType']").attr("disabled",false); $("#appCode").val($("#specServiceIdId").val()); loading('onloading...'); @@ -52,6 +58,19 @@ $(function(){ errorContainer: "#messageBox", }); }); +//业务窗口打开 +var addContent = function(obj, contentClassName) { + var showDiv = $(obj).parent().parent().next(); + $(showDiv).removeClass("hidden").removeClass( + "disabled"); + $(obj).addClass("hidden"); +} + +//业务窗口关闭 +var delContent = function(contentClassName, addBtnClassName) { + $("." + contentClassName).addClass("hidden").addClass("disabled"); + $("." + addBtnClassName).removeClass("hidden"); +} @@ -82,75 +101,105 @@ $(function(){ - - - - - - -
-
-
-
- -
- -
-
-
-
- -
-
- -
- -
-
-
-
-
-
-
- -
- - - -
-
-
-
-
-
- -
- -
-
-
-
-
+ + + + + + +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ + +

+ + + +

+ + + + + +
+ <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> +
+ + + + + + + + + + + <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index 3874b5b0d..795f36c5c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -32,6 +32,51 @@ $("#level").attr("value",''); $("#searchForm")[0].reset(); }); + //异步获取策略ip相关信息 + $("span[id^=open]").click(function(){ + var openId=$(this).attr("id"); + var closeId=$(this).attr("id").replace("open","close"); + var index=$(this).attr("id").replace("open",""); + $("#"+openId).hide(); + $("#"+closeId).show(); + //var compileId=$(this).attr("compileId"); + var cfgId=$(this).attr("cfgId"); + if($("#"+openId).parent().parent().next("tr").hasClass("child")){ + $("#"+openId).parent().parent().next("tr").show(); + }else{ + $.ajax({ + type:'post', + async:false, + url:'${ctx}/app/ajaxAppPolicyIpList', + data:{"cfgId":cfgId,"index":index}, + dataType:"html", + success:function(data){ + var subTab=""+ + ""+ + ""+ + ""+ + ""; + var html=""; + html+="
"; + html = html+data; + subTab=subTab+html; + subTab+=""; + subTab+=""; + $("#"+openId).parent().parent().after(subTab); + $("div[name='tabTitle"+index+"']").get(0).click(); + } + }); + } + + }); + + $("span[id^=close]").on("click",function(){ + var closeId=$(this).attr("id"); + var openId=$(this).attr("id").replace("close","open"); + $("#"+closeId).hide(); + $("#"+openId).show(); + $("#"+closeId).parent().parent().next("tr").hide(); + }); }); @@ -287,6 +332,7 @@ + ▷ ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp new file mode 100644 index 000000000..8bb0252d2 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyIpList.jsp @@ -0,0 +1,130 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ + +
+
+
+
+
+
+ +
+
+
+
+ + + +
+ + +
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + + + + \ No newline at end of file From 29a800a800d4fc94a3684090b2d380504f76e671 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 4 Jul 2018 15:59:33 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E6=9D=83=E9=99=90=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/configuration/ntc/BgpCfgController.java | 2 +- .../configuration/ntc/FileTransferCfgController.java | 4 ++-- .../web/controller/configuration/ntc/MailCfgController.java | 2 +- .../web/controller/configuration/ntc/WebsiteController.java | 6 +++--- .../configuration/proxy/HttpRedirectPolicyController.java | 6 ------ 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 91766cba6..0631bc2e1 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -35,7 +35,7 @@ import com.nis.web.security.UserUtils; public class BgpCfgController extends BaseController{ @RequestMapping(value = {"bgpList"}) - @RequiresPermissions(value={"other:bgp:config"}) +// @RequiresPermissions(value={"other:bgp:config"}) public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg ,HttpServletRequest request,HttpServletResponse response ,RedirectAttributes redirectAttributes) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 2f47668f0..5c2e21554 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -47,7 +47,7 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/ntc/fileTransfer/") public class FileTransferCfgController extends BaseController{ @RequestMapping(value = {"ftpList"}) - @RequiresPermissions(value={"fileTransfer:ftp:config"}) +// @RequiresPermissions(value={"fileTransfer:ftp:config"}) public String ftpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = fileTransferCfgService.getFtpList(searchPage, cfg); @@ -131,7 +131,7 @@ public class FileTransferCfgController extends BaseController{ } @RequestMapping(value = {"fileDigestList"}) - @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) +// @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg ,HttpServletRequest request,HttpServletResponse response ,RedirectAttributes redirectAttributes) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index bc257553d..75e35434a 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -45,7 +45,7 @@ import com.nis.web.security.UserUtils; @RequestMapping("${adminPath}/ntc/mail/") public class MailCfgController extends BaseController{ @RequestMapping(value = {"mailList"}) - @RequiresPermissions(value={"mail:config"}) +// @RequiresPermissions(value={"mail:config"}) public String mailList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = mailCfgService.getMailList(searchPage, cfg); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 39db242b5..670e9c05b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -48,7 +48,7 @@ import com.nis.web.security.UserUtils; public class WebsiteController extends BaseController{ @RequestMapping(value = {"httpList"}) - @RequiresPermissions(value={"website:http:config"}) +// @RequiresPermissions(value={"website:http:config"}) public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = websiteCfgService.getWebsiteList(searchPage, cfg); @@ -57,7 +57,7 @@ public class WebsiteController extends BaseController{ return "/cfg/website/httpList"; } @RequestMapping(value = {"dnsList"}) - @RequiresPermissions(value={"website:dns:config"}) +// @RequiresPermissions(value={"website:dns:config"}) public String dnsList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = websiteCfgService.getWebsiteList(searchPage, cfg); @@ -207,7 +207,7 @@ public class WebsiteController extends BaseController{ return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId; } @RequestMapping(value = {"sslList"}) - @RequiresPermissions(value={"website:ssl:config"}) +// @RequiresPermissions(value={"website:ssl:config"}) public String sslList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); Page page = websiteCfgService.getWebsiteList(searchPage, cfg); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 5f183849d..3fd5505bb 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -17,18 +16,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; -import com.nis.domain.configuration.AreaIpCfg; -import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.HttpBodyCfg; 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.exceptions.MaatConvertException; import com.nis.util.Constants; -import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; import com.nis.web.security.UserUtils; From 0d80f521575e74b796e8bef803baac07c7c9fb55 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 4 Jul 2018 16:14:58 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=85=B1=E7=94=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 92dff7c9b..682e6d67d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -123,7 +123,7 @@ - +
- -
- - +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index b4c4b5cfe..b2febeaf8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -464,6 +464,8 @@ + + @@ -495,6 +497,14 @@ + + + + + + + + ${indexCfg.userRegion2 } From a91729aa96737fd6762fd2f5b783610257fa0b97 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 5 Jul 2018 13:01:59 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9C=8D=E5=8A=A1=E5=85=AC=E5=85=B1=E7=B1=BB?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=85=AC=E5=85=B1=E8=B0=83=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/log/BaseReportLog.java | 87 +++++++++++++ .../java/com/nis/domain/log/ReportLog.java | 4 +- .../com/nis/domain/log/ReportResultLog.java | 58 +++++++-- .../java/com/nis/domain/log/SearchReport.java | 121 ++++++++++++++++++ .../java/com/nis/util/ConfigServiceUtil.java | 24 ++-- 5 files changed, 271 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/nis/domain/log/BaseReportLog.java create mode 100644 src/main/java/com/nis/domain/log/SearchReport.java diff --git a/src/main/java/com/nis/domain/log/BaseReportLog.java b/src/main/java/com/nis/domain/log/BaseReportLog.java new file mode 100644 index 000000000..51482b128 --- /dev/null +++ b/src/main/java/com/nis/domain/log/BaseReportLog.java @@ -0,0 +1,87 @@ +/** + *@Title: BaseReportLog.java + *@Package com.nis.domain.log + *@Description TODO + *@author dell + *@date 2018年7月5日 上午11:12:48 + *@version 版本号 + */ +package com.nis.domain.log; + +import java.util.Date; +import java.util.Map.Entry; + +import javax.ws.rs.client.Invocation.Builder; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.nis.domain.BaseEntity; +import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; +import com.nis.util.StringUtils; +import com.nis.util.httpclient.ClientUtil; + +/** + * @ClassName: BaseReportLog.java + * @Description: 报表接口返回的公共字段 + * @author (wx) + * @date 2018年7月5日 上午11:12:48 + * @version V1.0 + */ +public class BaseReportLog extends BaseEntity { + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -6190203013788730697L; + protected Long sum; + protected Integer service; + protected Date reportTime; + /** + * sum + * @return sum + */ + + public Long getSum() { + return sum; + } + /** + * @param sum the sum to set + */ + public void setSum(Long sum) { + this.sum = sum; + } + /** + * service + * @return service + */ + + public Integer getService() { + return service; + } + /** + * @param service the service to set + */ + public void setService(Integer service) { + this.service = service; + } + /** + * reportTime + * @return reportTime + */ + + public Date getReportTime() { + return reportTime; + } + /** + * @param reportTime the reportTime to set + */ + public void setReportTime(Date reportTime) { + this.reportTime = reportTime; + } +} diff --git a/src/main/java/com/nis/domain/log/ReportLog.java b/src/main/java/com/nis/domain/log/ReportLog.java index d912e813b..4cf45a790 100644 --- a/src/main/java/com/nis/domain/log/ReportLog.java +++ b/src/main/java/com/nis/domain/log/ReportLog.java @@ -10,8 +10,6 @@ package com.nis.domain.log; import java.util.Date; -import com.nis.domain.BaseEntity; - /** * @ClassName: ReportLog.java * @Description: TODO @@ -19,7 +17,7 @@ import com.nis.domain.BaseEntity; * @date 2018年6月13日 下午2:21:04 * @version V1.0 */ -public class ReportLog extends BaseEntity{ +public class ReportLog extends BaseReportLog{ /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/log/ReportResultLog.java b/src/main/java/com/nis/domain/log/ReportResultLog.java index 19b50d3dc..8af6ce0ca 100644 --- a/src/main/java/com/nis/domain/log/ReportResultLog.java +++ b/src/main/java/com/nis/domain/log/ReportResultLog.java @@ -8,12 +8,21 @@ */ package com.nis.domain.log; -import java.util.Date; -import java.util.List; +import java.util.Map.Entry; -import com.nis.domain.BaseEntity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.client.Invocation.Builder; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; import com.nis.domain.Page; import com.nis.domain.RestfulResult; +import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; +import com.nis.util.StringUtils; +import com.nis.util.httpclient.ClientUtil; /** * @ClassName: ReportResultLog.java @@ -22,9 +31,9 @@ import com.nis.domain.RestfulResult; * @date 2018年6月11日 下午2:04:09 * @version V1.0 */ -public class ReportResultLog extends RestfulResult{ +public class ReportResultLog extends RestfulResult{ private Integer logSource; - private Page data; + private Page data; /** * logSource * @return logSource @@ -44,14 +53,47 @@ public class ReportResultLog extends RestfulResult{ * @return data */ - public Page getData() { + public Page getData() { return data; } /** * @param data the data to set */ - public void setData(Page data) { + public void setData(Page data) { this.data = data; } - + public ReportResultLog getReport(String reportUrl,SearchReport searchCondition) throws MaatConvertException{ + if(StringUtils.isBlank(searchCondition.getSearchService())){ + throw new MaatConvertException(""); + } + String result = null; + ReportResultLog bean = null; + StringBuffer url=new StringBuffer(reportUrl+"?"); + url.append("searchBusinessType=").append(searchCondition.getSearchBusinessType()) + .append("&searchService=").append(searchCondition.getSearchService()); + if(searchCondition.getSearchCondition()!=null){ + for(Entry e:searchCondition.getSearchCondition().entrySet()){ + url.append("&").append(e.getKey()).append("=").append((String)e.getValue()); + } + } + if(StringUtils.isNotBlank(searchCondition.getSearchReportStartTime())){ + url.append("&searchReportStartTime=").append(searchCondition.getSearchReportStartTime()); + } + if(StringUtils.isNotBlank(searchCondition.getSearchReportEndTime())){ + url.append("&searchReportEndTime=").append(searchCondition.getSearchReportEndTime()); + } + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url.toString()); + Builder header = wt.request(MediaType.APPLICATION_JSON); + Response response= header.get(); + if( response.getStatus() == 200){ + result= response.readEntity(String.class); + Gson gson=Constants.gsonbuilder.create(); + bean = gson.fromJson(result, new TypeToken>(){ + private static final long serialVersionUID = 7963055764864141968L;}.getType()); + }else{ + throw new MaatConvertException(":"+response.readEntity(String.class)); + } + return bean; + } } \ No newline at end of file diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java new file mode 100644 index 000000000..fdfc207e9 --- /dev/null +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -0,0 +1,121 @@ +/** + *@Title: SearchReport.java + *@Package com.nis.domain.log + *@Description TODO + *@author dell + *@date 2018年7月5日 下午12:30:44 + *@version 版本号 + */ +package com.nis.domain.log; + +import java.util.HashMap; + +/** + * @ClassName: SearchReport.java + * @Description: TODO + * @author (wx) + * @date 2018年7月5日 下午12:30:44 + * @version V1.0 + */ +public class SearchReport { + private String searchBusinessType; + private String searchReportStartTime; + private String searchReportEndTime; + private String searchService; + private HashMap searchCondition; + public static final String searchConditionSplitor=","; + public int searchConditionLimit; + /** + * searchBusinessType + * @return searchBusinessType + */ + + public String getSearchBusinessType() { + return searchBusinessType; + } + /** + * @param searchBusinessType the searchBusinessType to set + */ + public void setSearchBusinessType(String searchBusinessType) { + this.searchBusinessType = searchBusinessType; + } + /** + * searchReportStartTime + * @return searchReportStartTime + */ + + public String getSearchReportStartTime() { + return searchReportStartTime; + } + /** + * @param searchReportStartTime the searchReportStartTime to set + */ + public void setSearchReportStartTime(String searchReportStartTime) { + this.searchReportStartTime = searchReportStartTime; + } + /** + * searchReportEndTime + * @return searchReportEndTime + */ + + public String getSearchReportEndTime() { + return searchReportEndTime; + } + /** + * @param searchReportEndTime the searchReportEndTime to set + */ + public void setSearchReportEndTime(String searchReportEndTime) { + this.searchReportEndTime = searchReportEndTime; + } + /** + * searchService + * @return searchService + */ + + public String getSearchService() { + return searchService; + } + /** + * @param searchService the searchService to set + */ + public void setSearchService(String searchService) { + this.searchService = searchService; + } + /** + * searchCondition + * @return searchCondition + */ + + public HashMap getSearchCondition() { + return searchCondition; + } + /** + * @param searchCondition the searchCondition to set + */ + public void setSearchCondition(HashMap searchCondition) { + this.searchCondition = searchCondition; + } + /** + * searchConditionLimit + * @return searchConditionLimit + */ + + public int getSearchConditionLimit() { + return searchConditionLimit; + } + /** + * @param searchConditionLimit the searchConditionLimit to set + */ + public void setSearchConditionLimit(int searchConditionLimit) { + this.searchConditionLimit = searchConditionLimit; + } + /** + * searchconditionsplitor + * @return searchconditionsplitor + */ + + public static String getSearchconditionsplitor() { + return searchConditionSplitor; + } + +} diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 63db81f2b..79c81db9a 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -1,32 +1,31 @@ package com.nis.util; import java.io.File; -import java.io.IOException; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; - import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import com.nis.domain.log.ReportLog; import com.nis.domain.log.ReportResultLog; import com.nis.domain.maat.ToMaatResult; -import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.exceptions.MaatConvertException; import com.nis.util.httpclient.ClientUtil; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; + public class ConfigServiceUtil { private static Logger logger = LoggerFactory.getLogger(ConfigServiceUtil.class); /*public static class MapTypeAdapter extends TypeAdapter { @@ -310,12 +309,12 @@ public class ConfigServiceUtil { * @exception * @since 1.0.0 */ - public static ReportResultLog getReport(int type,String ids,String serviceIds,String searchReportStartTime,String searchReportEndTime) throws MaatConvertException{ + public static ReportResultLog getReport(int type,String ids,String serviceIds,String searchReportStartTime,String searchReportEndTime) throws MaatConvertException{ if(StringUtils.isBlank(ids)||StringUtils.isBlank(serviceIds)){ throw new MaatConvertException(""); } String result = null; - ReportResultLog bean = null; + ReportResultLog bean = null; StringBuffer url=new StringBuffer(Constants.SERVICE_URL+Constants.NTC_PZ_REPORT+"?"); url.append("searchBusinessType=").append(type) .append("&searchService=").append(serviceIds).append("&searchCfgId=").append(ids); @@ -331,8 +330,9 @@ public class ConfigServiceUtil { Response response= header.get(); if( response.getStatus() == 200){ result= response.readEntity(String.class); - JSONObject resObject = JSONObject.fromObject(result); - bean = (ReportResultLog) JSONObject.toBean(resObject,ReportResultLog.class); + Gson gson=Constants.gsonbuilder.create(); + bean = gson.fromJson(result, new TypeToken>(){ + private static final long serialVersionUID = 7963055764864141968L;}.getType()); }else{ throw new MaatConvertException(":"+response.readEntity(String.class)); } From 6ae421948271f8caa29f57757a1479d37df44103 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 5 Jul 2018 17:13:48 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/log/BaseReportLog.java | 12 - .../com/nis/domain/log/ReportResultLog.java | 3 + .../web/controller/report/TestController.java | 33 ++ src/main/webapp/WEB-INF/views/report/test.jsp | 407 ++++++++++++++++++ 4 files changed, 443 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/nis/web/controller/report/TestController.java create mode 100644 src/main/webapp/WEB-INF/views/report/test.jsp diff --git a/src/main/java/com/nis/domain/log/BaseReportLog.java b/src/main/java/com/nis/domain/log/BaseReportLog.java index 51482b128..7061da40e 100644 --- a/src/main/java/com/nis/domain/log/BaseReportLog.java +++ b/src/main/java/com/nis/domain/log/BaseReportLog.java @@ -9,20 +9,8 @@ package com.nis.domain.log; import java.util.Date; -import java.util.Map.Entry; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; import com.nis.domain.BaseEntity; -import com.nis.exceptions.MaatConvertException; -import com.nis.util.Constants; -import com.nis.util.StringUtils; -import com.nis.util.httpclient.ClientUtil; /** * @ClassName: BaseReportLog.java diff --git a/src/main/java/com/nis/domain/log/ReportResultLog.java b/src/main/java/com/nis/domain/log/ReportResultLog.java index 8af6ce0ca..3619cd8c4 100644 --- a/src/main/java/com/nis/domain/log/ReportResultLog.java +++ b/src/main/java/com/nis/domain/log/ReportResultLog.java @@ -96,4 +96,7 @@ public class ReportResultLog extends RestfulResult{ } return bean; } + public static void main(String[] args) { + + } } \ No newline at end of file diff --git a/src/main/java/com/nis/web/controller/report/TestController.java b/src/main/java/com/nis/web/controller/report/TestController.java new file mode 100644 index 000000000..837715e2e --- /dev/null +++ b/src/main/java/com/nis/web/controller/report/TestController.java @@ -0,0 +1,33 @@ +package com.nis.web.controller.report; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.mysql.fabric.xmlrpc.base.Array; +import com.nis.domain.Page; +import com.nis.domain.configuration.IpPortCfg; +import com.nis.domain.log.NtcDnsLog; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping("${adminPath}/report/test") +public class TestController extends BaseController { + + @RequestMapping("list") + public String list(@ModelAttribute("cfg") IpPortCfg cfg,Model model, HttpServletRequest request, HttpServletResponse response) { + Page page=new Page(request, response); + List list=new ArrayList(); + list.add(new IpPortCfg()); + page.setList(list); + model.addAttribute("page", page); + return "/report/test"; + } +} diff --git a/src/main/webapp/WEB-INF/views/report/test.jsp b/src/main/webapp/WEB-INF/views/report/test.jsp new file mode 100644 index 000000000..3d2053954 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/test.jsp @@ -0,0 +1,407 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="test"></spring:message> + + + +
+ +

+ + +

+
+
+
+
+
+
+ + + + + + + + + +
+
+ + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ + + + +
+
+ href="javascript:;"> + + +
+
+ + + +
+
+ + +
+ +
+ +
+ +
+ <%--
+ + + + + + + + + + + + + + + +
时间数量业务类型
2018-07-05 15:0011
+
${page}
+
--%> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标签0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
来文函号0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属省所属市0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属国家0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
局点0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
+
+
+ +
+
+
+ + \ No newline at end of file From ac38c85b6b23354b665c9a12be4695afeb618436 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 6 Jul 2018 09:39:35 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/log/SearchReport.java | 56 +++- .../nis/web/controller/report/TestBean.java | 29 ++ .../web/controller/report/TestController.java | 13 +- .../webapp/WEB-INF/views/report/attrType.jsp | 42 +++ .../webapp/WEB-INF/views/report/destIp.jsp | 42 +++ .../WEB-INF/views/report/entranceId.jsp | 42 +++ .../webapp/WEB-INF/views/report/label.jsp | 42 +++ src/main/webapp/WEB-INF/views/report/lwhh.jsp | 42 +++ .../webapp/WEB-INF/views/report/srcIp.jsp | 43 +++ src/main/webapp/WEB-INF/views/report/test.jsp | 311 +----------------- 10 files changed, 359 insertions(+), 303 deletions(-) create mode 100644 src/main/java/com/nis/web/controller/report/TestBean.java create mode 100644 src/main/webapp/WEB-INF/views/report/attrType.jsp create mode 100644 src/main/webapp/WEB-INF/views/report/destIp.jsp create mode 100644 src/main/webapp/WEB-INF/views/report/entranceId.jsp create mode 100644 src/main/webapp/WEB-INF/views/report/label.jsp create mode 100644 src/main/webapp/WEB-INF/views/report/lwhh.jsp create mode 100644 src/main/webapp/WEB-INF/views/report/srcIp.jsp diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index fdfc207e9..f200bb31b 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -10,6 +10,8 @@ package com.nis.domain.log; import java.util.HashMap; +import com.nis.domain.BaseEntity; + /** * @ClassName: SearchReport.java * @Description: TODO @@ -17,7 +19,17 @@ import java.util.HashMap; * @date 2018年7月5日 下午12:30:44 * @version V1.0 */ -public class SearchReport { +public class SearchReport extends BaseEntity{ + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 1L; + private Integer functionId; + private String cfgName; + private Integer action; private String searchBusinessType; private String searchReportStartTime; private String searchReportEndTime; @@ -25,6 +37,48 @@ public class SearchReport { private HashMap searchCondition; public static final String searchConditionSplitor=","; public int searchConditionLimit; + /** + * functionId + * @return functionId + */ + + public Integer getFunctionId() { + return functionId; + } + /** + * @param functionId the functionId to set + */ + public void setFunctionId(Integer functionId) { + this.functionId = functionId; + } + /** + * cfgName + * @return cfgName + */ + + public String getCfgName() { + return cfgName; + } + /** + * @param cfgName the cfgName to set + */ + public void setCfgName(String cfgName) { + this.cfgName = cfgName; + } + /** + * action + * @return action + */ + + public Integer getAction() { + return action; + } + /** + * @param action the action to set + */ + public void setAction(Integer action) { + this.action = action; + } /** * searchBusinessType * @return searchBusinessType diff --git a/src/main/java/com/nis/web/controller/report/TestBean.java b/src/main/java/com/nis/web/controller/report/TestBean.java new file mode 100644 index 000000000..740735fbc --- /dev/null +++ b/src/main/java/com/nis/web/controller/report/TestBean.java @@ -0,0 +1,29 @@ +/** + *@Title: TestBean.java + *@Package com.nis.web.controller.report + *@Description TODO + *@author dell + *@date 2018年7月6日 上午9:20:48 + *@version 版本号 + */ +package com.nis.web.controller.report; + +import com.nis.domain.log.BaseReportLog; + +/** + * @ClassName: TestBean.java + * @Description: TODO + * @author (dell) + * @date 2018年7月6日 上午9:20:48 + * @version V1.0 + */ +public class TestBean extends BaseReportLog { + + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -8794587413327741665L; +} diff --git a/src/main/java/com/nis/web/controller/report/TestController.java b/src/main/java/com/nis/web/controller/report/TestController.java index 837715e2e..840fd95d3 100644 --- a/src/main/java/com/nis/web/controller/report/TestController.java +++ b/src/main/java/com/nis/web/controller/report/TestController.java @@ -11,10 +11,8 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import com.mysql.fabric.xmlrpc.base.Array; import com.nis.domain.Page; -import com.nis.domain.configuration.IpPortCfg; -import com.nis.domain.log.NtcDnsLog; +import com.nis.domain.log.SearchReport; import com.nis.web.controller.BaseController; @Controller @@ -22,12 +20,13 @@ import com.nis.web.controller.BaseController; public class TestController extends BaseController { @RequestMapping("list") - public String list(@ModelAttribute("cfg") IpPortCfg cfg,Model model, HttpServletRequest request, HttpServletResponse response) { - Page page=new Page(request, response); - List list=new ArrayList(); - list.add(new IpPortCfg()); + public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) { + Page page=new Page(request, response); + List list=new ArrayList<>(); + list.add(new TestBean()); page.setList(list); model.addAttribute("page", page); + model.addAttribute("bean", bean); return "/report/test"; } } diff --git a/src/main/webapp/WEB-INF/views/report/attrType.jsp b/src/main/webapp/WEB-INF/views/report/attrType.jsp new file mode 100644 index 000000000..015959889 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/attrType.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/destIp.jsp b/src/main/webapp/WEB-INF/views/report/destIp.jsp new file mode 100644 index 000000000..e65b43edc --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/destIp.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属国家总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/entranceId.jsp b/src/main/webapp/WEB-INF/views/report/entranceId.jsp new file mode 100644 index 000000000..e6b77f476 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/entranceId.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
局点总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp new file mode 100644 index 000000000..7d2cca059 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标签总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/lwhh.jsp b/src/main/webapp/WEB-INF/views/report/lwhh.jsp new file mode 100644 index 000000000..1d2a8b5f8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/lwhh.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
性质总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp new file mode 100644 index 000000000..63cc402ae --- /dev/null +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -0,0 +1,43 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
所属省所属市总量0点1点2点3点4点5点6点7点8点9点10点11点12点14点15点16点17点18点19点20点21点22点23点
+
${page}
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/test.jsp b/src/main/webapp/WEB-INF/views/report/test.jsp index 3d2053954..366b517de 100644 --- a/src/main/webapp/WEB-INF/views/report/test.jsp +++ b/src/main/webapp/WEB-INF/views/report/test.jsp @@ -2,31 +2,11 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> -<spring:message code="test"></spring:message> +<spring:message code="${bean.cfgName}"></spring:message> + + +
+ +

+ + +

+
+
+
+
+
+
+ + + + + + +
+
+ + + + + + + + + + +
+
+
+ + + +
+
+
+ + + + +
+
+ href="javascript:;"> + + +
+
+ + + +
+
+ + +
+ +
+ +
+ +
+ <%@include file="/WEB-INF/views/report/label.jsp" %> + <%@include file="/WEB-INF/views/report/attrType.jsp" %> + <%@include file="/WEB-INF/views/report/lwhh.jsp" %> + <%@include file="/WEB-INF/views/report/srcIp.jsp" %> + <%@include file="/WEB-INF/views/report/destIp.jsp" %> + <%@include file="/WEB-INF/views/report/entranceId.jsp" %> +
+
+ +
+
+
+ + \ No newline at end of file