From 6ab3e2df86486541c40360e3d990841d914539cd Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 7 Mar 2018 11:30:37 +0800 Subject: [PATCH] =?UTF-8?q?=E2=91=A0=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E7=BC=BA=E5=B0=91=E7=AD=89?= =?UTF-8?q?=E5=8F=B7=20=E2=91=A1=E8=B0=83=E6=95=B4IP=E7=B1=BB=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9/=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=9C=A8=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=AE=A1=E6=A0=B8=E7=9B=B8=E5=85=B3=E5=9C=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 2 + .../ComplexStringCfgController.java | 14 +++- .../configuration/IpCfgController.java | 77 ++++++++++++++----- .../configuration/NumCfgController.java | 12 ++- .../configuration/StringCfgController.java | 14 +++- .../web/dao/configuration/RequestInfoDao.xml | 6 +- .../webapp/WEB-INF/views/cfg/ipCfgList.jsp | 42 ++++++---- .../webapp/WEB-INF/views/cfg/resultPage.jsp | 2 +- 8 files changed, 124 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 1ebdd3b7b..d9e85751c 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -6,6 +6,8 @@ import com.google.gson.GsonBuilder; public final class Constants { + public static final int CFG_PAGE = 0; + public static final int AUDIT_PAGE = 1; public static final String DEFAULT_CAPTCHA_PARAM = "captcha"; public static final String DEFAULT_MOBILE_PARAM = "mobileLogin"; public static final String DEFAULT_MESSAGE_PARAM = "message"; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index e5f70d325..9e6164709 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController; public class ComplexStringCfgController extends BaseController{ @RequestMapping(value = {"list"}) - public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) { + public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(cfg!=null){ Integer serviceId=cfg.getServiceId(); logger.info("servcice id is "+serviceId); @@ -78,6 +79,7 @@ public class ComplexStringCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("serviceId", serviceId); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -125,6 +127,7 @@ public class ComplexStringCfgController extends BaseController{ model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); model.addAttribute("tableName", tableName); + model.addAttribute("audit", Constants.CFG_PAGE); if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); ComplexkeywordCfg searchBean=new ComplexkeywordCfg(); @@ -132,7 +135,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -151,7 +154,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -182,6 +185,7 @@ public class ComplexStringCfgController extends BaseController{ public String saveOrUpdateStringCfg(String cfgName,Model model, ComplexkeywordCfg cfg) { model.addAttribute("cfgName",cfgName); model.addAttribute("cfgType","complex"); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("saveOrUpdateStringCfg loaded"); if(cfg==null){ logger.error("无法保存空的配置！"); @@ -252,6 +256,7 @@ public class ComplexStringCfgController extends BaseController{ @RequestMapping(value = {"auditCfg"}) public String auditStringCfg(String cfgName,ComplexkeywordCfg cfg,Model model) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", Constants.AUDIT_PAGE); if(cfg==null){ logger.error("无法审核空的配置！"); }else if(!StringUtils.isBlank(cfg.getTableName())){ @@ -296,7 +301,7 @@ public class ComplexStringCfgController extends BaseController{ }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName; + return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName; } /** * @@ -313,6 +318,7 @@ public class ComplexStringCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("cfgType","complex"); + model.addAttribute("audit", Constants.CFG_PAGE); if(!StringUtils.isBlank(tableName)){ int audit=complexStringCfgService.getIsAudit(tableName,cfgId); //未审核时可删除 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 987907616..9f5e18b6b 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -29,18 +29,23 @@ import com.nis.web.controller.BaseController; @Controller @RequestMapping("${adminPath}/cfg/ip") public class IpCfgController extends BaseController{ - - @RequestMapping(value = {"ipWhiteList"}) - public String ipWhiteList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) { - return "/cfg/ipWhiteList"; - } - - - @RequestMapping(value = {"ipWhiteForm"}) - public String ipWhiteForm() { - return "/cfg/ipWhiteForm"; - } - + /** + * + * ipCfgList(配置列表与审核列表，需要根据参数判断是哪个列表，以便显示隐藏对应的界面菜单，按钮) + * (这里描述这个方法适用条件 – 可选) + * @param model + * @param audit + * @param pageNo + * @param pageSize + * @param cfgName + * @param ipCfg + * @param request + * @param response + * @return + *String + * @exception + * @since 1.0.0 + */ @RequestMapping(value = {"list"}) public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); @@ -85,12 +90,27 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgList"; } - + /** + * + * ipCfgForm(新增页面初始化，只会在配置界面使用) + * (这里描述这个方法适用条件 – 可选) + * @param action + * @param cfgName + * @param serviceId + * @param model + * @param request + * @param response + * @return + *String + * @exception + * @since 1.0.0 + */ @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); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -133,12 +153,30 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgForm"; } + /** + * + * updateIpCfgForm(更新配置页面初始化，只会在配置界面出现) + * (这里描述这个方法适用条件 – 可选) + * @param tableName + * @param action + * @param cfgId + * @param cfgName + * @param serviceId + * @param model + * @param request + * @param response + * @return + *String + * @exception + * @since 1.0.0 + */ @RequiresPermissions("sys:cfg:edit") @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); + model.addAttribute("audit",Constants.CFG_PAGE); if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); BaseIpCfg searchBean=new BaseIpCfg(); @@ -147,7 +185,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -167,7 +205,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -187,7 +225,7 @@ public class IpCfgController extends BaseController{ /** * - * addIpCfg(新增IP配置) + * addIpCfg(新增IP配置，后台保存方法) * (这里描述这个方法适用条件 – 可选) * @return *String @@ -198,6 +236,7 @@ public class IpCfgController extends BaseController{ public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) { model.addAttribute("cfgName",cfgName); model.addAttribute("cfgType", "ip"); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("saveOrUpdateIpCfg loaded"); if(ipCfg==null){ logger.error("无法保存空的配置！"); @@ -258,7 +297,7 @@ public class IpCfgController extends BaseController{ /** * * auditIpCfg(审核IP配置) - * (这里描述这个方法适用条件 – 可选) + * (审核流程只在审核页面) * @return *String * @exception @@ -267,6 +306,7 @@ public class IpCfgController extends BaseController{ @RequestMapping(value = {"auditCfg"}) public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", Constants.AUDIT_PAGE); if(ipCfg==null){ logger.error("无法审核空的配置！"); }else if(!StringUtils.isBlank(ipCfg.getTableName())){ @@ -311,7 +351,7 @@ public class IpCfgController extends BaseController{ }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName; + return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName+"&audit=1"; } /** * @@ -329,6 +369,7 @@ public class IpCfgController extends BaseController{ model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); model.addAttribute("cfgType", "ip"); + model.addAttribute("audit", Constants.AUDIT_PAGE); if(!StringUtils.isBlank(tableName)){ int audit=ipCfgService.getIsAudit(tableName,cfgId); //未审核时可删除 diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 86491356b..2ed73be13 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController; public class NumCfgController extends BaseController{ @RequestMapping(value = {"list"}) - public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) { + public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(cfg!=null){ Integer serviceId=cfg.getServiceId(); logger.info("servcice id is "+serviceId); @@ -72,6 +73,7 @@ public class NumCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("serviceId", serviceId); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -101,6 +103,7 @@ public class NumCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); + model.addAttribute("audit", Constants.CFG_PAGE); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ @@ -108,7 +111,7 @@ public class NumCfgController extends BaseController{ searchBean.setCfgId(cfgId); NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -138,6 +141,7 @@ public class NumCfgController extends BaseController{ public String saveOrUpdateStringCfg(String cfgName,Model model, NumBoundaryCfg cfg) { model.addAttribute("cfgName",cfgName); model.addAttribute("cfgType","num"); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("saveOrUpdateStringCfg loaded"); if(cfg==null){ logger.error("无法保存空的配置！"); @@ -184,6 +188,7 @@ public class NumCfgController extends BaseController{ @RequestMapping(value = {"auditCfg"}) public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", Constants.AUDIT_PAGE); if(cfg==null){ logger.error("无法审核空的配置！"); }else if(cfg.getServiceId()!=null){ @@ -208,7 +213,7 @@ public class NumCfgController extends BaseController{ }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName; + return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName; } /** * @@ -225,6 +230,7 @@ public class NumCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("cfgType","num"); + model.addAttribute("audit", Constants.CFG_PAGE); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); if(serviceConfigInfo!=null){ diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index ac11ffc3f..3d966c272 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController; 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) { + public String stringCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(stringCfg!=null){ Integer serviceId=stringCfg.getServiceId(); logger.info("servcice id is "+serviceId); @@ -78,6 +79,7 @@ public class StringCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("serviceId", serviceId); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("sercice id is "+serviceId); if(serviceId!=null){ ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId); @@ -125,6 +127,7 @@ public class StringCfgController extends BaseController{ model.addAttribute("serviceId", serviceId); model.addAttribute("action", action); model.addAttribute("tableName", tableName); + model.addAttribute("audit", Constants.CFG_PAGE); if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); BaseStringCfg searchBean=new BaseStringCfg(); @@ -132,7 +135,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -151,7 +154,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -182,6 +185,7 @@ public class StringCfgController extends BaseController{ public String saveOrUpdateStringCfg(String cfgName,Model model, BaseStringCfg stringCfg) { model.addAttribute("cfgName",cfgName); model.addAttribute("cfgType","string"); + model.addAttribute("audit", Constants.CFG_PAGE); logger.info("saveOrUpdateStringCfg loaded"); if(stringCfg==null){ logger.error("无法保存空的配置！"); @@ -252,6 +256,7 @@ public class StringCfgController extends BaseController{ @RequestMapping(value = {"auditCfg"}) public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", Constants.AUDIT_PAGE); if(stringCfg==null){ logger.error("无法审核空的配置！"); }else if(!StringUtils.isBlank(stringCfg.getTableName())){ @@ -296,7 +301,7 @@ public class StringCfgController extends BaseController{ }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName"+cfgName; + return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName="+cfgName; } /** * @@ -313,6 +318,7 @@ public class StringCfgController extends BaseController{ model.addAttribute("cfgName", cfgName); model.addAttribute("action", action); model.addAttribute("cfgType","string"); + model.addAttribute("audit", Constants.CFG_PAGE); if(!StringUtils.isBlank(tableName)){ int audit=stringCfgService.getIsAudit(tableName,cfgId); //未审核时可删除 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 f0cb73683..b6e514217 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -162,5 +162,9 @@ where id = #{id,jdbcType=BIGINT} and is_audit !=1 - + \ 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 index cfb68bf41..6e31519ff 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -5,6 +5,17 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + +