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

分类性质标签、地域运营商作用域：融合自定义显示，添加排序，优化代码，

Browse Source 
特定服务器管理：修正列表分页显示，条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验，
协议ip配置：修正条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验（ipV4\ipV6地址及掩码校验，端口校验）
This commit is contained in:
zhangshilin
2018-03-21 13:43:43 +08:00
parent d5d708a492
commit f92ae2dda4
28 changed files with 710 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -76,30 +76,50 @@ public class SysDictInfoController extends BaseController {
for(int i=0;i<strArr.length;i++){
intArr[i] = Integer.valueOf(strArr[i]);
}
String searchType = null;
String searchContent = null;
if(!StringUtils.isBlank(sysDictInfo.getItemCode())){
searchType = "itemCode";
searchContent = sysDictInfo.getItemCode();
}
if(!StringUtils.isBlank(sysDictInfo.getItemValue())){
searchType = "itemValue";
searchContent = sysDictInfo.getItemValue();
}
model.addAttribute("searchType", searchType);
model.addAttribute("searchContent", searchContent);
if(sysDictInfo.getItemType()!=null){
model.addAttribute("selectedType", sysDictInfo.getItemType());
}else{
model.addAttribute("selectedType", selectedType);
sysDictInfo.setItemType(selectedType);
}
Page<SysDictInfo> pageCondition = new Page<SysDictInfo>(request, response);
//查询符合条件总数
List<SysDictInfo> showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
model.addAttribute("showTotalCount", showTotalCount.size());
List<SysDictInfo> allList = sysDictInfoService.findAllSysDictInfo(sysDictInfo,intArr,pageCondition.getOrderBy());
model.addAttribute("showTotalCount", allList.size());
//查出顶层分页数据
Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
Page<SysDictInfo> page = sysDictInfoService.findTopDictList(pageCondition, sysDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//查出所有数据
List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
//处理数据，保留顶层中的所有下层数据
//处理数据，取出主键优化处理
List<Integer> intList = Lists.newArrayList();
for(SysDictInfo se:page.getList()){
if(se!=null){
intList.add(se.getSysDictId());
}
}
List<SysDictInfo> list = Lists.newArrayList();
for(int i=allList.size()-1;i>=0;i--){
SysDictInfo se = allList.get(i);
if(se!=null&&se.getParent()!=null&&se.getParent().getSysDictId()!=null&&se.getParent().getSysDictId()==0){
if(se!=null&&intList.contains(se.getSysDictId())||(se!=null&&se.getParent().getSysDictId()==0)){
allList.remove(se);
}
}
@@ -114,116 +134,6 @@ public class SysDictInfoController extends BaseController {
return "/basics/sysDictList";
}
/**
* 查询业务辅助表-系统字典信息列表(含条件查询)
* @param sysDictInfo
* @param request
* @param response
* @param model
* @return
*/
@RequiresPermissions("sys:dict:view")
@RequestMapping(value = {"searchList"})
public String searchList(String itType, SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model, Integer selectedType) {
if(StringUtils.strIsBlank(sysDictInfo.getItemValue())
&&StringUtils.strIsBlank(sysDictInfo.getItemCode())
&&sysDictInfo.getBeginDate()==null
&&sysDictInfo.getEndDate()==null
&&sysDictInfo.getEditBeginDate()==null
&&sysDictInfo.getEditEndDate()==null){
if(sysDictInfo.getItemType()!=null){
selectedType = sysDictInfo.getItemType();
return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
}
return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
}
String[] strArr = itType.split("-");
Integer[] intArr = new Integer[strArr.length];
for(int i=0;i<strArr.length;i++){
intArr[i] = Integer.valueOf(strArr[i]);
}
if(sysDictInfo.getItemType()!=null){
model.addAttribute("selectedType", sysDictInfo.getItemType());
}else{
model.addAttribute("selectedType", selectedType);
sysDictInfo.setItemType(selectedType);
}
String searchType = null;
String searchContent = null;
if(!StringUtils.isBlank(sysDictInfo.getItemCode())){
searchType = "itemCode";
searchContent = sysDictInfo.getItemCode();
}
if(!StringUtils.isBlank(sysDictInfo.getItemValue())){
searchType = "itemValue";
searchContent = sysDictInfo.getItemValue();
}
model.addAttribute("searchType", searchType);
model.addAttribute("searchContent", searchContent);
//先查出条件查询所有数据（注意顺序）
List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
model.addAttribute("showTotalCount", allList.size());
//查出条件查询顶层分页数据
Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//处理数据，保留顶层中的所有下层数据
List<SysDictInfo> list = Lists.newArrayList();
//取出主键优化处理
List<Integer> tempList = Lists.newArrayList();
for(SysDictInfo se:page.getList()){
if(se!=null&&se.getSysDictId()!=null){
tempList.add(se.getSysDictId());
}
}
//删除所有重复
for(int i=allList.size()-1;i>=0;i--){
SysDictInfo se = allList.get(i);
//System.out.println("删前顺序"+se.getSysDictId());
if(se!=null&&se.getSysDictId()!=null){
if(tempList.contains(se.getSysDictId())||se.getParent().getSysDictId()==0){
allList.remove(se);
}
}
}
/* for(int i=allList.size()-1;i>=0;i--){
SysDictInfo se = allList.get(i);
System.out.println("删后顺序"+se.getSysDictId());
}*/
allList.addAll(page.getList());
SysDictInfo.sortList(list,allList,0,true);
//处理下级序号
SysDictInfo.addChildrenSeq(list, 0);
/*for(int i=list.size()-1;i>=0;i--){
SysDictInfo se = list.get(i);
System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
}*/
model.addAttribute("itType", itType);
model.addAttribute("intArr", Arrays.asList(intArr));
model.addAttribute("list", list);
return "/basics/sysDictInfoSearchList";
}
/**
* 进入添加或修改页面
* @param sysDictInfo