diff --git a/modules/common/common.iml b/modules/common/common.iml
deleted file mode 100644
index 1daccae..0000000
--- a/modules/common/common.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/common/target/common-1.0.0.jar b/modules/common/target/common-1.0.0.jar
index a49f390..9f7e55b 100644
Binary files a/modules/common/target/common-1.0.0.jar and b/modules/common/target/common-1.0.0.jar differ
diff --git a/modules/common/target/maven-archiver/pom.properties b/modules/common/target/maven-archiver/pom.properties
index 721b4ec..482ee6e 100644
--- a/modules/common/target/maven-archiver/pom.properties
+++ b/modules/common/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Fri Jan 23 15:42:05 CST 2026
+#Fri Jan 23 19:11:12 CST 2026
groupId=com.zhehekeji
artifactId=common
version=1.0.0
diff --git a/modules/filter/filter.iml b/modules/filter/filter.iml
deleted file mode 100644
index 1daccae..0000000
--- a/modules/filter/filter.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/filter/target/filter-1.0.0.jar b/modules/filter/target/filter-1.0.0.jar
index d1356ce..a014d29 100644
Binary files a/modules/filter/target/filter-1.0.0.jar and b/modules/filter/target/filter-1.0.0.jar differ
diff --git a/web/duoji.iml b/web/duoji.iml
deleted file mode 100644
index 1daccae..0000000
--- a/web/duoji.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java
index 0f72ef9..c752ff4 100644
--- a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java
@@ -57,7 +57,7 @@ public class EmptyCheckService {
key+="C2";
}
Street street = getStreet(transmission);
- plcConnectionExample.writePlcDataTaskId(key + "-out", PLCConnectionExample.taskMap.get(key));
+ plcConnectionExample.writePlcDataTaskId(key + "-out");
if(street!= null){
Order order = orderMapper.getOneByStreetId(street.getId());
transmission.setUrl(transmission.getUrl().replace("E:","").replace("D:",""));
diff --git a/web/src/main/java/com/zhehekeji/web/service/cron/PLCConnectionExample.java b/web/src/main/java/com/zhehekeji/web/service/cron/PLCConnectionExample.java
index c3ce8be..d3ae6d6 100644
--- a/web/src/main/java/com/zhehekeji/web/service/cron/PLCConnectionExample.java
+++ b/web/src/main/java/com/zhehekeji/web/service/cron/PLCConnectionExample.java
@@ -247,6 +247,13 @@ public class PLCConnectionExample {
// 顶部拍照触发任务号
plcService.action(plcId, 4, i);
}
+ try {
+ Thread.sleep(1000);
+
+ writePlcDataTaskId(key+"-out");
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
@@ -264,6 +271,7 @@ public class PLCConnectionExample {
log.info("任务号变化" + key + ":" + i);
taskMap.put(key, i);
+ taskMap.put(key+"-out", i);
String plcId = key.split("-")[0];
executorService.submit(() -> processKey(i, plcId, key));
@@ -311,6 +319,17 @@ public class PLCConnectionExample {
}
return 0;
}
+ public synchronized boolean writePlcDataTaskId(String key){
+ int value = taskMap.get(key + "-out");
+ if (value == 0) {
+// 已经写入完成
+ return false;
+ } else {
+ writePlcDataTaskId(key, value);
+ taskMap.put(key, 0);
+ }
+ return true;
+ }
public boolean writePlcDataTaskId(String key,int value){