From 3643948e821b42145d0326dae0bbdd616343aa69 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 07 十一月 2022 14:26:52 +0800
Subject: [PATCH] #磅秤称重记录显示
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 2 +-
src/main/webapp/views/console.html | 26 +++++++++++++-------------
src/main/java/com/zy/core/cache/OutputQueue.java | 2 ++
src/main/java/com/zy/core/thread/ScaleThread.java | 12 ++++++++++++
4 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 8d65525..ea2657a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -295,7 +295,7 @@
@GetMapping("/barcode/output/site")
public R crnOutput(){
- ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.BARCODE);
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.SCALE);
jsonObjects.sort(new Comparator<JSONObject>() {
@Override
public int compare(JSONObject o1, JSONObject o2) {
diff --git a/src/main/java/com/zy/core/cache/OutputQueue.java b/src/main/java/com/zy/core/cache/OutputQueue.java
index 63205e7..6563854 100644
--- a/src/main/java/com/zy/core/cache/OutputQueue.java
+++ b/src/main/java/com/zy/core/cache/OutputQueue.java
@@ -15,4 +15,6 @@
public static ArrayBlockingQueue<String> DEVP = new ArrayBlockingQueue<>(32);
// 鏉＄爜鍣ㄨ緭鍑烘棩蹇�
public static ArrayBlockingQueue<JSONObject> BARCODE = new ArrayBlockingQueue<>(32);
+ // 纾呯Г杈撳嚭鏃ュ織
+ public static ArrayBlockingQueue<JSONObject> SCALE = new ArrayBlockingQueue<>(32);
}
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 30d695a..2c9a212 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -1,11 +1,14 @@
package com.zy.core.thread;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
+import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +19,7 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
+import java.util.Date;
/**
* 纾呯Г绾跨▼
@@ -57,6 +61,14 @@
if (null != basDevpService && !basDevpService.updateById(basDevp)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ jsonObject.put("id", staNo);
+ jsonObject.put("scale", scale);
+ if (OutputQueue.SCALE.size() >= 32) {
+ OutputQueue.SCALE.poll();
+ }
+ OutputQueue.SCALE.offer(jsonObject);
}
}
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index bc675bd..2bb3074 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -80,28 +80,28 @@
</div>
</div>
<div class="bar-code">
- <div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
+ <div class="body-head" id="code">纾呯Г</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode1" class="table-body">
+ <div id="scale1" class="table-body">
</div>
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode2" class="table-body">
+ <div id="scale2" class="table-body">
</div>
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>纾呯Г缂栧彿-纾呯Г閲嶉噺</span><span class="right">绉伴噸鏃堕棿</span></li>
</div>
- <div id="barcode3" class="table-body">
+ <div id="scale3" class="table-body">
</div>
</div>
@@ -370,16 +370,16 @@
}
function renderBarCode() {
for (var i = 0; i < tData1.length; i++) {
- var str1 = '<li><span>' + tData1[i].barcode + '</span><span class="right">' + tData1[i].time + '</span></li>'
- $('#barcode1').append(str1)
+ var str1 = '<li><span>' + tData1[i].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData1[i].time + '</span></li>'
+ $('#scale1').append(str1)
}
for (var j = 0; j < tData2.length; j++) {
- var str2 = '<li><span>' + tData2[j].barcode + '</span><span class="right">' + tData2[j].time + '</span></li>'
- $('#barcode2').append(str2)
+ var str2 = '<li><span>' + tData2[j].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData2[j].time + '</span></li>'
+ $('#scale2').append(str2)
}
for (var k = 0; k < tData3.length; k++) {
- var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
- $('#barcode3').append(str3)
+ var str3 = '<li><span>' + tData3[k].id +'-'+ tData1[i].scale +'kg'+ '</span><span class="right">' + tData3[k].time + '</span></li>'
+ $('#scale3').append(str3)
}
}
</script>
--
Gitblit v1.9.1