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

1.IP分组域配置修改增加修改人/时间

Browse Source 
2.修复携带查询条件无法导出数据bug
3.优化分组域配置导入
This commit is contained in:
zhangwenqing
2019-06-20 18:06:38 +08:00
parent 8217770d6d
commit b4c06301b0
17 changed files with 289 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java
View File

@@ -3,8 +3,10 @@ package com.nis.web.controller.basics;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import javax.servlet.http.HttpServletRequest;
@@ -174,12 +176,12 @@ public class DomainCommGroupController extends BaseController{
try {
regionIds = ConfigServiceUtil.getId(3,_stringCfgs.size());
} catch (Exception e) {
e.printStackTrace();
logger.info("获取域ID出错");
logger.error("获取域ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
int index = 0;
Set<String> countSet = new HashSet<String>();
for (BaseStringCfg<?> cfg : _stringCfgs) {
cfg.setAction(serviceDict==null?null:serviceDict.getAction());
cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
@@ -200,10 +202,23 @@ public class DomainCommGroupController extends BaseController{
cfg.setTableName("domain_comm_cfg");
cfg.setRegionId(regionIds.get(index));
cfg.setGroupName(cfg.getGroupName().toUpperCase());
countSet.add(cfg.getGroupName());
index++;
}
domainCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs);
Integer count = commonGroupManageService.getCountByGroupName(countSet, Constants.DOMAIN_OBJ_GROUP_TYPE); // 需调用服务接口获取GroupId的数量
List<Integer> groupIds= ConfigServiceUtil.getId(2,count);
if(count > 0) {
try {
groupIds = ConfigServiceUtil.getId(2,count);
} catch (Exception e) {
logger.error("获取组ID出错");
throw new MaatConvertException("Get group id failed");
}
}
domainCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIds);
_stringCfgs.clear();
}