#

yxFwq

2024-07-20 5751b1892a26df14007984776d9ebca4d3272786

#

 src/main/java/com/zy/asrs/entity/BasJarMastLog.java

@@ -141,6 +141,23 @@

    public BasJarMastLog() {}

    public BasJarMastLog(BasJarMast basJarMast) {
        this.wrkNo = basJarMast.getWrkNo();
        this.enterStaNo = basJarMast.getEnterStaNo();
        this.outStaNo = basJarMast.getOutStaNo();
        this.jarEnterStaNo = basJarMast.getJarEnterStaNo();
        this.jarOutStaNo = basJarMast.getJarOutStaNo();
        this.jarId = basJarMast.getJarId();
        this.jarRegin = basJarMast.getJarRegin();
        this.status = basJarMast.getStatus();
        this.enterSteNo = basJarMast.getEnterSteNo();
        this.outSteId = basJarMast.getOutSteId();
        this.enterRgvId = basJarMast.getEnterRgvId();
        this.outRgvId = basJarMast.getOutRgvId();
        this.ioTime = basJarMast.getIoTime();
        this.modiTime = basJarMast.getModiTime();
        this.appeTime = basJarMast.getAppeTime();
    }
    public BasJarMastLog(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer enterSteNo,Integer outSteId,Integer enterRgvId,Integer outRgvId,Date ioTime,Date modiTime,Date appeTime) {
        this.wrkNo = wrkNo;
        this.enterStaNo = enterStaNo;
@@ -208,4 +225,6 @@
    }




}

 src/main/java/com/zy/asrs/task/WrkMastExecuteScheduler.java

@@ -1,11 +1,16 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.BasJarMast;
import com.zy.asrs.service.BasJarMastService;
import com.zy.asrs.task.handler.WrkMastExecuteHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;


/**
@@ -22,6 +27,7 @@
    @Autowired
    private WrkMastExecuteHandler wrkMastExecuteHandler;
    @Autowired
    private BasJarMastService basJarMastService;



@@ -36,4 +42,16 @@
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeJarMast(){
        List<BasJarMast> basJarMastList = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("status", 17));
        for (BasJarMast basJarMast : basJarMastList){
            try{
                wrkMastExecuteHandler.start2(basJarMast);
            } catch (Exception e){
                log.error("硫化罐任务转历史档案失败！！！");
            }
        }
    }

}

 src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java

@@ -3,8 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasJarMast;
import com.zy.asrs.entity.BasJarMastLog;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.WrkMastExecuteLog;
import com.zy.asrs.service.BasJarMastLogService;
import com.zy.asrs.service.BasJarMastService;
import com.zy.asrs.service.WrkMastExecuteLogService;
import com.zy.asrs.service.WrkMastExecuteService;
import com.zy.asrs.task.AbstractHandler;
@@ -27,6 +31,10 @@
    private WrkMastExecuteService wrkMastExecuteService;
    @Autowired
    private WrkMastExecuteLogService wrkMastExecuteLogService;
    @Autowired
    private BasJarMastService basJarMastService;
    @Autowired
    private BasJarMastLogService basJarMastLogService;

    public ReturnT<String> start(int[] excute) {
        try {
@@ -48,4 +56,23 @@
        }
        return SUCCESS;
    }
    public ReturnT<String> start2(BasJarMast basJarMast) {
        try {
            if (!Cools.isEmpty(basJarMast)){
                BasJarMastLog basJarMastLog = new BasJarMastLog(basJarMast);
                //保存历史档案
                if (!basJarMastLogService.insert(basJarMastLog)){
                    log.error("保存硫化罐区域任务basJarMast历史档[workNo={"+ JSON.toJSONString(basJarMast) +"}]失败");
                }
                //删除工作档案
                if (!basJarMastService.deleteById(basJarMast)){
                    log.error("删除硫化罐区域basJarMast任务[workNo={"+JSON.toJSONString(basJarMast)+"}]失败");
                }
            }
        }catch (Exception e){
            log.error("异常！！！"+e);
            return FAIL;
        }
        return SUCCESS;
    }
}