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

(1)asn no放入eCache中

Browse Source 
(2)导入验证采用多线程验证，优化验证速度
(3)asn ip导入方式调整(未采用多线程，因为redis承受不了)
(4)asn ip列表展示速度优化
(5)导入方式重写:采用csv模式，限制采用xlsx格式，加载80万数据不会内存溢出.
This commit is contained in:
wangxin
2018-11-11 19:36:53 +08:00
parent 40bcfea683
commit 80dde7d6a0
53 changed files with 4831 additions and 2996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
View File

@@ -11,10 +11,12 @@ import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.AsnCacheUtils;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.AsnIpCfgDao;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.dao.specific.ConfigGroupInfoDao;
import com.nis.web.dao.specific.SpecificServiceCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -25,7 +27,8 @@ public class PolicyGroupInfoService extends BaseService{
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
@Autowired
private SpecificServiceCfgDao specificServiceCfgDao;
// private SpecificServiceCfgDao specificServiceCfgDao;
private ConfigGroupInfoDao configGroupInfoDao;
@Autowired
private AsnIpCfgDao asnIpCfgDao;
@@ -86,7 +89,7 @@ public class PolicyGroupInfoService extends BaseService{
}
entity.setServiceGroupId(serviceGroupId);
//新增协议分组
ConfigGroupInfo group = specificServiceCfgDao.getConfigGroupInfoByGroupId(serviceGroupId);
ConfigGroupInfo group = configGroupInfoDao.getConfigGroupInfoByGroupId(serviceGroupId);
if(group==null){
group = new ConfigGroupInfo();
group.setGroupId(serviceGroupId);
@@ -94,7 +97,11 @@ public class PolicyGroupInfoService extends BaseService{
group.setIsIssued(0);
group.setGroupType(entity.getGroupType());
group.setAsnId(entity.getAsnNo());
specificServiceCfgDao.insertConfigGroupInfo(group);
configGroupInfoDao.insertConfigGroupInfo(group);
if(group.getGroupType().intValue()==4) {
AsnCacheUtils.put(entity.getAsnNo(), group);
}
}
}
policyGroupInfoDao.insert(entity);
@@ -126,7 +133,7 @@ public class PolicyGroupInfoService extends BaseService{
for(String groupId:groupIds.split(",")) {
Integer.parseInt(groupId);
}
Integer count=specificServiceCfgDao.getIssuedConfigGroupInfoByGroupIds(groupIds);
Integer count=configGroupInfoDao.getIssuedConfigGroupInfoByGroupIds(groupIds);
if(count>0) return true;
return false;
}