1:为配置下发添加相关逻辑说明

2:修改配置下发和取消的冗余代码
3:删除分组复用相关内容
4:删除redis-pipeline相关的内容
5:删除项目启动加载maat关联关系的逻辑
This commit is contained in:
renkaige
2019-01-13 21:52:13 +06:00
parent 857e27e484
commit 55121ff91f
14 changed files with 304 additions and 1555 deletions

View File

@@ -3,12 +3,10 @@ package com.nis.util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.zdjizhi.utils.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,12 +24,7 @@ import com.nis.restful.ServiceRuntimeException;
*/
public class ServiceAndRDBIndexReal {
private static Logger logger = LoggerFactory.getLogger(ServiceAndRDBIndexReal.class);
/**
* 记录哪些service可以被分组复用(只有maat类配置可以被分组复用)
* Map<Service,Map<regionName,List<tableName>>
*/
private static Map<Integer, Map<String, List<String>>> serviceGroupReuseMap = new HashMap<Integer, Map<String, List<String>>>();
/**
* 第一个key是业务类型,第二个key是type(编译配置,分组配置,域配置)value是表名
*/
@@ -180,33 +173,7 @@ public class ServiceAndRDBIndexReal {
}
}
}
String serviceRepeatedReal = Configurations.getStringProperty("serviceRepeatedReal", "");
if (!StringUtil.isEmpty(serviceRepeatedReal)) {
String[] serviceRepeatedRealArr = serviceRepeatedReal.split(";");
for (String serviceRepeated : serviceRepeatedRealArr) {
String[] serInfos = serviceRepeated.split(":");
String[] regionInfos = serInfos[1].split("[|]");
for (String regionInfo : regionInfos) {
String[] regionTabName = regionInfo.split("@");
String[] tableNames = regionTabName[1].split(",");
for (String tableName : tableNames) {
Integer ser = Integer.valueOf(serInfos[0]);
if (serviceGroupReuseMap.containsKey(ser)) {
serviceGroupReuseMap.get(ser).get(regionTabName[0]).add(tableName);
} else {
Map<String, List<String>> regTabMap = new HashMap<String, List<String>>();
List<String> tabList = new ArrayList<String>();
tabList.add(tableName);
regTabMap.put(regionTabName[0], tabList);
serviceGroupReuseMap.put(ser, regTabMap);
}
}
}
}
}
}
public static void main(String[] args) {
// getUnMaatTable();
getMaatTable();
@@ -349,20 +316,6 @@ public class ServiceAndRDBIndexReal {
}
/**
* 判断service是否被分组复用
* @param service
* @return
*/
public static Boolean serviceIsReuse(Integer service) {
if (service != null) {
return serviceGroupReuseMap.containsKey(service);
} else {
throw new ServiceRuntimeException("判断service是否是分组复用时发生了异常,异常原因:service=null",
RestBusinessCode.ServiceIsNull.getValue());
}
}
/**
* 验证当前service是否是向阀门添加action,service或者userregion等属性
* @param service