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

1、修改tableName的验证，如果为空不验证service与tableName的关系；

Browse Source 
2、maat通用配置，字符串域和增强字符串域分成两个list传给存储接口
This commit is contained in:
zhangdongxu
2018-06-04 16:31:35 +08:00
parent 0ec915f8f1
commit bac61bf27b
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/util/CompileVal.java
View File

@@ -175,7 +175,8 @@ public class CompileVal {
for (NumRegion numRegion : numRegionList) { for (NumRegion numRegion : numRegionList) {
// if (configCompile.getIsValid() != 0 && // if (configCompile.getIsValid() != 0 &&
// !regionGroupIdList.contains(numRegion.getGroupId())) { // !regionGroupIdList.contains(numRegion.getGroupId())) {
if (!type2TableNameIsOk(configCompile.getService(), numRegion.getTableName())) {
if (!StringUtil.isEmpty(numRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), numRegion.getTableName())) {
return "配置id为" + configCompile.getCompileId() + "的配置中numRegionList中的regionid为" return "配置id为" + configCompile.getCompileId() + "的配置中numRegionList中的regionid为"
+ numRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致"; + numRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
} }
@@ -221,7 +222,7 @@ public class CompileVal {
for (StrRegion strRegion : strRegionList) { for (StrRegion strRegion : strRegionList) {
// if (configCompile.getIsValid() != 0 && // if (configCompile.getIsValid() != 0 &&
// !regionGroupIdList.contains(strRegion.getGroupId())) { // !regionGroupIdList.contains(strRegion.getGroupId())) {
if (!type2TableNameIsOk(configCompile.getService(), strRegion.getTableName())) { if (!StringUtil.isEmpty(strRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), strRegion.getTableName())) {
return "配置id为" + configCompile.getCompileId() + "的配置中strRegionList中的regionid为" return "配置id为" + configCompile.getCompileId() + "的配置中strRegionList中的regionid为"
+ strRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致"; + strRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
} }
@@ -269,7 +270,7 @@ public class CompileVal {
for (IpRegion ipRegion : ipRegionList) { for (IpRegion ipRegion : ipRegionList) {
// if (configCompile.getIsValid() != 0 && // if (configCompile.getIsValid() != 0 &&
// !regionGroupIdList.contains(ipRegion.getGroupId())) { // !regionGroupIdList.contains(ipRegion.getGroupId())) {
if (!type2TableNameIsOk(configCompile.getService(), ipRegion.getTableName())) { if (!StringUtil.isEmpty(ipRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), ipRegion.getTableName())) {
return "配置id为" + configCompile.getCompileId() + "的配置中ipRegionList中的regionid为" return "配置id为" + configCompile.getCompileId() + "的配置中ipRegionList中的regionid为"
+ ipRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致"; + ipRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
} }

23
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -1201,22 +1201,25 @@ public class ConfigSourcesService extends BaseService {
maatConfig.setGroupMapList(dstMaplList); maatConfig.setGroupMapList(dstMaplList);
//字符串域 //字符串域
dstMaplList = null; dstMaplList = null;
List<Map<String, String>> strongMapList = null;
if (!StringUtil.isEmpty(configCompile.getStrRegionList())) { if (!StringUtil.isEmpty(configCompile.getStrRegionList())) {
dstMaplList = new ArrayList<Map<String,String>>(); dstMaplList = new ArrayList<Map<String,String>>();
for (StrRegion region : configCompile.getStrRegionList()) { for (StrRegion region : configCompile.getStrRegionList()) {
dstMaplList.add(convertObjectToMap(region, StrRegion.class)); if(!StringUtil.isEmpty(region.getDistrict())){
dstMaplList.add(convertObjectToMap(region, StrRegion.class));
}else{
if (StringUtil.isEmpty(strongMapList)) {
strongMapList = new ArrayList<Map<String,String>>();
}
strongMapList.add(convertObjectToMap(region, StrRegion.class));
}
} }
} }
maatConfig.setStrRegionMapList(dstMaplList); maatConfig.setStrRegionMapList(dstMaplList);
// //增强字符串域 // 增强字符串域
// dstMaplList = null; if (!StringUtil.isEmpty(strongMapList)&&strongMapList.size()>0) {
// if (!StringUtil.isEmpty(strStrongRegionList)) { maatConfig.setStrStrRegionMapList((dstMaplList));
// dstMaplList = new ArrayList<Map<String,String>>(); }
// for (StrRegion region : strStrongRegionList) {
// dstMaplList.add(convertObjectToMap(region, StrRegion.class));
// }
// }
// maatConfig.setStrStrRegionMapList((dstMaplList));
//数值域 //数值域
dstMaplList = null; dstMaplList = null;
if (!StringUtil.isEmpty(configCompile.getNumRegionList())) { if (!StringUtil.isEmpty(configCompile.getNumRegionList())) {