diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 471eadc3c..ff56deeae 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -35,6 +35,7 @@ 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.StringCfgService; import com.nis.web.service.configuration.SysDictInfoService; import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.WebCfgService; @@ -110,6 +111,8 @@ public class BaseController { @Autowired protected RequestInfoService requestInfoService; + @Autowired + protected StringCfgService stringCfgService; /** * 管理基础路径 */ 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 40b34c2cd..f3c399778 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -41,12 +41,14 @@ public class IpCfgController extends BaseController{ return "/cfg/ipWhiteForm"; } - @RequestMapping(value = {"ipCfgList"}) + @RequestMapping(value = {"list"}) public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); if(ipCfg!=null){ Integer serviceId=ipCfg.getServiceId(); logger.info("servcice id is "+serviceId); if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); @@ -62,9 +64,8 @@ public class IpCfgController extends BaseController{ } Page page = ipCfgService.findPage(searchPage, ipCfg); model.addAttribute("page", page); - model.addAttribute("serviceId", serviceId); - model.addAttribute("cfgName", cfgName); model.addAttribute("action", ipCfg.getAction()); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findFlDict(); @@ -84,8 +85,11 @@ public class IpCfgController extends BaseController{ } - @RequestMapping(value = {"ipCfgForm"}) + @RequestMapping(value = {"form"}) public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -104,8 +108,8 @@ public class IpCfgController extends BaseController{ ipcfg.initDefaultValue(); ipcfg.setAction(action); ipcfg.setServiceId(serviceId); - model.addAttribute("_ipCfg", ipcfg); - model.addAttribute("cfgName", cfgName); + model.addAttribute("_cfg", ipcfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findFlDict(); @@ -127,16 +131,19 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgForm"; } - @RequestMapping(value = {"updateIpCfgForm"}) + @RequestMapping(value = {"updateForm"}) public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); 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); + model.addAttribute("_cfg", ipCfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); @@ -155,8 +162,8 @@ public class IpCfgController extends BaseController{ searchBean.setCfgId(cfgId); searchBean.setTableName(tableName); BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); - model.addAttribute("_ipCfg", ipCfg); - model.addAttribute("cfgName", cfgName); + model.addAttribute("_cfg", ipCfg); + model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); @@ -184,8 +191,10 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"saveOrUpdateIpCfg"}) + @RequestMapping(value = {"saveOrUpdateCfg"}) public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType", "ip"); logger.info("saveOrUpdateIpCfg loaded"); if(ipCfg==null){ logger.error("无法保存空的配置！"); @@ -193,21 +202,25 @@ public class IpCfgController extends BaseController{ }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) + if(ipCfg.getCfgId()==null){ + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); ipCfgService.addIpCfg(ipCfg); - else + }else{ + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); ipCfgService.updateIpCfg(ipCfg); + } model.addAttribute("serviceId",serviceId); model.addAttribute("action",ipCfg.getAction()); - model.addAttribute("cfgName",cfgName); + model.addAttribute("tableName", ipCfg.getTableName()); addMessage(model,"保存成功,正在为您跳转页面..."); }else if(ipCfg.getServiceId()!=null){ int serviceId=ipCfg.getServiceId(); + model.addAttribute("serviceId",serviceId); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); @@ -219,13 +232,17 @@ public class IpCfgController extends BaseController{ ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); - if(ipCfg.getCfgId()==null) + if(ipCfg.getCfgId()==null){ + ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); + ipCfg.setCreateTime(new Date()); ipCfgService.addIpCfg(ipCfg); - else + }else{ + ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); + ipCfg.setEditTime(new Date()); ipCfgService.updateIpCfg(ipCfg); - model.addAttribute("serviceId",serviceId); + } model.addAttribute("action",ipCfg.getAction()); - model.addAttribute("cfgName",cfgName); + model.addAttribute("tableName", ipCfg.getTableName()); addMessage(model,"保存成功,正在为您跳转页面..."); } } @@ -236,52 +253,6 @@ public class IpCfgController extends BaseController{ 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配置) @@ -291,8 +262,9 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"auditIpCfg"}) + @RequestMapping(value = {"auditCfg"}) public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { + model.addAttribute("cfgName", cfgName); if(ipCfg==null){ logger.error("无法审核空的配置！"); }else if(!StringUtils.isBlank(ipCfg.getTableName())){ @@ -310,7 +282,6 @@ public class IpCfgController extends BaseController{ } int result=ipCfgService.auditIpCfg(ipCfg); } - }else if(ipCfg.getServiceId()!=null){ int serviceId=ipCfg.getServiceId(); ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -331,13 +302,14 @@ public class IpCfgController extends BaseController{ 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; + return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName; } /** * @@ -348,8 +320,12 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - @RequestMapping(value = {"deleteIpCfg"}) + @RequestMapping(value = {"deleteCfg"}) public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + model.addAttribute("cfgType", "ip"); if(!StringUtils.isBlank(tableName)){ int audit=ipCfgService.getIsAudit(tableName,cfgId); //未审核时可删除 @@ -361,9 +337,7 @@ public class IpCfgController extends BaseController{ 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); + model.addAttribute("tableName", tableName); addMessage(model,"删除成功,正在为您跳转页面..."); }else{ logger.error("通过审核的配置不能删除！"); @@ -384,9 +358,7 @@ public class IpCfgController extends BaseController{ 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); + model.addAttribute("tableName", tableName); addMessage(model,"删除成功,正在为您跳转页面..."); }else{ logger.error("通过审核的配置不能删除！"); diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java new file mode 100644 index 000000000..33ad236ec --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -0,0 +1,371 @@ +package com.nis.web.controller.configuration; + +import java.util.Date; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +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.nis.domain.Page; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.RequestInfo; +import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.util.Constants; +import com.nis.web.controller.BaseController; + +/** + * 字符串相关配置控制类 + * @author dell + * + */ +@Controller +@RequestMapping("${adminPath}/cfg/string") +public class StringCfgController extends BaseController{ + + @RequestMapping(value = {"list"}) + public String stringCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + if(stringCfg!=null){ + Integer serviceId=stringCfg.getServiceId(); + logger.info("servcice id is "+serviceId); + if(serviceId!=null){ + model.addAttribute("serviceId", serviceId); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + stringCfg.setTableName(tableName); + Page searchPage=new Page(request, response, 1); + if(pageNo!=null) searchPage.setPageNo(pageNo); + if(pageSize!=null) searchPage.setPageSize(pageSize); + if(stringCfg.getPage()!=null){ + if(!StringUtils.isBlank(stringCfg.getPage().getOrderBy())); + searchPage.setOrderBy(stringCfg.getPage().getOrderBy()); + } + Page page = stringCfgService.findPage(searchPage, stringCfg); + model.addAttribute("page", page); + model.addAttribute("action", stringCfg.getAction()); + model.addAttribute("tableName", tableName); + 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/stringCfgList"; + } + + + @RequestMapping(value = {"form"}) + public String stringCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("serviceId", serviceId); + logger.info("sercice 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); + String className=stringCfgService.getClassName(tableName); + logger.info("class name is "+className); + String packageName=BaseStringCfg.class.getPackage().getName(); + try { + //通过反射获得BaseStringCfg的子类的实例，并调用子类的initDefaultValue初始化默认值 + Class clazz=Class.forName(packageName+"."+className); + BaseStringCfg stringcfg=(BaseStringCfg)clazz.newInstance(); + stringcfg.setTableName(tableName); + stringcfg.initDefaultValue(); + stringcfg.setAction(action); + stringcfg.setServiceId(serviceId); + model.addAttribute("_cfg", stringcfg); + model.addAttribute("tableName", tableName); + 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); + e.printStackTrace(); + } + } + } + }else{ + logger.error("未获取到正确的serviceId"); + } + + return "/cfg/stringCfgForm"; + } + @RequestMapping(value = {"updateForm"}) + public String updateStringCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { + model.addAttribute("cfgName", cfgName); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", action); + model.addAttribute("tableName", tableName); + if(!StringUtils.isBlank(tableName)){ + logger.info("table name is "+tableName); + BaseStringCfg searchBean=new BaseStringCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", stringCfg); + 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); + BaseStringCfg searchBean=new BaseStringCfg(); + searchBean.setCfgId(cfgId); + searchBean.setTableName(tableName); + BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); + model.addAttribute("_cfg", stringCfg); + 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/stringCfgForm"; + } + + /** + * + * addStringCfg(新增IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"saveOrUpdateCfg"}) + public String saveOrUpdateStringCfg(String cfgName,Model model, BaseStringCfg stringCfg) { + model.addAttribute("cfgName",cfgName); + model.addAttribute("cfgType","string"); + logger.info("saveOrUpdateStringCfg loaded"); + if(stringCfg==null){ + logger.error("无法保存空的配置！"); + addMessage(model,"保存失败！"); + }else if(!StringUtils.isBlank(stringCfg.getTableName())){ + int serviceId=stringCfg.getServiceId(); + long compileId=getCompileId(stringCfg); + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfg.setIsValid(Constants.VALID_NO); + stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); + stringCfg.setCompileId(compileId); + if(stringCfg.getCfgId()==null){ + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfgService.addStringCfg(stringCfg); + }else{ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfgService.updateStringCfg(stringCfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",stringCfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + }else if(stringCfg.getServiceId()!=null){ + int serviceId=stringCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + long compileId=getCompileId(stringCfg); + stringCfg.setTableName(tableName); + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfg.setIsValid(Constants.VALID_NO); + stringCfg.setIsAudit(Constants.AUDIT_NOT_YET); + stringCfg.setCompileId(compileId); + if(stringCfg.getCfgId()==null){ + stringCfg.setCreatorId(stringCfg.getCurrentUser().getId()); + stringCfg.setCreateTime(new Date()); + stringCfgService.addStringCfg(stringCfg); + }else{ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfgService.updateStringCfg(stringCfg); + } + model.addAttribute("serviceId",serviceId); + model.addAttribute("action",stringCfg.getAction()); + addMessage(model,"保存成功,正在为您跳转页面..."); + } + } + }else{ + addMessage(model,"保存失败！"); + logger.error("无法确定IP配置的表名！"); + } + return "/cfg/resultPage";//StringEscapeUtils.escapeHtml4("?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName="+cfgName); + } + + /** + * + * auditStringCfg(审核IP配置) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"auditCfg"}) + public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) { + model.addAttribute("cfgName", cfgName); + if(stringCfg==null){ + logger.error("无法审核空的配置！"); + }else if(!StringUtils.isBlank(stringCfg.getTableName())){ + int audit=stringCfgService.getIsAudit(stringCfg); + if(audit==Constants.AUDIT_YES&&stringCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + stringCfg.setAuditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setAuditTime(new Date()); + + if(stringCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + stringCfg.setIsValid(Constants.VALID_NO); + }else if(stringCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + stringCfg.setIsValid(Constants.VALID_YES); + } + int result=stringCfgService.auditStringCfg(stringCfg); + } + + }else if(stringCfg.getServiceId()!=null){ + int serviceId=stringCfg.getServiceId(); + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + String tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + stringCfg.setTableName(tableName); + int audit=stringCfgService.getIsAudit(stringCfg); + if(audit==Constants.AUDIT_YES&&stringCfg.getIsAudit()!=Constants.AUDIT_NOT_YES){ + logger.error("审核通过的配置只能取消审核通过！"); + }else{ + stringCfg.setAuditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setAuditTime(new Date()); + + if(stringCfg.getIsAudit()==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 + stringCfg.setIsValid(Constants.VALID_NO); + }else if(stringCfg.getIsAudit()==Constants.AUDIT_YES){//审核通过，设置有效标志为1 + stringCfg.setIsValid(Constants.VALID_YES); + } + int result=stringCfgService.auditStringCfg(stringCfg); + } + } + } + }else{ + logger.error("无法确定IP配置的表名！"); + } + return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName"+cfgName; + } + /** + * + * auditStringCfg(删除IP配置，逻辑删除) + * (这里描述这个方法适用条件 – 可选) + * @return + *String + * @exception + * @since 1.0.0 + */ + @RequestMapping(value = {"deleteCfg"}) + public String deleteStringCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { + model.addAttribute("serviceId", serviceId); + model.addAttribute("cfgName", cfgName); + model.addAttribute("action", action); + model.addAttribute("cfgType","string"); + if(!StringUtils.isBlank(tableName)){ + int audit=stringCfgService.getIsAudit(tableName,cfgId); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + BaseStringCfg stringCfg=new BaseStringCfg(); + stringCfg.setCfgId(cfgId); + stringCfg.setTableName(tableName); + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfg.setIsValid(Constants.VALID_DEL); + int result=stringCfgService.deleteStringCfg(stringCfg); + addMessage(model,"删除成功,正在为您跳转页面..."); + }else{ + logger.error("通过审核的配置不能删除！"); + } + + }else if(serviceId!=null){ + ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); + if(serviceConfigInfo!=null){ + tableName=serviceConfigInfo.getTableName(); + if(!StringUtils.isBlank(tableName)){ + BaseStringCfg stringCfg=new BaseStringCfg(); + stringCfg.setCfgId(cfgId); + stringCfg.setTableName(tableName); + int audit=stringCfgService.getIsAudit(stringCfg); + //未审核时可删除 + if(audit!=Constants.AUDIT_YES){ + stringCfg.setEditorId(stringCfg.getCurrentUser().getId()); + stringCfg.setEditTime(new Date()); + stringCfg.setIsValid(Constants.VALID_DEL); + int result=stringCfgService.deleteStringCfg(stringCfg); + 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.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 08dfd203f..23229f419 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -93,7 +93,7 @@ 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.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.IP_TYPE as ipType, r.SRC_IP as srcIp, 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, @@ -244,8 +244,8 @@ 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 sys_user e on r.editor_id=e.id + left join sys_user u on r.auditor_id=u.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 diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java new file mode 100644 index 000000000..284765c03 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java @@ -0,0 +1,29 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +/** + * IP相关配置数据处理类 + * @author dell + * + */ +@MyBatisDao +public interface StringCfgDao extends CrudDao{ + public BaseStringCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; + public BaseStringCfg get(BaseStringCfg entity) ; + public List findList(BaseStringCfg entity) ; + public int insert(BaseStringCfg entity) ; + public int updateByPrimaryKeySelective(BaseStringCfg entity) ; + public int updateValid(BaseStringCfg entity) ; + public int audit(BaseStringCfg entity) ; + public int getIsValid(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsValid(BaseStringCfg entity); + public int getIsAudit(@Param("tableName")String tableName,@Param("cfgId")Long id); + public int getIsAudit(BaseStringCfg entity); +} diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml new file mode 100644 index 000000000..1d012d1be --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC, CFG_KEYWORDS,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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, 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.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds + + + CFG_DESC, CFG_KEYWORDS, 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,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,AREA_EFFECTIVE_IDS + + + #{cfgDesc,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},#{action,jdbcType=INTEGER}, + #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{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}, + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR} + + + + + + + + SELECT LAST_INSERT_ID() + + insert into ${tableName} ( + + )values ( + + ) + + + update ${tableName} + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR}, + + + action = #{action,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + is_audit = #{isAudit,jdbcType=INTEGER}, + + + creator_id = #{creatorId,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + auditor_id = #{auditorId,jdbcType=INTEGER}, + + + audit_time = #{auditTime,jdbcType=TIMESTAMP}, + + + service_id = #{serviceId,jdbcType=INTEGER}, + + + request_id = #{requestId,jdbcType=INTEGER}, + + + compile_id = #{compileId,jdbcType=INTEGER}, + + + is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, + + + classify = #{classify,jdbcType=VARCHAR}, + + + attribute = #{attribute,jdbcType=VARCHAR}, + + + lable = #{lable,jdbcType=VARCHAR}, + + + expr_type=#{exprType,jdbcType=INTEGER}, + + + match_method=#{matchMethod,jdbcType=INTEGER}, + + + is_hexbin=#{isHexbin,jdbcType=INTEGER}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} + + + update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP} + + ,is_valid = #{isValid,jdbcType=INTEGER} + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/StringCfgService.java b/src/main/java/com/nis/web/service/configuration/StringCfgService.java new file mode 100644 index 000000000..368b1200f --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/StringCfgService.java @@ -0,0 +1,190 @@ +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.BaseStringCfg; +import com.nis.web.dao.configuration.StringCfgDao; +import com.nis.web.service.CrudService; + +/** + * String相关配置事务类 + * @author dell + * + */ +@Service +public class StringCfgService extends CrudService { + @Autowired + protected StringCfgDao stringCfgDao; + /** + * + * addStringCfg(新增IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int addStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.insert(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("save "+tableName); + return stringCfgDao.insert(baseStringCfg); + } + + } + /** + * + * updateStringCfg(更新IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int updateStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("update "+tableName); + return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg); + } + + } + /** + * + * auditStringCfg(审核IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int auditStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.audit(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("aduit "+tableName); + return stringCfgDao.audit(baseStringCfg); + } + + } + /** + * + * deleteStringCfg(删除IP类配置) + * (继承BaseStringCfg这个类方可使用) + * @param baseStringCfg + * @return + *int + * @exception + * @since 1.0.0 + */ + @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + public int deleteStringCfg(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.updateValid(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return 0; + baseStringCfg.setTableName(tableName); + logger.info("delete "+tableName); + return stringCfgDao.updateValid(baseStringCfg); + } + + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承BaseStringCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseStringCfg + * @exception + * @since 1.0.0 + */ + public BaseStringCfg getStringCfgById(Class clazz,long id){ + String tableName=getTableName(clazz.getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + logger.info("get "+tableName); + return stringCfgDao.getById(tableName, id); + } + /** + * + * getStringCfg(根据IP与类名获取IP配置) + * (继承BaseStringCfg这个类方可使用) + * @param clazz + * @param id + * @return + *BaseStringCfg + * @exception + * @since 1.0.0 + */ + public BaseStringCfg getStringCfgById(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.get(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + logger.info("get "+tableName); + return stringCfgDao.get(baseStringCfg); + } + + } + public Integer getIsValid(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.getIsValid(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + return stringCfgDao.getIsValid(baseStringCfg); + } + + } + public Integer getIsValid(String tableName, long id){ + return stringCfgDao.getIsValid(tableName,id); + } + public Integer getIsAudit(BaseStringCfg baseStringCfg){ + if(!StringUtils.isBlank(baseStringCfg.getTableName())){ + return stringCfgDao.getIsAudit(baseStringCfg); + }else{ + String tableName=getTableName(baseStringCfg.getClass().getSimpleName()); + if(StringUtils.isBlank(tableName)) + return null; + baseStringCfg.setTableName(tableName); + return stringCfgDao.getIsAudit(baseStringCfg); + } + + } + public Integer getIsAudit(String tableName, long id){ + return stringCfgDao.getIsAudit(tableName,id); + } +} diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 02b4fb388..03b4fef25 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -11,7 +11,7 @@ + selected>${requestInfo.requestTitle} @@ -26,7 +26,7 @@ @@ -45,7 +45,7 @@ @@ -60,7 +60,7 @@ diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 12aab3a5d..f2ce0facb 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -6,7 +6,7 @@
- +
@@ -15,10 +15,10 @@
- +
@@ -28,7 +28,7 @@
- +
@@ -36,7 +36,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -54,7 +54,7 @@
- +
@@ -64,7 +64,7 @@
- +
@@ -72,7 +72,7 @@
- +
@@ -82,7 +82,7 @@
- +
@@ -90,7 +90,7 @@
- +
@@ -101,10 +101,10 @@
- <%-- --%> + <%-- --%>
@@ -113,11 +113,11 @@
- <%-- --%> + <%-- --%>
@@ -127,7 +127,7 @@
- +
@@ -135,7 +135,15 @@
- + + <%-- --%>
@@ -145,7 +153,7 @@
- +
@@ -155,12 +163,12 @@
@@ -174,15 +182,15 @@
- <%-- --%> + <%-- --%>
@@ -190,7 +198,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp new file mode 100644 index 000000000..84ff30ca2 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -0,0 +1,112 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> +

管控配置

+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + <%-- --%> +
+
+
+
+
+ +
+ + + <%-- --%> +
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ \ 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 index 3bc3f7195..068611e2e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -8,9 +8,12 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp new file mode 100644 index 000000000..58ba481d8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -0,0 +1,101 @@ +<%@ 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/stringInfo.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/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp new file mode 100644 index 000000000..b2d0139d7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -0,0 +1,210 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + +

+ 详情 +

+ +
+
+
+
+
+ 详情 +
+
+ +
+
+
+
+ + + +
+ : + + + + + + + : + + + + + + + + : + + + 按创建时间顺序 + 按创建时间倒序 + 按修改时间顺序 + 按修改时间倒序 + 按审核时间顺序 + 按审核时间倒序 + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
配置ID配置描述配置关键词管控类型业务id来函编译id是否区域管控分类性质标签区域生效id有效标识是否审核创建人员配置时间修改人员修改时间审核人员审核时间
${cfg.cfgId }${cfg.cfgDesc }${cfg.cfgKeywords } + 阻断 + 监测 + 封堵白名单 + 监测白名单 + 封堵监测白名单 + 灰名单 + ${cfg.serviceId }${cfg.requestName }${cfg.compileId } + 否 + 是 + ${cfg.classifyName }${cfg.attributeName }${cfg.lableName }${cfg.areaEffectiveIds } + 否 + 是 + 已删除 + + + + + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName } +
+ +
    + + + +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +
    • +     + +
    • +
    • +     +     +
+
+
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file