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

修改配置测试程序支持新增的业务

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-09-13 18:26:59 +08:00
parent bbfc850b83
commit 22f9ce00fb
7 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/restful/MaatTestController.java
View File

@@ -564,7 +564,7 @@ public class MaatTestController {
jsonString.append("1");
} else if (srcName.toLowerCase().equals("isvalid")) {
jsonString.append("1");
} else if (srcName.toLowerCase().equals("cfgid")) {
} else if (srcName.toLowerCase().equals("cfgid")||srcName.toLowerCase().equals("keyringid")||srcName.toLowerCase().equals("fileid")) {
Long incrId = configRedisService.getIncrId("seq_compileid");
compileIdList.add(incrId);
jsonString.append(incrId);

4
src/main/java/com/nis/web/dao/NtcReportDao.xml
View File

@@ -108,10 +108,10 @@
<![CDATA[AND SERVICE in (${searchService})]]>
</if>
<if test="searchReportStartTime != null and searchReportStartTime !=''">
<![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]>
<![CDATA[AND REPORT_TIME > STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s')]]>
</if>
<if test="searchReportEndTime != null and searchReportEndTime !=''">
<![CDATA[AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
<![CDATA[AND REPORT_TIME <= STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
</if>
</where>
<choose>

10
src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java
View File

@@ -433,7 +433,7 @@ public class MaatTestServiceimpl {
}
}
key = keyBF.toString().toUpperCase();
String[] valSplit = maatXmlExpr.getValueExpression().replace(";&nbsp;0;\\n", "").replace("\\t", "")
String[] valSplit = maatXmlExpr.getValueExpression().replace(";&nbsp;0;\\n", "").replace(";&nbsp", "\\t").replace("\\n", "").replace("\\t", "")
.split(";");
for (String valStr : valSplit) {
if (valStr != null && !valStr.trim().equals("")) {
@@ -446,6 +446,14 @@ public class MaatTestServiceimpl {
}
}
String val = JedisUtils.get(key, redisDb).replace(" ", "\t");
FileUtils.addStrToFile("\t\t入库的key=" + key + "\n", Configurations.getStringProperty("maatTestLogPath", ""),
true);
FileUtils.addStrToFile("\t\t入库的val=" + val, Configurations.getStringProperty("maatTestLogPath", ""),
true);
FileUtils.addStrToFile("\t\t表达式" + maatXmlExpr.getValueExpression() + "\n",
Configurations.getStringProperty("maatTestLogPath", ""), true);
valArr = val.split("\\t");
break;
}

2
src/main/java/com/nis/web/task/SyncRedisToCluster.java
View File

@@ -39,7 +39,7 @@ public class SyncRedisToCluster {
// private JedisSentinelPool jedisSentinelPool;
// @Scheduled(cron = "0/3 * * * * ?")
@Scheduled(cron = "${syncRedisToClusterCron}")
//@Scheduled(cron = "${syncRedisToClusterCron}")
public void syncRedisToCluster() {
try {
// keys("EFFECTIVE_RULE*");