gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

①basicInfo.jsp增加来函的请选择展示

Browse Source 
②配置的分页调整
③修复审核I18N的bug
④列表查询关联所有的来函分类性质标签，无效的也展示出来
⑤修复国际化审核通过/审核不通过的位置相反的bug
⑥select插件增加i18n，中英文，俄文都支持
This commit is contained in:
wangxin
2018-03-07 17:47:30 +08:00
parent 2e7d4c34a1
commit a55662d868
14 changed files with 137 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -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<ComplexkeywordCfg> searchPage=new Page<ComplexkeywordCfg>(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<ComplexkeywordCfg> page = complexStringCfgService.findPage(searchPage, cfg);
Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(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";
}
/**
*

18
src/main/java/com/nis/web/controller/configuration/IpCfgController.java
View File

@@ -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<BaseIpCfg> searchPage=new Page<BaseIpCfg>(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<BaseIpCfg> page = ipCfgService.findPage(searchPage, ipCfg);
Page<BaseIpCfg> page = ipCfgService.findPage(new Page<BaseIpCfg>(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";
}
/**
*

4
src/main/java/com/nis/web/controller/configuration/NumCfgController.java
View File

@@ -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";
}
/**
*

17
src/main/java/com/nis/web/controller/configuration/StringCfgController.java
View File

@@ -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<BaseStringCfg> searchPage=new Page<BaseStringCfg>(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<BaseStringCfg> page = stringCfgService.findPage(searchPage, stringCfg);
Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(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";
}
/**
*