指令编排临时一次日期处理
This commit is contained in:
parent
f88e81caa8
commit
bd5ae95c8a
|
|
@ -9,6 +9,7 @@ import com.nu.modules.biz.plan.care.service.IDirectivePlanChangeStatusService;
|
||||||
import com.nu.modules.biz.plan.care.service.IDirectivePlanLogService;
|
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 lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.compress.utils.Lists;
|
import org.apache.commons.compress.utils.Lists;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
|
@ -26,6 +27,7 @@ import org.springframework.stereotype.Service;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
@ -36,6 +38,7 @@ import java.util.stream.Collectors;
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanMapper, CareDirectivePlan> implements ICareDirectivePlanService, ICareDirectivePlanApi {
|
public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanMapper, CareDirectivePlan> implements ICareDirectivePlanService, ICareDirectivePlanApi {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
@ -137,7 +140,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()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
|
if ("5".equals(careDirectivePlan.getCycleTypeId()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
|
||||||
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
||||||
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
||||||
|
|
||||||
|
|
@ -238,7 +241,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()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
|
if ("5".equals(careDirectivePlan.getCycleTypeId()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
|
||||||
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
//临时一次 需要处理 执行时间(定时更新快照任务处理的服务指令最近时间(目前是6分钟) + 5秒) 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
|
||||||
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
String startTime = careDirectivePlan.getStartTime(); // 格式:01:55
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue