pad编排接口:添加临时一次时如果执行时间在当前时间后6分5秒之后 当天执行 否则第二天执行
This commit is contained in:
parent
44b4628c54
commit
f4352f07b4
|
|
@ -10,6 +10,7 @@ import com.nu.modules.biz.plan.care.service.IDirectivePlanLogService;
|
||||||
import com.nu.modules.config.directivepackage.service.IDirectivePackageService;
|
import com.nu.modules.config.directivepackage.service.IDirectivePackageService;
|
||||||
import com.nu.modules.config.directivepackage.service.impl.DirectivePackageServiceImpl;
|
import com.nu.modules.config.directivepackage.service.impl.DirectivePackageServiceImpl;
|
||||||
import org.apache.commons.compress.utils.Lists;
|
import org.apache.commons.compress.utils.Lists;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
|
@ -136,7 +137,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
|
||||||
public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
|
public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
|
||||||
CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
|
CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
|
||||||
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
|
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
|
||||||
if ("5".equals(careDirectivePlan.getCycleType()) && "1".equals(careDirectivePlan.getOptCount())) {
|
if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
|
||||||
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
||||||
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
||||||
|
|
||||||
|
|
@ -237,7 +238,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
|
||||||
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
|
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
|
||||||
CareDirectivePlan entity = baseMapper.selectById(careDirectiveEntity.getId());
|
CareDirectivePlan entity = baseMapper.selectById(careDirectiveEntity.getId());
|
||||||
baseMapper.deleteByIdPhysic(careDirectiveEntity.getId());
|
baseMapper.deleteByIdPhysic(careDirectiveEntity.getId());
|
||||||
if ("5".equals(careDirectivePlan.getCycleType()) && "1".equals(careDirectivePlan.getOptCount())) {
|
if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
|
||||||
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
||||||
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue