pang.jiabao
2025-04-14 13f3721a678782cfa042acca5208644e8f32dcfb
src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.model.annotations.RateLimit;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -62,42 +63,17 @@
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
        switch (ledId){
            case 101:
                ledId=1;
                break;
            case 109:
                ledId=2;
                break;
            case 117:
                ledId=3;
                break;
            case 126:
                ledId=4;
                break;
            case 134:
                ledId=5;
                break;
            case 201:
                ledId=6;
                break;
            case 205:
                ledId=7;
                break;
            case 207:
                ledId=8;
                break;
            case 211:
                ledId=9;
                break;
            case 213:
                ledId=10;
                break;
            case 217:
                ledId=11;
                break;
    public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
        Integer ledId = 0;
        for (LedSlave led : slaveProperties.getLed()) {
            for (Integer staNo : led.getStaArr()) {
                if (staNo.equals(sta)) {
                    ledId = led.getId();
                    break;
                }
            }
        }
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
@@ -139,7 +115,7 @@
        // 获取输送线plc线程
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
        String ledContent = ledThread.getWorkNos().toString();
        String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";
        return R.ok(
@@ -159,6 +135,7 @@
    /**
     * 入库报表 -- 折线图
     */
    @RateLimit(2)
    @GetMapping("/pakin/rep")
    public R monitorPakinRep(){
        // 入库
@@ -205,12 +182,12 @@
                }
            }
            AxisBean inqty = new AxisBean();
            inqty.setName("入库数量");
            inqty.setName("Количество поступающих товаров");
            Integer[] array1 = new Integer[data1.size()];
            inqty.setData(data1.toArray(array1));
            list.add(inqty);
            AxisBean outqty = new AxisBean();
            outqty.setName("出库数量");
            outqty.setName("Количество исходящих товаров");
            Integer[] array2 = new Integer[data2.size()];
            outqty.setData(data2.toArray(array2));
            list.add(outqty);
@@ -223,6 +200,7 @@
    /**
     * 库位使用情况统计
     */
    @RateLimit(2)
    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();
@@ -230,22 +208,22 @@
        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
            map.put("name", "На складе");
            map.put("value", locUseRate.getFqty());
            pie.add(map);
            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空");
            map1.put("name", "Пустые места");
            map1.put("value", locUseRate.getOqty());
            pie.add(map1);
            Map<String, Object> map2 = new HashMap<>();
            map2.put("name", "使用");
            map2.put("name", "Использовать");
            map2.put("value", locUseRate.getUqty());
            pie.add(map2);
            Map<String, Object> map3 = new HashMap<>();
            map3.put("name", "禁用");
            map3.put("name", "Заблокировано");
            map3.put("value", locUseRate.getXqty());
            pie.add(map3);
        }
@@ -274,41 +252,6 @@
     */
    @GetMapping("/led")
    public R monitorLed(@RequestParam("ledId") Integer ledId) {
        switch (ledId){
            case 101:
                ledId=1;
                break;
            case 109:
                ledId=2;
                break;
            case 117:
                ledId=3;
                break;
            case 126:
                ledId=4;
                break;
            case 134:
                ledId=5;
                break;
            case 201:
                ledId=6;
                break;
            case 205:
                ledId=7;
                break;
            case 207:
                ledId=8;
                break;
            case 211:
                ledId=9;
                break;
            case 213:
                ledId=10;
                break;
            case 217:
                ledId=11;
                break;
        }
        String ledContent = "";
        List<LedCommand> commandList = null;
        for (LedSlave slave : slaveProperties.getLed()) {
@@ -328,41 +271,6 @@
     */
    @GetMapping("/led/error")
    public R monitorLedError(@RequestParam("ledId") Integer ledId) {
        switch (ledId){
            case 101:
                ledId=1;
                break;
            case 109:
                ledId=2;
                break;
            case 117:
                ledId=3;
                break;
            case 126:
                ledId=4;
                break;
            case 134:
                ledId=5;
                break;
            case 201:
                ledId=6;
                break;
            case 205:
                ledId=7;
                break;
            case 207:
                ledId=8;
                break;
            case 211:
                ledId=9;
                break;
            case 213:
                ledId=10;
                break;
            case 217:
                ledId=11;
                break;
        }
        String errorMsg = "";
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {