From eb60587fd357e7af1b940f9764de336a65175eb4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 05 三月 2025 18:03:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/asrs/task/autoReportStartHandler.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/autoReportStartHandler.java b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
index aebe864..f07d897 100644
--- a/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
+++ b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
@@ -84,8 +84,8 @@
* @throws IOException
*/
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute() throws IOException {
- List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status",1).in("wrk_sts",12,3));
+ public synchronized void execute() throws IOException {
+ List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status",1).in("wrk_sts",12,13,3,4));
if(taskWrks.size()>0){
for(TaskWrk taskWrk:taskWrks){
if(Cools.isEmpty(taskWrk.getMarkStart())||taskWrk.getMarkStart()==0){
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index dd5d15a..7d0ce65 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -370,7 +370,7 @@
/**
* 鍐欏叆鏁版嵁
*/
- private boolean write5(CrnCommand command) throws InterruptedException {
+ private synchronized boolean write5(CrnCommand command) throws InterruptedException {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
if (null == command) {
--
Gitblit v1.9.1