#

Junjie

2025-08-16 b579fe0be3bd02ec39d612a62b23901fb852c173

#

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

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