diff --git a/src/main/java/com/nis/domain/restful/ConfigCompile.java b/src/main/java/com/nis/domain/restful/ConfigCompile.java index 9fd27f6..4adac13 100644 --- a/src/main/java/com/nis/domain/restful/ConfigCompile.java +++ b/src/main/java/com/nis/domain/restful/ConfigCompile.java @@ -47,11 +47,11 @@ public class ConfigCompile implements Serializable { @ApiModelProperty(value = "保障期", required = false) private Integer guaranteeId; @ApiModelProperty(value = "事件", required = false) - private Integer affAirId; + private Integer affairId; @ApiModelProperty(value = "子话题", required = false) - private Integer topIcId; + private Integer topicId; @ApiModelProperty(value = "是否黑名单", required = true) - private Long doBlackList; + private Long doBlacklist; @ApiModelProperty(value = "是否生成日志", required = true) private Integer doLog; @ApiModelProperty(value = "生效范围", required = true) @@ -180,16 +180,16 @@ public class ConfigCompile implements Serializable { /** * @return doBlackList */ - public Long getDoBlackList() { - return doBlackList; + public Long getDoBlacklist() { + return doBlacklist; } /** * @param doBlackList * 要设置的 doBlackList */ - public void setDoBlackList(Long doBlackList) { - this.doBlackList = doBlackList; + public void setDoBlacklist(Long doBlacklist) { + this.doBlacklist = doBlacklist; } /** @@ -445,20 +445,20 @@ public class ConfigCompile implements Serializable { this.guaranteeId = guaranteeId; } - public Integer getAffAirId() { - return affAirId; + public Integer getAffairId() { + return affairId; } - public void setAffAirId(Integer affAirId) { - this.affAirId = affAirId; + public void setAffairId(Integer affairId) { + this.affairId = affairId; } - public Integer getTopIcId() { - return topIcId; + public Integer getTopicId() { + return topicId; } - public void setTopIcId(Integer topIcId) { - this.topIcId = topIcId; + public void setTopicId(Integer topicId) { + this.topicId = topicId; } @JsonIgnore diff --git a/src/main/java/com/nis/util/CamelUnderlineUtil.java b/src/main/java/com/nis/util/CamelUnderlineUtil.java new file mode 100644 index 0000000..a7d5ba8 --- /dev/null +++ b/src/main/java/com/nis/util/CamelUnderlineUtil.java @@ -0,0 +1,56 @@ +/** + * + */ +package com.nis.util; + +/** + * @ClassName:CamelUnderlineUtil + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (zdx) + * @date 2018年5月25日 下午4:44:54 + * @version V1.0 + */ +public class CamelUnderlineUtil { + + private static final char UNDERLINE ='_'; + public static String camelToUnderline(String param) { + + if (StringUtil.isEmpty(param)) { + + return ""; + } + StringBuilder sb = new StringBuilder(); + int len = param.length(); + for (int i = 0; i < len; i++) { + char c = param.charAt(i); + if (Character.isUpperCase(c)) { + sb.append(UNDERLINE); + sb.append(Character.toLowerCase(c)); + } else { + sb.append(c); + } + } + return sb.toString(); + } + + public static String underlineToCamel(String param){ + + if (StringUtil.isEmpty(param)) { + + return ""; + } + StringBuilder sb = new StringBuilder(); + int len = param.length(); + for (int i = 0; i < len; i++) { + char c = param.charAt(i); + if (c==UNDERLINE) { + if(++i 0) { - int index = str.toUpperCase().indexOf("ORA-"); - if (index != -1) { - errorCode = str.substring(index + 4, index + 9); - } - } - Map throwExceptionInfo = OracleErrorCodeUtil.throwExceptionInfo(errorCode); - for (int errorNum : throwExceptionInfo.keySet()) { - if (errorNum == 998) { - thread.setExceptionInfo(exception.toString()); - } else { - thread.setExceptionInfo(throwExceptionInfo.get(errorNum)); - } - throw new RestServiceException(thread, System.currentTimeMillis() - start, - throwExceptionInfo.get(errorNum), errorNum); - } - } - // configSourcesService.insertConfigSourceData(thread, start, - // configSource.getConfigCompileList(), sb); + configSourcesService.saveMaatConfig(thread, start, configSource.getConfigCompileList(), sb); Long endSaveTime = System.currentTimeMillis(); Long time = (endSaveTime - benginTime) / 1000; diff --git a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java index 22b6068..112faed 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigTestController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigTestController.java @@ -584,9 +584,9 @@ public class ConfigTestController extends BaseRestController { configCompile.setContLabel("0"); configCompile.setTaskId(0); configCompile.setGuaranteeId(0); - configCompile.setAffAirId(0); - configCompile.setTopIcId(0); - configCompile.setDoBlackList(0l); + configCompile.setAffairId(0); + configCompile.setTopicId(0); + configCompile.setDoBlacklist(0l); configCompile.setDoLog(0); configCompile.setEffectiveRange("0"); configCompile.setConfigPercent(100l); diff --git a/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java b/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java index 229f3db..6a050a8 100644 --- a/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java +++ b/src/main/java/com/nis/web/controller/restful/SaveConfigTestController.java @@ -243,9 +243,9 @@ public class SaveConfigTestController extends BaseRestController { configCompile.setContLabel("0"); configCompile.setTaskId(0); configCompile.setGuaranteeId(0); - configCompile.setAffAirId(0); - configCompile.setTopIcId(0); - configCompile.setDoBlackList(1l); + configCompile.setAffairId(0); + configCompile.setTopicId(0); + configCompile.setDoBlacklist(1l); configCompile.setDoLog(0); configCompile.setEffectiveRange("0"); configCompile.setConfigPercent(100l); diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java index 9c149e4..5bb55d9 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java @@ -279,8 +279,8 @@ public class ConfigRedisServiceimpl extends BaseRedisDao impleme } } maatKey = keyBF.toString(); - // System.out.println(keyBF.toString()); - // System.out.println(valBF.toString()); + System.out.println(keyBF.toString()); + System.out.println(valBF.toString()); redisTemplate.opsForValue().set(maatKey.toUpperCase(), valBF.toString()); // redisTemplate.boundValueOps(keyBF.toString()).set(valBF.toString()); break; diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index d929dff..0de96fe 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1,5 +1,11 @@ package com.nis.web.service.restful; +import java.beans.IntrospectionException; +import java.beans.PropertyDescriptor; +import java.io.File; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.sql.Connection; import java.sql.SQLException; import java.text.ParseException; @@ -34,12 +40,14 @@ import com.nis.domain.restful.ConfigCompileTest; import com.nis.domain.restful.ConfigGroupRelation; import com.nis.domain.restful.DigestRegion; import com.nis.domain.restful.IpRegion; +import com.nis.domain.restful.MaatConfig; import com.nis.domain.restful.NumRegion; import com.nis.domain.restful.StrRegion; import com.nis.restful.CompileJudgeCode; import com.nis.restful.RestBusinessCode; import com.nis.restful.RestServiceException; import com.nis.util.BasicProvingUtil; +import com.nis.util.CamelUnderlineUtil; import com.nis.util.CompileVal; import com.nis.util.Configurations; import com.nis.util.OracleErrorCodeUtil; @@ -100,6 +108,36 @@ public class ConfigSourcesService extends BaseService { public static Map> getTableRelation() { Map> tableMap = new HashMap>(); Map typeMap = new HashMap(); + typeMap.put("AV_CONT_IP_PORT", "ip"); + tableMap.put(80, typeMap); + tableMap.put(144, typeMap); + + typeMap = new HashMap(); + typeMap.put("AV_CONT_URL", "str"); + tableMap.put(81, typeMap); + tableMap.put(145, typeMap); + + typeMap = new HashMap(); + typeMap.put("AV_PIC_IP_PORT", "ip"); + tableMap.put(82, typeMap); + tableMap.put(146, typeMap); + + typeMap = new HashMap(); + typeMap.put("AV_PIC_URL", "str"); + tableMap.put(83, typeMap); + tableMap.put(147, typeMap); + + typeMap = new HashMap(); + typeMap.put("AV_VoIP_IP_PORT", "ip"); + tableMap.put(84, typeMap); + tableMap.put(148, typeMap); + + typeMap = new HashMap(); + typeMap.put("AV_VoIP_ACCOUNT", "str"); + tableMap.put(85, typeMap); + tableMap.put(149, typeMap); + + typeMap = new HashMap(); typeMap.put("REUSE_IP", "ip"); typeMap.put("HID_CONTENT", "ip"); typeMap.put("GSB_PZ_IP", "ip"); @@ -1056,11 +1094,220 @@ public class ConfigSourcesService extends BaseService { this.map = map; } - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** - * jdbc方式添加和修改 + * + * @Description: + * @author (zdx) + * @date 2018年5月25日 下午3:49:46 + * @param thread + * @param start + * @param configCompileList + * @param sb + * @return */ - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + public String saveMaatConfig(SaveRequestLogThread thread, long start, List configCompileList, + StringBuffer sb) { + List maatConfigList = new ArrayList(); + List serviceList = new ArrayList(); + + for (ConfigCompile configCompile : configCompileList) { + serviceList.add(Integer.valueOf(configCompile.getService().toString())); + MaatConfig maatConfig = new MaatConfig(); + List groupRelationList = new ArrayList(); + List strRegionList = new ArrayList(); + List strStrongRegionList = new ArrayList(); + List ipRegionList =new ArrayList(); + List numRegionList = new ArrayList(); + List digestRegionList = new ArrayList(); + String msg = CompileVal.compileIsOk(configCompile, false, sb); + if (msg != CompileJudgeCode.CompileIsOk.getErrorReason()) { + logger1.error(msg); + thread.setExceptionInfo(msg + sb.toString()); + throw new RestServiceException(thread, System.currentTimeMillis() - start, msg + sb.toString(), + RestBusinessCode.config_integrity_error.getValue()); + } + + + if (null != configCompile.getGroupRelationList() && configCompile.getGroupRelationList().size() > 0) { + groupRelationList.addAll(configCompile.getGroupRelationList()); + } else { + logger1.error("配置分组数量不能为空" + sb.toString()); + thread.setExceptionInfo("配置分组数量不能为空" + sb.toString()); + throw new RestServiceException(thread, System.currentTimeMillis() - start, "配置分组数量不能为空" + sb.toString(), + RestBusinessCode.missing_args.getValue()); + } + if (null != configCompile.getStrRegionList() && configCompile.getStrRegionList().size() > 0) { + for (StrRegion strRegion : configCompile.getStrRegionList()) { + if (!isStrStrongRegion(strRegion.getTableName())) { + if (strRegion.getRegionId() == null) { + String errorMsg = "字符类域配置id不能为空 ,表名---" + strRegion.getTableName() + "" + sb.toString(); + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.missing_args.getValue()); + } + strRegionList.add(strRegion); + } else { + if (strRegion.getRegionId() == null) { + String errorMsg = "增强字符类域配置id不能为空 ,表名---" + strRegion.getTableName() + "" + sb.toString(); + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.missing_args.getValue()); + } + strStrongRegionList.add(strRegion); + } + } + } + + if (null != configCompile.getIpRegionList() && configCompile.getIpRegionList().size() > 0) { + for (IpRegion ipRegion : configCompile.getIpRegionList()) { + if (!ipRegion.getTableName().toUpperCase().equals("DJ_IP_PORT")) { + ipRegion.setProtocol(0); + } + + if (ipRegion.getRegionId() == null) { + String errorMsg = "ip类域配置id不能为空 ,表名---" + ipRegion.getTableName() + "" + sb.toString(); + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.missing_args.getValue()); + } + + ipRegionList.add(ipRegion); + } + } + + if (null != configCompile.getNumRegionList() && configCompile.getNumRegionList().size() > 0) { + for (NumRegion numRegion : configCompile.getNumRegionList()) { + if (numRegion.getRegionId() == null) { + String errorMsg = "数值类域配置id不能为空 ,表名---" + numRegion.getTableName() + "" + sb.toString(); + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.missing_args.getValue()); + } + numRegionList.add(numRegion); + } + } + if (null != configCompile.getDigestRegionList() && configCompile.getDigestRegionList().size() > 0) { + for (DigestRegion digestRegion : configCompile.getDigestRegionList()) { + if (digestRegion.getRegionId() == null) { + String errorMsg = "摘要类域配置id不能为空 ,表名---" + digestRegion.getTableName() + "" + sb.toString(); + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.missing_args.getValue()); + } + + digestRegionList.add(digestRegion); + } + } + + maatConfig.setService(Integer.valueOf(configCompile.getService().toString())); + //编译 + maatConfig.setCompileMap(convertObjectToMap(configCompile, ConfigCompile.class)); + //分组 + List> dstMaplList = null; + if (!StringUtil.isEmpty(groupRelationList)) { + dstMaplList = new ArrayList>(); + for (ConfigGroupRelation group : groupRelationList) { + dstMaplList.add(convertObjectToMap(group, ConfigGroupRelation.class)); + } + } + maatConfig.setGroupMapList(dstMaplList); + //字符串域 + dstMaplList = null; + if (!StringUtil.isEmpty(strRegionList)) { + dstMaplList = new ArrayList>(); + for (StrRegion region : strRegionList) { + dstMaplList.add(convertObjectToMap(region, StrRegion.class)); + } + } + maatConfig.setStrRegionMapList(dstMaplList); + //增强字符串域 + dstMaplList = null; + if (!StringUtil.isEmpty(strStrongRegionList)) { + dstMaplList = new ArrayList>(); + for (StrRegion region : strStrongRegionList) { + dstMaplList.add(convertObjectToMap(region, StrRegion.class)); + } + } + maatConfig.setStrStrRegionMapList((dstMaplList)); + //数值域 + dstMaplList = null; + if (!StringUtil.isEmpty(numRegionList)) { + dstMaplList = new ArrayList>(); + for (NumRegion region : numRegionList) { + dstMaplList.add(convertObjectToMap(region, NumRegion.class)); + } + } + maatConfig.setNumRegionMapList(dstMaplList); + + //Ip域 + dstMaplList = null; + if (!StringUtil.isEmpty(ipRegionList)) { + dstMaplList = new ArrayList>(); + for (IpRegion region : ipRegionList) { + dstMaplList.add(convertObjectToMap(region, IpRegion.class)); + } + } + maatConfig.setIpRegionMapList(dstMaplList); + + //摘要类域 + dstMaplList = null; + if (!StringUtil.isEmpty(digestRegionList)) { + dstMaplList = new ArrayList>(); + for (DigestRegion region : digestRegionList) { + dstMaplList.add(convertObjectToMap(region, DigestRegion.class)); + } + } + + maatConfig.setFileDigestRegionMapList(dstMaplList); + dstMaplList = null; + //文本相似性域 + maatConfig.setFileLikeRegionMapList(dstMaplList); + maatConfigList.add(maatConfig); + } + if (!StringUtil.isEmpty(serviceList)&&serviceList.size()!=1) { + String errorMsg = "只能添加单一service配置信息列表"; + logger1.error(errorMsg); + thread.setExceptionInfo(errorMsg); + throw new RestServiceException(thread, System.currentTimeMillis() - start, errorMsg, + RestBusinessCode.op_action_error.getValue()); + } + + //调用接口入redis + configRedisService.saveMaatConfig(maatConfigList, serviceList.get(0)); + + return "ok"; + } + private Map convertObjectToMap(Object obj,Class clazz){ + Map dstMap = new HashMap(); + try { + Field[] fields= obj.getClass().getDeclaredFields(); + for (Field field : fields) { + if("serialVersionUID".equals(field.getName())) + continue; + String dstName = CamelUnderlineUtil.camelToUnderline(field.getName()); + PropertyDescriptor pd; + pd = new PropertyDescriptor(field.getName(), clazz); + Method method = pd.getReadMethod(); + Object dstObject = method.invoke(obj); + if (dstObject instanceof Date) { + dstObject = convertToTimeStamp16((Date)dstObject); + }if(dstObject instanceof ArrayList){ + dstObject = ""; + } + dstMap.put(dstName, StringUtil.isEmpty(dstObject)?"":dstObject.toString()); + } + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + logger1.error(e.getMessage()); + } + return dstMap; + } public String saveByJDBCThread(SaveRequestLogThread thread, long start, List configCompileList, StringBuffer sb) { List groupRelationList = new ArrayList(); @@ -1186,7 +1433,7 @@ public class ConfigSourcesService extends BaseService { } } } - + if (Configurations.getStringProperty("isCommit", "false").equals("true")) { int count = 0; if (null != configCompileList && configCompileList.size() > 0) { @@ -1298,6 +1545,12 @@ public class ConfigSourcesService extends BaseService { } return "ok"; } + + private String convertToTimeStamp16(Date date){ + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + return date.getTime()+"000"; + } + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** diff --git a/src/main/java/com/nis/web/service/restful/JDBCTest.java b/src/main/java/com/nis/web/service/restful/JDBCTest.java index d851dc5..959de3c 100644 --- a/src/main/java/com/nis/web/service/restful/JDBCTest.java +++ b/src/main/java/com/nis/web/service/restful/JDBCTest.java @@ -35,7 +35,7 @@ public class JDBCTest { count++; Object[] obj = new Object[] { compile.getCompileId(), compile.getService(), compile.getAction(), compile.getContType(), compile.getAttrType(), compile.getContLabel(), compile.getTaskId(), - compile.getGuaranteeId(), compile.getAffAirId(), compile.getTopIcId(), compile.getDoBlackList(), + compile.getGuaranteeId(), compile.getAffairId(), compile.getTopicId(), compile.getDoBlacklist(), compile.getDoLog(), compile.getEffectiveRange(), compile.getActiveSys(), compile.getConfigPercent(), compile.getConfigOption(), compile.getStartTime(), compile.getEndTime(), compile.getUserRegion(), compile.getIsValid(), compile.getGroupNum(), compile.getFatherCfgId(), compile.getOpTime() }; diff --git a/src/main/java/com/nis/web/service/restful/JDBCThreadTest.java b/src/main/java/com/nis/web/service/restful/JDBCThreadTest.java index c5e26ea..62d1b98 100644 --- a/src/main/java/com/nis/web/service/restful/JDBCThreadTest.java +++ b/src/main/java/com/nis/web/service/restful/JDBCThreadTest.java @@ -181,8 +181,8 @@ public class JDBCThreadTest implements Runnable { count++; Object[] obj = new Object[] { compile.getCompileId(), compile.getService(), compile.getAction(), compile.getContType(), compile.getAttrType(), compile.getContLabel(), compile.getTaskId(), - compile.getGuaranteeId(), compile.getAffAirId(), compile.getTopIcId(), - compile.getDoBlackList(), compile.getDoLog(), compile.getEffectiveRange(), + compile.getGuaranteeId(), compile.getAffairId(), compile.getTopicId(), + compile.getDoBlacklist(), compile.getDoLog(), compile.getEffectiveRange(), compile.getActiveSys(), compile.getConfigPercent(), compile.getConfigOption(), compile.getStartTime(), compile.getEndTime(), compile.getUserRegion(), compile.getIsValid(), compile.getGroupNum(), compile.getFatherCfgId(), compile.getOpTime() }; diff --git a/src/main/java/com/nis/web/service/restful/SpringJDBCTest.java b/src/main/java/com/nis/web/service/restful/SpringJDBCTest.java index b129800..1736991 100644 --- a/src/main/java/com/nis/web/service/restful/SpringJDBCTest.java +++ b/src/main/java/com/nis/web/service/restful/SpringJDBCTest.java @@ -31,7 +31,7 @@ public class SpringJDBCTest { for (ConfigCompile compile : compileList) { bsu.update(new Object[] { compile.getCompileId(), compile.getService(), compile.getAction(), compile.getContType(), compile.getAttrType(), compile.getContLabel(), compile.getTaskId(), - compile.getGuaranteeId(), compile.getAffAirId(), compile.getTopIcId(), compile.getDoBlackList(), + compile.getGuaranteeId(), compile.getAffairId(), compile.getTopicId(), compile.getDoBlacklist(), compile.getDoLog(), compile.getEffectiveRange(), compile.getActiveSys(), compile.getConfigPercent(), compile.getConfigOption(), compile.getStartTime(), compile.getEndTime(), compile.getUserRegion(), compile.getIsValid(), compile.getGroupNum(), compile.getFatherCfgId(), compile.getOpTime() }); diff --git a/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest.java b/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest.java index 208ba8a..ce4aad7 100644 --- a/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest.java +++ b/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest.java @@ -155,7 +155,7 @@ public class SpringJDBCThreadTest implements Runnable { for (ConfigCompile compile : compileList) { bsu.update(new Object[] { compile.getCompileId(), compile.getService(), compile.getAction(), compile.getContType(), compile.getAttrType(), compile.getContLabel(), compile.getTaskId(), - compile.getGuaranteeId(), compile.getAffAirId(), compile.getTopIcId(), compile.getDoBlackList(), + compile.getGuaranteeId(), compile.getAffairId(), compile.getTopicId(), compile.getDoBlacklist(), compile.getDoLog(), compile.getEffectiveRange(), compile.getActiveSys(), compile.getConfigPercent(), compile.getConfigOption(), compile.getStartTime(), compile.getEndTime(), compile.getUserRegion(), compile.getIsValid(), compile.getGroupNum(), compile.getFatherCfgId(), compile.getOpTime() }); diff --git a/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest2.java b/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest2.java index 9266ce6..fb0f8d3 100644 --- a/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest2.java +++ b/src/main/java/com/nis/web/service/restful/SpringJDBCThreadTest2.java @@ -155,7 +155,7 @@ public class SpringJDBCThreadTest2 implements Runnable { for (ConfigCompile compile : compileList) { bsu.update(new Object[] { compile.getCompileId(), compile.getService(), compile.getAction(), compile.getContType(), compile.getAttrType(), compile.getContLabel(), compile.getTaskId(), - compile.getGuaranteeId(), compile.getAffAirId(), compile.getTopIcId(), compile.getDoBlackList(), + compile.getGuaranteeId(), compile.getAffairId(), compile.getTopicId(), compile.getDoBlacklist(), compile.getDoLog(), compile.getEffectiveRange(), compile.getActiveSys(), compile.getConfigPercent(), compile.getConfigOption(), compile.getStartTime(), compile.getEndTime(), compile.getUserRegion(), compile.getIsValid(), compile.getGroupNum(), compile.getFatherCfgId(), compile.getOpTime() }); diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml index 89a6e50..1cfd834 100644 --- a/src/main/resources/maatXml/maat.xml +++ b/src/main/resources/maatXml/maat.xml @@ -47,12 +47,12 @@ - EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] + EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] + [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] EFFECTIVE_RULE;:;{group_table_name};,;[group_id] - [group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time] + [group_id];\t;[compile_id];\t;[is_valid];\t;[op_time] EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id]