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

修复生效配置可添加定时任务

Browse Source
This commit is contained in:
wangxin
2019-07-25 16:34:40 +08:00
parent 0c639a2d30
commit 121fab31ea
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -190,13 +190,6 @@ public class ObjectGroupService extends BaseService {
logger.info("数据保存出错"); logger.info("数据保存出错");
throw e; throw e;
} }
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
auditPolicy(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
}
}else{ }else{
//处理公共分组 //处理公共分组
if(MapUtils.isNotEmpty(entity.getUserRegion())){ if(MapUtils.isNotEmpty(entity.getUserRegion())){
@@ -226,12 +219,6 @@ public class ObjectGroupService extends BaseService {
areaIpCfgDao.saveAreaIpCfg(cfg); areaIpCfgDao.saveAreaIpCfg(cfg);
} }
} }
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
auditPolicy(entity, entity.getIsAudit(), Constants.UPDATE_ACTION);
}
} }
//更新UD_FLAG //更新UD_FLAG
if(StringUtils.isNotBlank(oldCommonGroupIds)){ if(StringUtils.isNotBlank(oldCommonGroupIds)){
@@ -301,6 +288,17 @@ public class ObjectGroupService extends BaseService {
} }
//处理定时任务 //处理定时任务
handelScheduleCfg(entity, entity.getIndexTable(), entity); handelScheduleCfg(entity, entity.getIndexTable(), entity);
//修复已经生效的配置添加定时任务
if(isValid==1) {
entity.setIsAudit(1);
entity.setIsValid(1);
if(entity.getCfgId()==null){
auditPolicy(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
}else{
auditPolicy(entity, entity.getIsAudit(), Constants.UPDATE_ACTION);
}
}
} }
public CfgIndexInfo getObjGroupPolicyWithoutSubCfg(Long cfgId){ public CfgIndexInfo getObjGroupPolicyWithoutSubCfg(Long cfgId){
CfgIndexInfo entity = commonPolicyDao.getPolicyById(cfgId); CfgIndexInfo entity = commonPolicyDao.getPolicyById(cfgId);