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

1:按照ysp数据库文档修改各个业务类型对应的表名

Browse Source 
2:修改maatConfig中域和分组map为list<map>
3:删除maat.xml中关于redisDBIndex的配置
This commit is contained in:
RenKaiGe-Office
2018-05-25 15:04:51 +08:00
parent 2391170301
commit e6d9cfe9c5
11 changed files with 407 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/domain/MaatXmlExpr.java
View File

@@ -8,7 +8,7 @@ public class MaatXmlExpr implements Serializable {
private String keyExpression;
private String valueExpression;
private Integer type;
private Integer redisDB;
//private Integer redisDB;
public String getKeyExpression() {
return keyExpression;
@@ -26,9 +26,6 @@ public class MaatXmlExpr implements Serializable {
this.valueExpression = valueExpression;
}
public Integer getRedisDB() {
return redisDB;
}
public Integer getType() {
return type;
@@ -38,8 +35,5 @@ public class MaatXmlExpr implements Serializable {
this.type = type;
}
public void setRedisDB(Integer redisDB) {
this.redisDB = redisDB;
}
}

10
src/main/java/com/nis/domain/MaatXmlSeq.java
View File

@@ -8,7 +8,7 @@ public class MaatXmlSeq implements Serializable {
private String sequenceKey;
private Integer operation;
private Integer redisDB;
// private Integer redisDB;
public String getSequenceKey() {
return sequenceKey;
@@ -26,12 +26,4 @@ public class MaatXmlSeq implements Serializable {
this.operation = operation;
}
public Integer getRedisDB() {
return redisDB;
}
public void setRedisDB(Integer redisDB) {
this.redisDB = redisDB;
}
}

75
src/main/java/com/nis/domain/restful/MaatConfig.java
View File

@@ -1,6 +1,7 @@
package com.nis.domain.restful;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
@@ -22,23 +23,31 @@ public class MaatConfig implements Serializable {
/**
* 分组配置
*/
private Map<String, String> groupMap;
private List<Map<String, String>> groupMapList;
/**
* ip域配置
*/
private Map<String, String> ipRegionMap;
private List<Map<String, String>> ipRegionMapList;
/**
* 数值域配置
*/
private Map<String, String> numRegionMap;
private List<Map<String, String>> numRegionMapList;
/**
* 字符串域配置
*/
private Map<String, String> strRegionMap;
private List<Map<String, String>> strRegionMapList;
/**
* 增强字符串域配置
*/
private Map<String, String> strStrRegionMap;
private List<Map<String, String>> strStrRegionMapList;
/**
* 文件摘要类域配置
*/
private List<Map<String, String>> fileDigestRegionMapList;
/**
* 文本相似性域配置
*/
private List<Map<String, String>> fileLikeRegionMapList;
/**
* 业务类型
@@ -53,44 +62,60 @@ public class MaatConfig implements Serializable {
this.compileMap = compileMap;
}
public Map<String, String> getGroupMap() {
return groupMap;
public List<Map<String, String>> getGroupMapList() {
return groupMapList;
}
public void setGroupMap(Map<String, String> groupMap) {
this.groupMap = groupMap;
public void setGroupMapList(List<Map<String, String>> groupMapList) {
this.groupMapList = groupMapList;
}
public Map<String, String> getIpRegionMap() {
return ipRegionMap;
public List<Map<String, String>> getIpRegionMapList() {
return ipRegionMapList;
}
public void setIpRegionMap(Map<String, String> ipRegionMap) {
this.ipRegionMap = ipRegionMap;
public void setIpRegionMapList(List<Map<String, String>> ipRegionMapList) {
this.ipRegionMapList = ipRegionMapList;
}
public Map<String, String> getNumRegionMap() {
return numRegionMap;
public List<Map<String, String>> getNumRegionMapList() {
return numRegionMapList;
}
public void setNumRegionMap(Map<String, String> numRegionMap) {
this.numRegionMap = numRegionMap;
public void setNumRegionMapList(List<Map<String, String>> numRegionMapList) {
this.numRegionMapList = numRegionMapList;
}
public Map<String, String> getStrRegionMap() {
return strRegionMap;
public List<Map<String, String>> getStrRegionMapList() {
return strRegionMapList;
}
public void setStrRegionMap(Map<String, String> strRegionMap) {
this.strRegionMap = strRegionMap;
public void setStrRegionMapList(List<Map<String, String>> strRegionMapList) {
this.strRegionMapList = strRegionMapList;
}
public Map<String, String> getStrStrRegionMap() {
return strStrRegionMap;
public List<Map<String, String>> getStrStrRegionMapList() {
return strStrRegionMapList;
}
public void setStrStrRegionMap(Map<String, String> strStrRegionMap) {
this.strStrRegionMap = strStrRegionMap;
public void setStrStrRegionMapList(List<Map<String, String>> strStrRegionMapList) {
this.strStrRegionMapList = strStrRegionMapList;
}
public List<Map<String, String>> getFileDigestRegionMapList() {
return fileDigestRegionMapList;
}
public void setFileDigestRegionMapList(List<Map<String, String>> fileDigestRegionMapList) {
this.fileDigestRegionMapList = fileDigestRegionMapList;
}
public List<Map<String, String>> getFileLikeRegionMapList() {
return fileLikeRegionMapList;
}
public void setFileLikeRegionMapList(List<Map<String, String>> fileLikeRegionMapList) {
this.fileLikeRegionMapList = fileLikeRegionMapList;
}
public Integer getService() {

154
src/main/java/com/nis/domain/restful/MaatRelation.java Normal file
View File

@@ -0,0 +1,154 @@
package com.nis.domain.restful;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MaatRelation implements Serializable {
private static final long serialVersionUID = 1L;
private Map<Long, List<Long>> compileAndGroupMap;
private Map<Long, List<Long>> groupAndCompileMap;
// private Map<Long, List<Long>> regionAndGroupMap;
private Map<Long, List<Long>> groupAndRegionMap;
public Map<Long, List<Long>> getCompileAndGroupMap() {
return compileAndGroupMap;
}
public void setCompileAndGroupMap(Map<Long, List<Long>> compileAndGroupMap) {
this.compileAndGroupMap = compileAndGroupMap;
}
public Map<Long, List<Long>> getGroupAndCompileMap() {
return groupAndCompileMap;
}
public void setGroupAndCompileMap(Map<Long, List<Long>> groupAndCompileMap) {
this.groupAndCompileMap = groupAndCompileMap;
}
public Map<Long, List<Long>> getGroupAndRegionMap() {
return groupAndRegionMap;
}
public void setGroupAndRegionMap(Map<Long, List<Long>> groupAndRegionMap) {
this.groupAndRegionMap = groupAndRegionMap;
}
public static void removKey(MaatRelation maatRelation, long compileId) {
if (maatRelation.getCompileAndGroupMap().containsKey(compileId)) {
List<Long> list = maatRelation.getCompileAndGroupMap().get(compileId);
for (int i = 0; i < list.size(); i++) {
Long groupId = list.get(i);
// }
// for (Long groupId: list.size()) {
if (maatRelation.getGroupAndCompileMap().containsKey(groupId)) {
// && maatRelation.getGroupAndCompileMap().get(groupId).size() == 1
// && maatRelation.getGroupAndCompileMap().get(groupId).get(0).longValue() ==
// compileId) {
List<Long> compileIdList = maatRelation.getGroupAndCompileMap().get(groupId);
if (compileIdList.size() == 1) {// 当前的groupid只属于当前的compileid,没有被分组复用,需要将编译配置,分组关系,域配置,置无效
for (Long id : compileIdList) {
if (id.longValue() == compileId) {
// 这个group没有被分组复用,所以需要将这个组下面的域配置置为无效,组也要置为无效
if (maatRelation.getGroupAndRegionMap().containsKey(groupId)) {
// 把当前组置为无效,把当前组下的所有域置为无效
maatRelation.getGroupAndRegionMap().remove(groupId);// 删除组对应的域
maatRelation.getGroupAndCompileMap().remove(groupId);// 删除当前组所对应的编译
// maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId);
// maatRelation.getCompileAndGroupMap().get(compileId)
list.remove(maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId));// 删除编译下面的组
}
}
}
} else {
// 这个组对应了多个编译配置被分组复用了,这时将这个组和编译的关系置为无效,编译置为无效
list.remove(maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId));// 删除编译下面的这个组
maatRelation.getGroupAndCompileMap().get(groupId)
.remove(maatRelation.getGroupAndCompileMap().get(groupId).indexOf(compileId));// 删除分组关系中的组和编译关系
}
} else {
// 当前的groupid属于多个组,被分组复用了,所以不对这个组进行操作,也不对这个组下面的域进行操作
}
}
}
}
public static void syso(MaatRelation maatRelation) {
Map<Long, List<Long>> getCompileAndGroupMap = maatRelation.getCompileAndGroupMap();
for (Long compile : getCompileAndGroupMap.keySet()) {
List<Long> groupList = getCompileAndGroupMap.get(compile);
for (Long group : groupList) {
System.out.println("编译:" + compile + "组:" + group);
}
}
Map<Long, List<Long>> getGroupAndCompileMap = maatRelation.getGroupAndCompileMap();
for (Long group : getGroupAndCompileMap.keySet()) {
List<Long> compileList = getGroupAndCompileMap.get(group);
for (Long compile : compileList) {
System.out.println("组:" + group + "编译:" + compile);
}
}
Map<Long, List<Long>> getGroupAndRegionMap = maatRelation.getGroupAndRegionMap();
for (Long group : getGroupAndRegionMap.keySet()) {
List<Long> regionList = getGroupAndRegionMap.get(group);
for (Long region : regionList) {
System.out.println("组:" + group + "域:" + region);
}
}
System.out.println();
System.out.println();
System.out.println();
System.out.println();
}
public static void main(String[] args) {
MaatRelation maatRelation = getMaat();
syso(maatRelation);
long compileId = 11;
removKey(maatRelation, compileId);
syso(maatRelation);
compileId = 2;
removKey(maatRelation, compileId);
syso(maatRelation);
}
public static MaatRelation getMaat() {
MaatRelation maatRelation = new MaatRelation();
Map<Long, List<Long>> compileAndGroupMap = new HashMap<Long, List<Long>>();
List<Long> list = new ArrayList<Long>();
list.add(1l);
compileAndGroupMap.put(1l, list);
list = new ArrayList<Long>();
list.add(1l);
compileAndGroupMap.put(2l, list);
Map<Long, List<Long>> groupAndCompileMap = new HashMap<Long, List<Long>>();
list = new ArrayList<Long>();
list.add(1l);
list.add(2l);
groupAndCompileMap.put(1l, list);
// Map<Long, List<Long>> regionAndGroupMap = new HashMap<Long, List<Long>>();
list = new ArrayList<Long>();
list.add(1l);
// regionAndGroupMap.put(1l, list);
Map<Long, List<Long>> groupAndRegionMap = new HashMap<Long, List<Long>>();
groupAndRegionMap.put(1l, list);
maatRelation.setCompileAndGroupMap(compileAndGroupMap);
maatRelation.setGroupAndCompileMap(groupAndCompileMap);
maatRelation.setGroupAndRegionMap(groupAndRegionMap);
// maatRelation.setRegionAndGroupMap(regionAndGroupMap);
return maatRelation;
}
}