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

1、删除无用测试类；

Browse Source 
2、修改maat与非maat配置下发接口，支持多service同时下发；
3、新增摘要获取接口
This commit is contained in:
zhangdongxu
2018-06-01 10:23:18 +08:00
parent bc600c12a4
commit cdc72ca655
27 changed files with 436 additions and 2492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/web/controller/restful/ConfigTestController.java
View File

@@ -577,28 +577,28 @@ public class ConfigTestController extends BaseRestController {
System.out.println("compileId--------------------------" + compileId);
ConfigCompileTest configCompile = new ConfigCompileTest();
configCompile.setCompileId(compileId);
configCompile.setService(serviceType);
// configCompile.setService(serviceType);
configCompile.setAction(action);
configCompile.setContType(0);
configCompile.setAttrType(0);
// configCompile.setContType(0);
// configCompile.setAttrType(0);
configCompile.setContLabel("0");
configCompile.setTaskId(0);
configCompile.setGuaranteeId(0);
// configCompile.setGuaranteeId(0);
configCompile.setAffairId(0);
configCompile.setTopicId(0);
configCompile.setDoBlacklist(0l);
// configCompile.setTopicId(0);
// configCompile.setDoBlacklist(0l);
configCompile.setDoLog(0);
configCompile.setEffectiveRange("0");
configCompile.setConfigPercent(100l);
configCompile.setConfigOption(1);
// configCompile.setConfigPercent(100l);
// configCompile.setConfigOption(1);
configCompile.setStartTime(sdf.parse(startTime));
configCompile.setEndTime(sdf.parse(endTime));
// configCompile.setStartTime(startTime);
// configCompile.setEndTime(endTime);
configCompile.setActiveSys(0);
configCompile.setLastUpdate(date);
configCompile.setProcSeq(compileId);
// configCompile.setActiveSys(0);
// configCompile.setLastUpdate(date);
// configCompile.setProcSeq(compileId);
configCompile.setUserRegion("0");
configCompile.setIsValid(1);
configCompile.setGroupNum(1);
@@ -634,7 +634,7 @@ public class ConfigTestController extends BaseRestController {
List<ConfigGroupRelation> groupRelationList = new ArrayList<ConfigGroupRelation>();
ConfigGroupRelation configGroupRelation = new ConfigGroupRelation();
configGroupRelation.setGroupId(groupId);
configGroupRelation.setId(groupId);
// configGroupRelation.setId(groupId);
configGroupRelation.setCompileId(compileId);
configGroupRelation.setIsValid(1);
configGroupRelation.setOpTime(date);