From 302819d76c8b9d393110784326f3ffab587293da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 26 Jan 2026 14:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8E=BB=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/common/common.iml | 8 -------- modules/common/target/common-1.0.0.jar | Bin 19368 -> 19369 bytes .../target/maven-archiver/pom.properties | 2 +- modules/filter/filter.iml | 8 -------- modules/filter/target/filter-1.0.0.jar | Bin 11388 -> 11388 bytes web/duoji.iml | 8 -------- .../web/service/EmptyCheckService.java | 2 +- .../service/cron/PLCConnectionExample.java | 19 ++++++++++++++++++ 8 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 modules/common/common.iml delete mode 100644 modules/filter/filter.iml delete mode 100644 web/duoji.iml 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 a49f390a7048480dbf3d8938e60d2316a5b598cc..9f7e55b7ccd8577aedf9a6dbda2d78a8481bfd48 100644 GIT binary patch delta 1038 zcmZ8fZAep57(VxG&P}h=+-&~1&XphK6t=l+IlEJwbGk){5h3^y7%J9KP)H4bh|rG& zVLOQ}Dlo(fg1`+S2vLc`pu#9ZA@ENSNyg}xW!U?km2-`|`*5E3InVpt_ne2*!lP+H zZ1O9VX#{`W;hx>2nHgH$-WvoqqRNNl2fXZR$)BZRT?&>fh_O(h!%8*ZA615L4mWW>#`^SU+=r zqdgkeJI-?~J$*^Q7(uxdVNtF`*pX{!Y${Ual9Xy}x|K1y$vSE;s-w~J6Yw;%m$he5 znB%TU42Yd`S3*xV>6Q+^fcbUy1uRW|f$A0Uc|vK)EeT)PCwCrh-gQeaJ zmFhZ)dU=IC@o3m+ort~@z>de+rMg^n*Z^h)8L2GcpoW8Uv{qjoiM|pDSym8Y=EoU- z&5r$yTa?ipcEuy2&4@>$q7s8ZyAo`*0nE0FGp1A{+pgyUs_G@WtLAKf{V~*qfw83j z)rl;SuIF0(IH-KoLPcWQOf9?Z6-{`Po?W>7>j8|TA(xQjNwHRSC=Thl7QG*OCAwe) zvV?v2^8UYpu@`X9-U6=6N6*EDZ#^q1gba&>6eoEWv;Kw(-uLc}%As2n?zD;!Tau>C z$_+cM1|AY;x6v_lXaMfmR}CRWNn)Lyi)$JUn6RZ$qN@&MLZ@`No5$&h#n$s+@`Vto zG--b#J;0HKtL-zk|tu7FnnZ=)(|L-#Qf>Qwg<@=6=%#NL9ZGMkR?MCtsSAi_I delta 995 zcmY*XZAep57(VCjw)Sz|mfz5I)BK<|%eiGM+g00jo8D_+9}fA2e`|v*ZeV+HZ?>z&(xW5+* z)vAU!AbQE69wArn3wdharZiqY(No;CC%@zIZN=TLJdaE?o|Xhy&ScN*_$OfpG%(AWF!0U6S&gD**$LuT^}p6cEwO&chVSvy%>nmwzfwad;k z-0u9!d~ELFrG8Hh!+dW8CVdc=92A~OJ1ERaW!$m7L*5dR*U_O350wj0@2l5s9dQ*# zT+SL8_f^rxRJmw%cd%b(>TX#~eHmQ?=8`oltAzMm2J%US zDk~RpfKh{fJ)AEWXx}wLUSy;tAi(P-a;jY9MlrMnMMt%|GDAl^Jhi1~&JDl92#snG zvd8?JzOKK-g+=W2i=2^%UH&u}^lzd=rU)~mWsD`jewQ~Oa`U=nMu1RYJ?*9=hYY;jsAe0y9mkVtbMbxjqLgXAyrfhJg(IlBP$z)x} zx^}YXA9{pxAF33&aSvm!SK64oZg%!#23czk8SaRa+q~fQZVoF< zX;MUd2^@-*CQ%iUi%2jbWx*B2z-(faC?{H2(Bk5Z1a)d2ISc|heDIw}3rYxM2d8Rg ctE9*9IFYoF+ZB}})Yr8ej;Ma^TA7mn0fGz?RR910 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 d1356cef97efcb7378e28be39c10c4bbe3e640ce..a014d29b4785d894c1e73600986c84fa638f1cc4 100644 GIT binary patch delta 358 zcmewp@h5^Oz?+#xgn@yBgCS$)M4s(TK=P<6Q~Jz_Zxn#!WIjeM5M{+^2%>TsEkM+L zM)k@1>g-(1EL=dH3=Ci)GmwlplQPhR$u>;dAS#o|5=1RwasbM0e#Ufz4MZQ{T*wHb zleu%4LG(pFR(245Lv%M-e5!a46Ns-YFyBLJjqrbaY~`lb;EqWme~E_=>{8!KESz< z5kx0*=P-lli+rr?Ao_;rZm{@N@g61+Us=ivOy|o?V`WlloXoBi%#<3mIYwzNNOV&E(NbtX^0f;hGvjS1MYK|akgPI43`laRup=2hX z8btk3_XJVy8UY|>Gc}??)HjVV5ap+t1)_FohJz?!ttb$cuN4BKj%tBbDrpCUTv@K| P1a#%(-P&N4B03oWC%SL4 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){