统一去读取数据

modules/common/common.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>

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

modules/filter/filter.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>

web/duoji.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-</module>

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:",""));

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){