#
luxiaotao1123
2020-07-07 7d77a74eb0c5d7931bdfd9f61935689176e8819a
#
2个文件已添加
3 文件已重命名
5个文件已修改
86 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/task/AbstractHandler.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/PlcLogScheduler.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/WorkLogScheduler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/WorkMastScheduler.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/core/AsrsException.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/core/ReturnT.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -1,5 +1,8 @@
package com.zy.asrs.task;
import com.zy.asrs.task.core.AsrsException;
import com.zy.asrs.task.core.ReturnT;
import java.text.MessageFormat;
/**
src/main/java/com/zy/asrs/task/PlcLogScheduler.java
New file
@@ -0,0 +1,30 @@
package com.zy.asrs.task;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.PlcLogHandler;
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;
/**
 * Created by vincent on 2020/7/7
 */
@Component
public class PlcLogScheduler {
    private static final Logger log = LoggerFactory.getLogger(PlcLogScheduler.class);
    @Autowired
    private PlcLogHandler plcLogHandler;
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        ReturnT<String> returnT = plcLogHandler.start();
        if (!returnT.isSuccess()) {
            log.error( returnT.getMsg());
        }
    }
}
src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,17 +2,17 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
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;
/**
 * Created by vincent on 2020/7/7
 */
@Component
//@Component
public class WorkLogScheduler {
    private static final Logger log = LoggerFactory.getLogger(WorkLogScheduler.class);
src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -2,6 +2,7 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
src/main/java/com/zy/asrs/task/core/AsrsException.java
File was renamed from src/main/java/com/zy/asrs/task/AsrsException.java
@@ -1,4 +1,4 @@
package com.zy.asrs.task;
package com.zy.asrs.task.core;
/**
 * Created by vincent on 2020/7/7
src/main/java/com/zy/asrs/task/core/ReturnT.java
File was renamed from src/main/java/com/zy/asrs/task/ReturnT.java
@@ -1,4 +1,4 @@
package com.zy.asrs.task;
package com.zy.asrs.task.core;
import java.io.Serializable;
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
File was renamed from src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -1,4 +1,4 @@
package com.zy.asrs.task;
package com.zy.asrs.task.core;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
New file
@@ -0,0 +1,38 @@
package com.zy.asrs.task.handler;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
 * Created by vincent on 2020/7/7
 */
@Service
public class PlcLogHandler extends AbstractHandler<String> {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public ReturnT<String> start() {
        try {
            int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
            if (updateCount > 0) {
                int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
                if (deleteCount <= 0) {
                    exceptionHandle("堆垛机&PLC命令转历史档错误 ! ");
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }
}
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -8,7 +8,7 @@
import com.zy.asrs.service.WrkMastLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ReturnT;
import com.zy.asrs.task.core.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -4,7 +4,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.ReturnT;
import com.zy.asrs.task.core.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;