art: 技术状态鉴定工单-生成逻辑优化

zhangherong

2 天以前 8904f9e6005e7e1f3cc06f415fdcde0033c32332

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnicalStatusEvaluationGenerateJob.java

@@ -2,11 +2,13 @@

import cn.hutool.core.collection.CollectionUtil;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
@@ -21,7 +23,6 @@
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.util.Date;
@@ -44,9 +45,10 @@
    private ISysQuartzLogService sysQuartzLogService;
    @Autowired
    private IQuartzJobService quartzJobService;
    @Autowired
    private IEamEquipmentExtendService equipmentExtendService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        //任务日志
        SysQuartzLog quartzLog = new SysQuartzLog();
@@ -127,7 +129,7 @@
            }
        }
        quartzLog.setIsSuccess(0);
        if(failCount.get() > 0) {
        if (failCount.get() > 0) {
            quartzLog.setIsSuccess(-1);
        }
        sb.append("技术状态鉴定工单生成：【成功：").append(successCount.get()).append("，失败：").append(failCount.get()).append("】");
@@ -141,10 +143,10 @@
        LocalDate nextTechnologyCheckDate = DateUtils.dateToLocalDate(equipment.getNextTechnologyCheck());
        LocalDate generateDate = nextTechnologyCheckDate.minusDays(orderPreGenerationDays);
        LocalDate lockDate = nextTechnologyCheckDate.minusDays(orderPreLockDays);
        if (LocalDate.now().equals(generateDate)) {
        if (!LocalDate.now().isBefore(generateDate) && !CommonConstant.STATUS_1.equals(equipment.getTechnologyGenerateFlag())) {
            //计算当天需要生成
            EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(equipment.getId());
            if(standard == null) {
            if (standard == null) {
                log.warn("设备：{}，未配置技术状态鉴定规范，无法生成技术鉴定工单！日期：{}", equipment.getEquipmentCode(), DateUtils.date2Str(DateUtils.date_sdf.get()));
                failCount.incrementAndGet();
                sb.append("设备：").append(equipment.getEquipmentCode()).append("，未配置技术状态鉴定规范，无法生成技术鉴定工单！");
@@ -160,10 +162,12 @@
            try {
                evaluationOrderService.addTechnicalStatusEvaluationOrder(request);
                successCount.incrementAndGet();
                //更新扩展表中的生成标识
                equipmentExtendService.updateTechnologyParam(equipment.getId(), null, null, CommonConstant.STATUS_1);
            } catch (Exception e) {
                log.error("生成技术状态鉴定工单失败，原因：{}", e.getMessage(), e);
                log.error("设备：{}，生成技术状态鉴定工单失败，原因：{}", equipment.getEquipmentCode(), e.getMessage(), e);
                failCount.incrementAndGet();
                sb.append("生成技术状态鉴定工单失败，原因：").append(e.getMessage()).append("！");
                sb.append("设备：").append(equipment.getEquipmentCode()).append("，生成技术状态鉴定工单失败，原因：").append(e.getMessage()).append("！");
            }
        }
    }