From a55662d868e9738c7a8765245425d4ec62522dbc Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 7 Mar 2018 17:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E2=91=A0basicInfo.jsp=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9D=A5=E5=87=BD=E7=9A=84=E8=AF=B7=E9=80=89=E6=8B=A9=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=20=E2=91=A1=E9=85=8D=E7=BD=AE=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E8=B0=83=E6=95=B4=20=E2=91=A2=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8I18N=E7=9A=84bug=20=E2=91=A3=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=9D=A5=E5=87=BD=E5=88=86=E7=B1=BB=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E6=97=A0=E6=95=88=E7=9A=84=E4=B9=9F?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=20=E2=91=A4=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87/=E5=AE=A1=E6=A0=B8=E4=B8=8D=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E7=9B=B8=E5=8F=8D=E7=9A=84bug=20?= =?UTF-8?q?=E2=91=A5select=E6=8F=92=E4=BB=B6=E5=A2=9E=E5=8A=A0i18n?= =?UTF-8?q?=EF=BC=8C=E4=B8=AD=E8=8B=B1=E6=96=87=EF=BC=8C=E4=BF=84=E6=96=87?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplexStringCfgController.java | 17 +++-- .../configuration/IpCfgController.java | 18 +++--- .../configuration/NumCfgController.java | 4 +- .../configuration/StringCfgController.java | 17 +++-- .../dao/configuration/ComplexStringCfgDao.xml | 6 +- .../nis/web/dao/configuration/IpCfgDao.xml | 6 +- .../nis/web/dao/configuration/NumCfgDao.xml | 6 +- .../web/dao/configuration/StringCfgDao.xml | 6 +- .../webapp/WEB-INF/include/form/basicInfo.jsp | 3 +- .../WEB-INF/views/cfg/complexCfgForm.jsp | 34 +++++----- .../WEB-INF/views/cfg/complexCfgList.jsp | 63 ++++++++++++------- .../webapp/WEB-INF/views/cfg/ipCfgList.jsp | 26 ++++---- .../WEB-INF/views/cfg/stringCfgForm.jsp | 1 + .../WEB-INF/views/cfg/stringCfgList.jsp | 51 ++++++++------- 14 files changed, 137 insertions(+), 121 deletions(-) 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 9e6164709..e45d0055b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -30,7 +30,7 @@ import com.nis.web.controller.BaseController; public class ComplexStringCfgController extends BaseController{ @RequestMapping(value = {"list"}) - public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) { + public String cfgList(Model model,Integer audit,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", audit); if(cfg!=null){ @@ -44,14 +44,7 @@ public class ComplexStringCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); cfg.setTableName(tableName); - Page searchPage=new Page(request, response, 1); - if(pageNo!=null) searchPage.setPageNo(pageNo); - if(pageSize!=null) searchPage.setPageSize(pageSize); - if(cfg.getPage()!=null){ - if(!StringUtils.isBlank(cfg.getPage().getOrderBy())); - searchPage.setOrderBy(cfg.getPage().getOrderBy()); - } - Page page = complexStringCfgService.findPage(searchPage, cfg); + Page page = complexStringCfgService.findPage(new Page(request, response), cfg); model.addAttribute("page", page); model.addAttribute("action", cfg.getAction()); model.addAttribute("tableName", tableName); @@ -273,6 +266,8 @@ public class ComplexStringCfgController extends BaseController{ cfg.setIsValid(Constants.VALID_YES); } int result=complexStringCfgService.auditStringCfg(cfg); + model.addAttribute("serviceId", cfg.getServiceId()); + model.addAttribute("action", cfg.getAction()); } }else if(cfg.getServiceId()!=null){ @@ -295,13 +290,15 @@ public class ComplexStringCfgController extends BaseController{ cfg.setIsValid(Constants.VALID_YES); } int result=complexStringCfgService.auditStringCfg(cfg); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", cfg.getAction()); } } } }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName; + return "redirect:" + adminPath + "/cfg/complex/list"; } /** * 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 9f5e18b6b..f27551554 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -47,7 +47,7 @@ public class IpCfgController extends BaseController{ * @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) { + public String ipCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", audit); if(ipCfg!=null){ @@ -61,14 +61,7 @@ public class IpCfgController extends BaseController{ if(!StringUtils.isBlank(tableName)){ logger.info("table name is "+tableName); 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); + Page page = ipCfgService.findPage(new Page(request,response), ipCfg); model.addAttribute("page", page); model.addAttribute("action", ipCfg.getAction()); model.addAttribute("tableName", tableName); @@ -323,6 +316,8 @@ public class IpCfgController extends BaseController{ ipCfg.setIsValid(Constants.VALID_YES); } int result=ipCfgService.auditIpCfg(ipCfg); + model.addAttribute("serviceId", ipCfg.getServiceId()); + model.addAttribute("action", ipCfg.getAction()); } }else if(ipCfg.getServiceId()!=null){ int serviceId=ipCfg.getServiceId(); @@ -344,14 +339,15 @@ public class IpCfgController extends BaseController{ ipCfg.setIsValid(Constants.VALID_YES); } int result=ipCfgService.auditIpCfg(ipCfg); - + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", ipCfg.getAction()); } } } }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName+"&audit=1"; + return "redirect:" + adminPath + "/cfg/ip/list"; } /** * 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 2ed73be13..226263b6c 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -208,12 +208,14 @@ public class NumCfgController extends BaseController{ cfg.setIsValid(Constants.VALID_YES); } int result=numCfgService.auditNumCfg(cfg); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", cfg.getAction()); } } }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName; + return "redirect:" + adminPath + "/cfg/num/list"; } /** * 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 3d966c272..fbd83d76c 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -30,7 +30,7 @@ import com.nis.web.controller.BaseController; public class StringCfgController extends BaseController{ @RequestMapping(value = {"list"}) - public String stringCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) { + public String stringCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", audit); if(stringCfg!=null){ @@ -44,14 +44,7 @@ public class StringCfgController extends BaseController{ 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); + Page page = stringCfgService.findPage(new Page(request,response), stringCfg); model.addAttribute("page", page); model.addAttribute("action", stringCfg.getAction()); model.addAttribute("tableName", tableName); @@ -273,6 +266,8 @@ public class StringCfgController extends BaseController{ stringCfg.setIsValid(Constants.VALID_YES); } int result=stringCfgService.auditStringCfg(stringCfg); + model.addAttribute("serviceId", stringCfg.getServiceId()); + model.addAttribute("action", stringCfg.getAction()); } }else if(stringCfg.getServiceId()!=null){ @@ -295,13 +290,15 @@ public class StringCfgController extends BaseController{ stringCfg.setIsValid(Constants.VALID_YES); } int result=stringCfgService.auditStringCfg(stringCfg); + model.addAttribute("serviceId", serviceId); + model.addAttribute("action", stringCfg.getAction()); } } } }else{ logger.error("无法确定IP配置的表名！"); } - return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName="+cfgName; + return "redirect:" + adminPath + "/cfg/string/list"; } /** * diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index ebba82df0..f086ae03c 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -166,9 +166,9 @@ 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 - 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 + left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=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_leaf=0 + left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=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 9985f2618..378602ec9 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -246,9 +246,9 @@ 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 - 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 + left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=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_leaf=0 + left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0 diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml index 5795c36d3..4a548e9c8 100644 --- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml @@ -169,9 +169,9 @@ 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 - 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 + left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=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_leaf=0 + left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0 diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 6f681d522..36afe76a7 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -185,9 +185,9 @@ 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 - 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 + left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=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_leaf=0 + left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0 diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 7dcb11ec5..c95b9f089 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -7,7 +7,7 @@
- data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">