From b579fe0be3bd02ec39d612a62b23901fb852c173 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 八月 2025 09:02:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 27 +++++++++++++++++++++++++++
src/main/webapp/views/console.html | 26 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 21b61cb..5c51081 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -19,6 +20,8 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
@@ -35,6 +38,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -60,6 +65,10 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private CommonService commonService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -90,6 +99,24 @@
/************************** 瀹炴椂鏁版嵁 ******************************/
/****************************************************************/
+ @PostMapping("/devpTaskCount")
+ @ManagerAuth(memo = "杈撻�佺嚎浠诲姟鏁伴噺")
+ public R devpTaskCount(){
+ int devpTaskStackOver = 20;
+ Config config = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "devpTaskStackOver"));
+ if (config != null) {
+ devpTaskStackOver = Integer.parseInt(config.getValue());
+ }
+
+ Integer devpWorkingCount = commonService.queryDevpWorkingCount();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("devpTaskStackOver", devpTaskStackOver);
+ map.put("devpWorkingCount", devpWorkingCount);
+ return R.ok().add(map);
+ }
+
@PostMapping("/latest/data/site")
@ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
public R siteLatestData(){
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 90df0d3..da67c0f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -70,6 +70,10 @@
<span>杩愯緭绾挎�绘暟</span>
<span id="line-total" class="line-ss"></span>
</div>
+ <div class="state states">
+ <span>杈撻�佺嚎浠诲姟杩囪浇 <span id="devpTaskStackOver"></span></span>
+ <span id="devpWorkingCount" class="line-ss"></span>
+ </div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
<span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
@@ -461,12 +465,14 @@
getSitesInfo();
getCrnInfo();
getSystemRunningStatus();
+ getDevpTaskCount();
getBarcodeInfo();
getScaleInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
+ getDevpTaskCount();
getBarcodeInfo();
getScaleInfo();
}, 1000);
@@ -550,6 +556,26 @@
});
}
+ function getDevpTaskCount() {
+ $.ajax({
+ url: baseUrl + "/console/devpTaskCount",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ let devpTaskStackOver = res.data.devpTaskStackOver
+ let devpWorkingCount = res.data.devpWorkingCount
+ $("#devpTaskStackOver").html(devpTaskStackOver);
+ $("#devpWorkingCount").html(devpWorkingCount);
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ }
+
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
function getSitesInfo() {
$.ajax({
--
Gitblit v1.9.1