From 00577bcf63bbbe6e6b1636c5d7dad4910ae1d768 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 21 三月 2022 14:40:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 21 ++++++++++++---------
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 19 +++++++++++++++----
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 168562a..dd56b27 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,9 +1,11 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
@@ -292,15 +294,16 @@
@GetMapping("/barcode/output/site")
public R crnOutput(){
-// StringBuilder str = new StringBuilder();
-// String s;
-// int i = 0;
-// while((s = OutputQueue.CRN.poll()) != null && i <=32) {
-// str.append("\n").append(s);
-// i++;
-// }
-// return R.ok().add(str.toString());
- return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
+ jsonObjects.sort(new Comparator<JSONObject>() {
+ @Override
+ public int compare(JSONObject o1, JSONObject o2) {
+ Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ return (int) (o2Time.getTime() - o1Time.getTime());
+ }
+ });
+ return R.ok().add(JSON.toJSONString(jsonObjects));
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index ea48733..8c0b9e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -29,6 +29,6 @@
@Override
public int getOutToStn182(Integer devpNo) {
- return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12));
+ return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 460cfd6..9c10f69 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,11 +50,14 @@
add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
add(180);add(181);add(182);
- add(183);add(184);add(185);add(186);add(187);add(188);add(189);
- add(190);add(191);add(192);
+ add(183);add(184);add(185);add(186);add(187);add(188);add(189);add(190);add(191);add(192);
}};
public IoModeType ioMode = IoModeType.NONE;
+ /**
+ * 182绔欏爢鍨涙満鎵ц涓嚭搴撴暟閲�
+ */
+ public int PRE_COUNT=0;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -233,10 +236,18 @@
WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
if(null != wrkMastService){
int count = wrkMastService.getOutToStn182(182);
- OperateResult write = siemensS7Net.Write("DB200.2",(short)count);
+ if(count != PRE_COUNT){
+ OperateResult write = siemensS7Net.Write("DB300.2",(short)count);
+ if (write.IsSuccess) {
+ PRE_COUNT = count;
+ } else {
+ log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忛敊璇�,浠诲姟鏁伴噺==>>" + count);
+ }
+ }
}
}catch (Exception e) {
- log.error("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ e.printStackTrace();
+ log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忓け璐�");
}
} else {
--
Gitblit v1.9.1