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

1:修改删除id对应关系时报错的问题

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-06-05 16:02:51 +08:00
parent 3c0adfd355
commit d748537492
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/nis/listener/CompileGroupRegionRela.java
View File

@@ -1,6 +1,7 @@
package com.nis.listener; package com.nis.listener;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -35,7 +36,7 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
@Override @Override
public void contextInitialized(ServletContextEvent event) { public void contextInitialized(ServletContextEvent event) {
try { try {
for (int i = 0; i <Configurations.getIntProperty("maxRedisDBIndex", 6); i++) { for (int i = 0; i < Configurations.getIntProperty("maxRedisDBIndex", 6); i++) {
RedisTemplate<String, String> redisTemplate = SpringContextHolder.getBean("redisTemplate" + i); RedisTemplate<String, String> redisTemplate = SpringContextHolder.getBean("redisTemplate" + i);
getAllId(redisTemplate, i); getAllId(redisTemplate, i);
} }
@@ -66,18 +67,18 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
} }
} else { } else {
// String[] split = value.split("\t"); // String[] split = value.split("\t");
// String regionIdStr = split[0]; // String regionIdStr = split[0];
// String groupIdStr = split[1]; // String groupIdStr = split[1];
// if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) { // if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) {
// groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(Long.valueOf(regionIdStr)); // groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(Long.valueOf(regionIdStr));
// } else { // } else {
// Set<Long> list = new HashSet<Long>(); // Set<Long> list = new HashSet<Long>();
// list.add(Long.valueOf(regionIdStr)); // list.add(Long.valueOf(regionIdStr));
// groupRegionIdMap.put(Long.valueOf(groupIdStr), list); // groupRegionIdMap.put(Long.valueOf(groupIdStr), list);
// } // }
String[] split = value.split("\t"); String[] split = value.split("\t");
//String regionIdStr = split[0]; // String regionIdStr = split[0];
String groupIdStr = split[1]; String groupIdStr = split[1];
if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) { if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) {
groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(keys); groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(keys);
@@ -172,9 +173,9 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
Set<Long> list = maatRelation.getCompileAndGroupMap().get(compileId); Set<Long> list = maatRelation.getCompileAndGroupMap().get(compileId);
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
for (Long groupId : list) { Iterator<Long> iterator = list.iterator();
// } while (iterator.hasNext()) {
// for (Long groupId: list.size()) { Long groupId = iterator.next();
if (maatRelation.getGroupAndCompileMap().containsKey(groupId)) { if (maatRelation.getGroupAndCompileMap().containsKey(groupId)) {
// && maatRelation.getGroupAndCompileMap().get(groupId).size() == 1 // && maatRelation.getGroupAndCompileMap().get(groupId).size() == 1
// && maatRelation.getGroupAndCompileMap().get(groupId).get(0).longValue() == // && maatRelation.getGroupAndCompileMap().get(groupId).get(0).longValue() ==
@@ -192,7 +193,8 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
// maatRelation.getCompileAndGroupMap().get(compileId) // maatRelation.getCompileAndGroupMap().get(compileId)
// list.remove(maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId));// // list.remove(maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId));//
// 删除编译下面的组 // 删除编译下面的组
list.remove(groupId);// 删除编译下面的组 // list.remove(groupId);// 删除编译下面的组
iterator.remove();// 删除编译下面的组
} }
} }
} }
@@ -203,8 +205,8 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
// maatRelation.getGroupAndCompileMap().get(groupId) // maatRelation.getGroupAndCompileMap().get(groupId)
// .remove(maatRelation.getGroupAndCompileMap().get(groupId).indexOf(compileId));// // .remove(maatRelation.getGroupAndCompileMap().get(groupId).indexOf(compileId));//
// 删除分组关系中的组和编译关系 // 删除分组关系中的组和编译关系
// list.remove(groupId);// 删除编译下面的这个组
list.remove(groupId);// 删除编译下面的这个组 iterator.remove();// 删除编译下面的这个组
maatRelation.getGroupAndCompileMap().get(groupId).remove(compileId); maatRelation.getGroupAndCompileMap().get(groupId).remove(compileId);
} }
} else { } else {