diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index c1c6725b3..471eadc3c 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.nis.domain.configuration.BaseCfg; import com.nis.util.DateUtils; import com.nis.util.JsonMapper; import com.nis.web.service.ArchiveServcie; @@ -31,6 +32,7 @@ import com.nis.web.service.configuration.FtpCfgService; import com.nis.web.service.configuration.IpCfgService; import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.MediaCfgService; +import com.nis.web.service.configuration.RequestInfoService; import com.nis.web.service.configuration.ServiceDictInfoService; import com.nis.web.service.configuration.SslCfgService; import com.nis.web.service.configuration.SysDictInfoService; @@ -105,6 +107,9 @@ public class BaseController { @Autowired protected ServiceConfigInfoService serviceConfigInfoService; + + @Autowired + protected RequestInfoService requestInfoService; /** * 管理基础路径 */ @@ -205,8 +210,4 @@ public class BaseController { } }); } - - - - } diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 1f000bb1c..40b34c2cd 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -1,5 +1,8 @@ package com.nis.web.controller.configuration; +import java.util.Date; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -8,11 +11,14 @@ 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 org.springframework.web.bind.annotation.RequestMethod; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.RequestInfo; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.Constants; import com.nis.web.controller.BaseController; /** @@ -23,11 +29,9 @@ import com.nis.web.controller.BaseController; @Controller @RequestMapping("${adminPath}/cfg/ip") public class IpCfgController extends BaseController{ -// @Autowired -// protected IpCfgService ipCfgService; @RequestMapping(value = {"ipWhiteList"}) - public String ipWhiteList() { + public String ipWhiteList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) { return "/cfg/ipWhiteList"; } @@ -37,34 +41,52 @@ public class IpCfgController extends BaseController{ return "/cfg/ipWhiteForm"; } - @RequestMapping(value = {"ipBlockList"}) - public String ipBlockList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) { - if(baseIpCfg!=null){ - Integer serviceId=baseIpCfg.getServiceId(); - logger.info("sercice id is "+serviceId); + @RequestMapping(value = {"ipCfgList"}) + public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + if(ipCfg!=null){ + Integer serviceId=ipCfg.getServiceId(); + logger.info("servcice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); - baseIpCfg.setTableName(tableName); - Page page = ipCfgService.findPage(new Page(request, response, 1), baseIpCfg); + ipCfg.setTableName(tableName); + Page searchPage=new Page(request, response, 1); + if(pageNo!=null) searchPage.setPageNo(pageNo); + if(pageSize!=null) searchPage.setPageSize(pageSize); + if(ipCfg.getPage()!=null){ + if(!StringUtils.isBlank(ipCfg.getPage().getOrderBy())); + searchPage.setOrderBy(ipCfg.getPage().getOrderBy()); + } + Page page = ipCfgService.findPage(searchPage, ipCfg); model.addAttribute("page", page); model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", ipCfg.getAction()); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); } + }else{ + logger.error("未获取到正确的serviceId"); } } } - return "/cfg/ipBlockList"; + return "/cfg/ipCfgList"; } - @RequestMapping(value = {"ipBlockForm"}) - public String ipBlockForm(Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + @RequestMapping(value = {"ipCfgForm"}) + public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { logger.info("sercice id is "+serviceId); - System.out.println("ipBlockForm loaded"); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ @@ -80,7 +102,18 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipcfg=(BaseIpCfg)clazz.newInstance(); ipcfg.setTableName(tableName); ipcfg.initDefaultValue(); + ipcfg.setAction(action); + ipcfg.setServiceId(serviceId); model.addAttribute("_ipCfg", ipcfg); + model.addAttribute("cfgName", cfgName); + List requestInfos=requestInfoService.getValidRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findLableDict(); + model.addAttribute("lables", lables); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { // TODO Auto-generated catch block logger.error("打开新增IP窗口失败",e); @@ -88,25 +121,293 @@ public class IpCfgController extends BaseController{ } } } + }else{ + logger.error("未获取到正确的serviceId"); } - return "/cfg/ipBlockForm"; + return "/cfg/ipCfgForm"; } + @RequestMapping(value = {"updateIpCfgForm"}) + public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + BaseIpCfg searchBean=new BaseIpCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); + model.addAttribute("_ipCfg", ipCfg); + model.addAttribute("cfgName", cfgName); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + BaseIpCfg searchBean=new BaseIpCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); + model.addAttribute("_ipCfg", ipCfg); + model.addAttribute("cfgName", cfgName); + List requestInfos=requestInfoService.getAllRequestInfo(); + model.addAttribute("requestInfos", requestInfos); + List fls=serviceDictInfoService.findAllFlDict(); + model.addAttribute("fls", fls); + List xzs=serviceDictInfoService.findAllXzDict(); + model.addAttribute("xzs", xzs); + List lables=serviceDictInfoService.findAllLableDict(); + model.addAttribute("lables", lables); + + } + } + }else{ + logger.error("未获取到正确的表名"); + } + + return "/cfg/ipCfgForm"; + } + /** * - * addIpPortCfg(新增IP配置) + * addIpCfg(新增IP配置) * (这里描述这个方法适用条件 – 可选) * @return *String * @exception * @since 1.0.0 */ - @RequestMapping(method=RequestMethod.POST,value = {"addIpCfg"}) - public String addIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) { - if(ipCfg!=null&&!StringUtils.isBlank(ipCfg.getTableName())){ - int result=ipCfgService.addIpCfg(ipCfg); + @RequestMapping(value = {"saveOrUpdateIpCfg"}) + public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) { + logger.info("saveOrUpdateIpCfg loaded"); + if(ipCfg==null){ + logger.error("无法保存空的配置！"); + addMessage(model,"保存失败！"); + }else if(!StringUtils.isBlank(ipCfg.getTableName())){ + int serviceId=ipCfg.getServiceId(); + long compileId=getCompileId(ipCfg); + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); + ipCfg.setIsValid(Constants.VALID_NO); + ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); + ipCfg.setCompileId(compileId); + if(ipCfg.getCfgId()==null) + ipCfgService.addIpCfg(ipCfg); + else + ipCfgService.updateIpCfg(ipCfg); + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",ipCfg.getAction()); + model.addAttribute("cfgName",cfgName); + addMessage(model,"保存成功,正在为您跳转页面..."); + }else if(ipCfg.getServiceId()!=null){ + int serviceId=ipCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + long compileId=getCompileId(ipCfg); + ipCfg.setTableName(tableName); + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); + ipCfg.setIsValid(Constants.VALID_NO); + ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); + ipCfg.setCompileId(compileId); + if(ipCfg.getCfgId()==null) + ipCfgService.addIpCfg(ipCfg); + else + ipCfgService.updateIpCfg(ipCfg); + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",ipCfg.getAction()); + model.addAttribute("cfgName",cfgName); + addMessage(model,"保存成功,正在为您跳转页面..."); + } + } + }else{ + addMessage(model,"保存失败！"); + logger.error("无法确定IP配置的表名！"); } - return "/cfg/ipBlockForm"; + return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName); } + /** + * + * updateIpCfg(更新IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ +// @RequestMapping(value = {"updateIpCfg"}) +// public String updateIpCfg(@ModelAttribute("ipCfg") BaseIpCfg ipCfg) { +// if(ipCfg==null){ +// logger.error("无法修改空的配置！"); +// }else if(!StringUtils.isBlank(ipCfg.getTableName())){ +// int audit=ipCfgService.getIsAudit(ipCfg); +// //审核未通过方可修改 +// if(audit==Constants.AUDIT_NO){ +// ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); +// ipCfg.setEditTime(new Date()); +// int result=ipCfgService.updateIpCfg(ipCfg); +// }else{ +// logger.warn("审核未通过配置方可修改！"); +// } +// }else if(ipCfg.getServiceId()!=null){ +// int serviceId=ipCfg.getServiceId(); +// ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); +// if(serviceConfigInfo!=null){ +// String tableName=serviceConfigInfo.getTableName(); +// if(!StringUtils.isBlank(tableName)){ +// ipCfg.setTableName(tableName); +// int audit=ipCfgService.getIsAudit(ipCfg); +// //审核未通过方可修改 +// if(audit==Constants.AUDIT_NO){ +// ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); +// ipCfg.setEditTime(new Date()); +// int result=ipCfgService.updateIpCfg(ipCfg); +// }else{ +// logger.warn("审核未通过配置方可修改！"); +// } +// } +// } +// }else{ +// logger.error("无法确定IP配置的表名！"); +// } +// return "/cfg/resultPage"; +// } + /** + * + * auditIpCfg(审核IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"auditIpCfg"}) + public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { + if(ipCfg==null){ + logger.error("无法审核空的配置！"); + }else if(!StringUtils.isBlank(ipCfg.getTableName())){ + int audit=ipCfgService.getIsAudit(ipCfg); + if(audit==Constants.AUDIT_YES&&ipCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + ipCfg.setAuditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setAuditTime(new Date()); + + if(ipCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + ipCfg.setIsValid(Constants.VALID_NO); + }else if(ipCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + ipCfg.setIsValid(Constants.VALID_YES); + } + int result=ipCfgService.auditIpCfg(ipCfg); + } + + }else if(ipCfg.getServiceId()!=null){ + int serviceId=ipCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + ipCfg.setTableName(tableName); + int audit=ipCfgService.getIsAudit(ipCfg); + if(audit==Constants.AUDIT_YES&&ipCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + ipCfg.setAuditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setAuditTime(new Date()); + + if(ipCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + ipCfg.setIsValid(Constants.VALID_NO); + }else if(ipCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + ipCfg.setIsValid(Constants.VALID_YES); + } + int result=ipCfgService.auditIpCfg(ipCfg); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "redirect:" + adminPath + "/cfg/ip/ipCfgList?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName; + } + /** + * + * auditIpCfg(删除IP配置，逻辑删除) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"deleteIpCfg"}) + public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + if(!StringUtils.isBlank(tableName)){ + int audit=ipCfgService.getIsAudit(tableName,cfgId); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + BaseIpCfg ipCfg=new BaseIpCfg(); + ipCfg.setCfgId(cfgId); + ipCfg.setTableName(tableName); + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); + ipCfg.setIsValid(Constants.VALID_DEL); + int result=ipCfgService.deleteIpCfg(ipCfg); + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + BaseIpCfg ipCfg=new BaseIpCfg(); + ipCfg.setCfgId(cfgId); + ipCfg.setTableName(tableName); + int audit=ipCfgService.getIsAudit(ipCfg); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); + ipCfg.setIsValid(Constants.VALID_DEL); + int result=ipCfgService.deleteIpCfg(ipCfg); + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage"; + } + /** + * + * getCompileId(获取编译ID) + * (这里描述这个方法适用条件 – 可选) + * @return + *long + * @exception + * @since 1.0.0 + */ + protected long getCompileId(BaseCfg cfg){ + return 0; + } } diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index 20ee186b6..b96fe0341 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -18,9 +18,12 @@ public interface IpCfgDao extends CrudDao{ public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; public BaseIpCfg get(BaseIpCfg entity) ; public List findList(BaseIpCfg entity) ; - public List findAllList(BaseIpCfg entity) ; public int insert(BaseIpCfg entity) ; public int updateByPrimaryKeySelective(BaseIpCfg entity) ; public int updateValid(BaseIpCfg entity) ; - public int delete(BaseIpCfg entity) ; + public int audit(BaseIpCfg entity) ; + public int getIsValid(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsValid(BaseIpCfg entity); + public int getIsAudit(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsAudit(BaseIpCfg entity); } diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index ab4e44f49..d2cd15561 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -12,7 +12,7 @@ - + @@ -34,6 +34,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,6 +92,14 @@ SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.IP_TYPE as ipType, r.SRC_IP as scrIp, r.SRC_IP_MASK as srcIpMask, r.SRC_PORT as srcPort, + r.SRC_PORT_MASK as srcPortMask ,r.DST_IP as dstIp,r.DST_IP_MASK as dstIpMask, r.DST_PORT as dstPort, r.DST_PORT_MASK as dstPortMask, + r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, SRC_PORT_MASK ,DST_IP ,DST_IP_MASK, DST_PORT, DST_PORT_MASK, @@ -89,101 +133,235 @@ FROM ${tableName} - CFG_ID=#{cfgId,jdbcType=BIGINT} + AND CFG_ID=#{cfgId,jdbcType=BIGINT} - CFG_DESC=#{cfgDesc,jdbcType=VARCHAR} + AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR} - IP_TYPE=#{ipType,jdbcType=INTEGER} + AND IP_TYPE=#{ipType,jdbcType=INTEGER} - SRC_IP=#{srcIp,jdbcType=VARCHAR} + AND SRC_IP=#{srcIp,jdbcType=VARCHAR} - SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR} + AND SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR} - SRC_PORT=#{srcPort,jdbcType=VARCHAR} + AND SRC_PORT=#{srcPort,jdbcType=VARCHAR} - SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR} + AND SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR} - DST_IP=#{dstIp,jdbcType=VARCHAR} + AND DST_IP=#{dstIp,jdbcType=VARCHAR} - DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR} + AND DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR} - DST_PORT=#{dstPort,jdbcType=VARCHAR} + AND DST_PORT=#{dstPort,jdbcType=VARCHAR} - DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR} + AND DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR} - DIRECTION=#{direction,jdbcType=INTEGER} + AND DIRECTION=#{direction,jdbcType=INTEGER} - PROTOCOL=#{protocol,jdbcType=INTEGER} + AND PROTOCOL=#{protocol,jdbcType=INTEGER} - PROTOCOL_ID=#{protocolId,jdbcType=INTEGER} + AND PROTOCOL_ID=#{protocolId,jdbcType=INTEGER} - ACTION=#{action,jdbcType=INTEGER} + AND ACTION=#{action,jdbcType=INTEGER} - IS_VALID=#{isValid,jdbcType=INTEGER} + AND IS_VALID=#{isValid,jdbcType=INTEGER} - IS_AUDIT=#{isAudit,jdbcType=INTEGER} + AND IS_AUDIT=#{isAudit,jdbcType=INTEGER} - CREATOR_ID=#{creatorId,jdbcType=INTEGER} + AND CREATOR_ID=#{creatorId,jdbcType=INTEGER} - CREATE_TIME=#{createTime,jdbcType=TIMESTAMP} + AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP} - EDITOR_ID=#{editorId,jdbcType=INTEGER} + AND EDITOR_ID=#{editorId,jdbcType=INTEGER} - EDIT_TIME=#{editTime,jdbcType=TIMESTAMP} + AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP} - AUDITOR_ID=#{auditorId,jdbcType=INTEGER} + AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER} - AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} + AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} - SERVICE_ID=#{serviceId,jdbcType=INTEGER} + AND SERVICE_ID=#{serviceId,jdbcType=INTEGER} - REQUEST_ID=#{requestId,jdbcType=INTEGER} + AND REQUEST_ID=#{requestId,jdbcType=INTEGER} - COMPILE_ID=#{compileId,jdbcType=INTEGER} + AND COMPILE_ID=#{compileId,jdbcType=INTEGER} - IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} + AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} - classify=#{classify,jdbcType=VARCHAR} + AND classify=#{classify,jdbcType=VARCHAR} - attribute=#{attribute,jdbcType=VARCHAR} + AND attribute=#{attribute,jdbcType=VARCHAR} - lable=#{lable,jdbcType=VARCHAR} + AND lable=#{lable,jdbcType=VARCHAR} - AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR} + AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR} - + select + + + + + , s.name as creator_name,e.name as editor_name,u.name as auditor_name + ,ri.request_title as requestName,sdic.item_value as classifyName,sdia.item_value as attributeName + ,sdil.item_value as lableName + + from ${tableName} r + left join sys_user s on r.creator_id=s.id + left join sys_user u on r.editor_id=u.id + left join sys_user e on r.auditor_id=e.id + left join request_info ri on r.request_id=ri.id + left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0 + left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0 + left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_valid=1 and sdil.is_leaf=0 + + + + AND ${page.where} + + + AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} + + + AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') + + + AND r.IP_TYPE=#{ipType,jdbcType=INTEGER} + + + AND r.SRC_IP=#{srcIp,jdbcType=VARCHAR} + + + AND r.SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR} + + + AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR} + + + AND r.SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR} + + + AND r.DST_IP=#{dstIp,jdbcType=VARCHAR} + + + AND r.DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR} + + + AND r.DST_PORT=#{dstPort,jdbcType=VARCHAR} + + + AND r.DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR} + + + AND r.DIRECTION=#{direction,jdbcType=INTEGER} + + + AND r.PROTOCOL=#{protocol,jdbcType=INTEGER} + + + AND r.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER} + + + AND r.ACTION=#{action,jdbcType=INTEGER} + + + AND r.IS_VALID=#{isValid,jdbcType=INTEGER} + + + AND r.IS_VALID != -1 + + + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} + + + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') + + + AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP} + + + AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%') + + + AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP} + + + AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%') + + + AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} + + + AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER} + + + AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER} + + + AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} + + + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} + + + AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%') + + + AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%') + + + AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%') + + + AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') + + + + + ORDER BY ${page.orderBy} + + + ORDER BY CFG_ID desc + + + + + SELECT IS_VALID FROM ${tableName} + WHERE CFG_ID = #{cfgId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java index eec37e91e..46b20704b 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java @@ -1,6 +1,7 @@ package com.nis.web.dao.configuration; import java.util.List; +import java.util.Map; import org.apache.ibatis.annotations.Param; @@ -29,6 +30,4 @@ public interface RequestInfoDao extends CrudDao { int updateByPrimaryKey(RequestInfo requestInfo); - - } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 5f9b6dc85..e00d97e6e 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -270,4 +270,48 @@ audit_time = #{auditTime,jdbcType=DATE} where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java index a21d7b986..af714deae 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java @@ -44,6 +44,9 @@ public interface ServiceDictInfoDao extends CrudDao { * @return */ List findAllDict(); + + List findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid); + List findAllItemDict(@Param("itemType")int itemType); diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml index 35dadf221..c06339474 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml @@ -162,5 +162,15 @@ UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index f3ffbbea3..70430ef84 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -2,7 +2,9 @@ package com.nis.web.service.configuration; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.nis.domain.configuration.BaseIpCfg; import com.nis.web.dao.configuration.IpCfgDao; @@ -27,13 +29,19 @@ public class IpCfgService extends CrudService { * @exception * @since 1.0.0 */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) public int addIpCfg(BaseIpCfg baseIpCfg){ - String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); - if(StringUtils.isBlank(tableName)) - return 0; - baseIpCfg.setTableName(tableName); - logger.info("save "+tableName); - return ipCfgDao.insert(baseIpCfg); + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.insert(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseIpCfg.setTableName(tableName); + logger.info("save "+tableName); + return ipCfgDao.insert(baseIpCfg); + } + } /** * @@ -45,11 +53,67 @@ public class IpCfgService extends CrudService { * @exception * @since 1.0.0 */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) public int updateIpCfg(BaseIpCfg baseIpCfg){ - String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); - baseIpCfg.setTableName(tableName); - logger.info("update "+tableName); - return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg); + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseIpCfg.setTableName(tableName); + logger.info("update "+tableName); + return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg); + } + + } + /** + * + * auditIpCfg(审核IP类配置) + * (继承BaseIpCfg这个类方可使用) + * @param baseIpCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int auditIpCfg(BaseIpCfg baseIpCfg){ + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.audit(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseIpCfg.setTableName(tableName); + logger.info("aduit "+tableName); + return ipCfgDao.audit(baseIpCfg); + } + + } + /** + * + * deleteIpCfg(删除IP类配置) + * (继承BaseIpCfg这个类方可使用) + * @param baseIpCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int deleteIpCfg(BaseIpCfg baseIpCfg){ + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.updateValid(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseIpCfg.setTableName(tableName); + logger.info("delete "+tableName); + return ipCfgDao.updateValid(baseIpCfg); + } + } /** * @@ -64,6 +128,8 @@ public class IpCfgService extends CrudService { */ public BaseIpCfg getIpCfgById(Class clazz,long id){ String tableName=getTableName(clazz.getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; logger.info("get "+tableName); return ipCfgDao.getById(tableName, id); } @@ -79,10 +145,46 @@ public class IpCfgService extends CrudService { * @since 1.0.0 */ public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){ - String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); - baseIpCfg.setTableName(tableName); - logger.info("get "+tableName); - return ipCfgDao.get(baseIpCfg); + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.get(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseIpCfg.setTableName(tableName); + logger.info("get "+tableName); + return ipCfgDao.get(baseIpCfg); + } + + } + public Integer getIsValid(BaseIpCfg baseIpCfg){ + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.getIsValid(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseIpCfg.setTableName(tableName); + return ipCfgDao.getIsValid(baseIpCfg); + } + + } + public Integer getIsValid(String tableName, long id){ + return ipCfgDao.getIsValid(tableName,id); + } + public Integer getIsAudit(BaseIpCfg baseIpCfg){ + if(!StringUtils.isBlank(baseIpCfg.getTableName())){ + return ipCfgDao.getIsAudit(baseIpCfg); + }else{ + String tableName=getTableName(baseIpCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseIpCfg.setTableName(tableName); + return ipCfgDao.getIsAudit(baseIpCfg); + } + + } + public Integer getIsAudit(String tableName, long id){ + return ipCfgDao.getIsAudit(tableName,id); } - } diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java index 7c98ec5c2..5f8fed8e6 100644 --- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java @@ -1,6 +1,8 @@ package com.nis.web.service.configuration; import java.util.Date; +import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; @@ -9,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.nis.domain.Page; import com.nis.domain.configuration.RequestInfo; +import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.dao.configuration.RequestInfoDao; import com.nis.web.security.UserUtils; @@ -69,4 +72,13 @@ public class RequestInfoService extends BaseService{ requestInfo.setIsValid(-1); requestInfoDao.delete(requestInfo);//删除 } + public List getValidRequestInfo(){ + RequestInfo requestInfo=new RequestInfo(); + requestInfo.setIsValid(Constants.VALID_YES); + return requestInfoDao.findRequestInfo(requestInfo); + } + public List getAllRequestInfo(){ + RequestInfo requestInfo=new RequestInfo(); + return requestInfoDao.findAllList(requestInfo); + } } diff --git a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java index 8ead8cd3a..0cfe52330 100644 --- a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java @@ -8,11 +8,9 @@ import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.nis.domain.Page; -import com.nis.domain.SysDataDictionaryItem; -import com.nis.domain.SysMenu; import com.nis.domain.SysUser; import com.nis.domain.configuration.ServiceDictInfo; -import com.nis.util.DateUtil; +import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.dao.configuration.ServiceDictInfoDao; import com.nis.web.security.UserUtils; @@ -114,7 +112,78 @@ public class ServiceDictInfoService extends BaseService{ serviceDictInfo.setIsValid(0); serviceDictInfoDao.delete(serviceDictInfo); } - - + /** + * + * findFlDict(查找所有有效的分类) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findFlDict() { + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_FL,Constants.VALID_YES); + } + /** + * + * findFlDict(查找所有有效的分类) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findAllFlDict() { + return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_FL); + } + /** + * + * findFlDict(查找所有有效的性质) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findXzDict() { + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_XZ,Constants.VALID_YES); + } + /** + * + * findFlDict(查找所有有效的性质) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findAllXzDict() { + return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_XZ); + } + /** + * + * findFlDict(查找所有有效的标签) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findLableDict() { + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_LABEL,Constants.VALID_YES); + } + + /** + * + * findFlDict(查找所有有效的标签) + * (这里描述这个方法适用条件 – 可选) + * @return + *List + * @exception + * @since 1.0.0 + */ + public List findAllLableDict() { + return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_LABEL); + } } diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index dfe2fa438..02b4fb388 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -5,11 +5,14 @@
- +
- + + +
@@ -17,12 +20,16 @@
- +
- +
@@ -32,12 +39,16 @@
- +
- +
@@ -45,10 +56,14 @@
- +
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index a05861013..12aab3a5d 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -4,21 +4,195 @@
- +
- +
-
- +
- + + +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + <%-- --%> +
+
+
+
+
+ +
+ + <%-- --%> +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+<%--
+
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+
--%> +
+
+
+ +
+ + + <%-- --%> +
+
+
+
+
+ +
+
-
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp new file mode 100644 index 000000000..3bc3f7195 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -0,0 +1,125 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ +

+ + 新增 + 修改 +

+ +
+
+
+
+
+ + 新增 + 修改 +
+ +
+
+ +
+
+ <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + + + + + + + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> + + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp new file mode 100644 index 000000000..2cfd57632 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -0,0 +1,232 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + +

+ 详情 +

+ +
+
+
+
+
+ 详情 +
+
+ +
+
+
+
+ + + +
+ : + + + + + + + : + + + +    排序: +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
配置ID配置描述ip类型源IP地址源地址掩码源端口源端口掩码目的IP地址目的地址掩码目的端口目的端口掩码方向协议协议ID管控类型有效标识是否审核创建人员配置时间修改人员修改时间审核人员审核时间业务id来函编译id是否区域管控分类性质标签区域生效id
${ipCfg.cfgId }${ipCfg.cfgDesc }V${ipCfg.ipType }${ipCfg.srcIp }${ipCfg.srcIpMask }${ipCfg.srcPort }${ipCfg.srcPortMask }${ipCfg.dstIp }${ipCfg.dstIpMask }${ipCfg.dstPort }${ipCfg.dstPortMask }${ipCfg.direction }${ipCfg.protocol }${ipCfg.protocolId } + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + + 否 + 是 + 已删除 + + + + + + + + ${ipCfg.creatorName }${ipCfg.editorName }${ipCfg.auditorName }${ipCfg.serviceId }${ipCfg.requestName }${ipCfg.compileId } + 否 + 是 + ${ipCfg.classifyName }${ipCfg.attributeName }${ipCfg.lableName }${ipCfg.areaEffectiveIds } +
+ +
    + + + +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +     +     +
+
+
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp new file mode 100644 index 000000000..cc12fa11f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp @@ -0,0 +1,17 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +结果跳转页 + + + +
+${message} +
+ + \ No newline at end of file