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

修复ddos定时任务界面BUG；

Browse Source 
修复基础协议定时任务图标不显示bug；
所有业务增加定时任务逻辑
This commit is contained in:
duandongmei
2019-04-21 19:02:33 +08:00
parent 28f07f00f2
commit 97d1a52d3c
14 changed files with 408 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -172,6 +172,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
@@ -228,6 +230,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.saveAreaIpCfg(cfg);
}
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
@@ -276,6 +280,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
cfg.setTableName(AreaIpCfg.getTablename());
fileTransferCfgDao.updateCfgValid(cfg);
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
@@ -361,7 +367,10 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpRegionList=map.get("dstList");
}
}
if(isAudit!=1){
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
//构造提交综合服务参数格式，一条配置提交一次综合服务
if(isAudit==1){
maatCfg.initDefaultValue();
@@ -485,6 +494,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.saveAreaIpCfg(areaIpCfg);
}
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
@@ -553,6 +564,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.deleteAreaIpCfgByCfgId(areaIpCfg);
}
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
@@ -585,6 +598,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
,"cfgId"
});
areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
}
@@ -626,6 +641,10 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
if(isAudit!=1){
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
if(isAudit==1){
Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
@@ -775,6 +794,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
isValid=1;
}
entity.setIsValid(0);
entity.setIsAudit(0);
if(entity.getCfgId()==null){
Integer compileId = 0;
try {
@@ -833,6 +854,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.saveAreaIpCfg(cfg);
}
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
@@ -841,8 +864,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}else{
// 审核未通过状态的配置 修改后状态改为未审核
entity.setIsValid(0);
entity.setIsAudit(0);
entity.setEditTime(new Date());
entity.setEditorId(entity.getCurrentUser().getId());
fileTransferCfgDao.updateCfgIndex(entity);
@@ -899,6 +920,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.saveAreaIpCfg(cfg);
}
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
if(isValid==1) {
entity.setIsAudit(1);
@@ -955,6 +978,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
cfg.setTableName(AreaIpCfg.getTablename());
fileTransferCfgDao.updateCfgValid(cfg);
}
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
}
@@ -1041,7 +1066,10 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpRegionList=map.get("dstList");
}
}
if(isAudit!=1){
//处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity);
}
//构造提交综合服务参数格式，一条配置提交一次综合服务
if(isAudit==1){
maatCfg.initDefaultValue();