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

（1）ans ip导入开发

Browse Source 
（2）asn 导入模板修改asnNo为userRegion1
（3）加入导入是否全量开关，如果全量，会删除对应asn号下的所有IP，如果已下发，还得分组复用删除域
（4）优化效率，asn ip region获取region id改为批量
This commit is contained in:
wangxin
2018-10-26 18:57:20 +08:00
parent b5c4e542cd
commit 95c4c49f97
12 changed files with 250 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -88,16 +88,13 @@ public class SpecificServiceCfgController extends BaseController {
// 取出所有符合条件的顶层分页
Page<SpecificServiceCfg> page = specificServiceCfgService
.findTopPage(pageCondition, specificServiceCfg);
// 植入序号
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);
// 删除顶层数据、取出id
List<Integer> intList = Lists.newArrayList();
for (SpecificServiceCfg tempSS : page.getList()) {
if (tempSS != null) {
intList.add(tempSS.getSpecServiceId());
// 植入序号
for (int i = 0; i < page.getList().size(); i++) {
if (page.getList().get(i) != null) {
page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize())));
intList.add(page.getList().get(i).getSpecServiceId());
}
}
for (int i = allList.size() - 1; i >= 0; i--) {
@@ -106,14 +103,13 @@ public class SpecificServiceCfgController extends BaseController {
allList.remove(ss);
}
}
allList.addAll(page.getList());
List<SpecificServiceCfg> list = Lists.newArrayList();
SpecificServiceCfg.sortList(list, allList, 0, true);
//处理下级序号
SpecificServiceCfg.addChildrenSeq(list, 0);
model.addAttribute("page", page);
model.addAttribute("list", list);
return "/specific/specificServiceCfgList";