#

whycq

2024-05-05 544556b5ea62dba4a002118088e82bce81cd63b4

 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.MatDto;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -161,6 +162,7 @@
                }
            }
        }

        return R.ok().add(errorMsg);
    }

@@ -214,48 +216,53 @@
     */
    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();
        try{
            List<Map<String, Object>> pie = new ArrayList<>();

        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
            map.put("value", locUseRate.getFqty());
            pie.add(map);
            LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
            if(locUseRate!=null) {
                Map<String, Object> map = new HashMap<>();
                map.put("name", "在库");
                map.put("value", locUseRate.getFqty());
                pie.add(map);

            Map<String, Object> map1 = new HashMap<>();
            map1.put("name", "空");
            map1.put("value", locUseRate.getOqty());
            pie.add(map1);
                Map<String, Object> map1 = new HashMap<>();
                map1.put("name", "空");
                map1.put("value", locUseRate.getOqty());
                pie.add(map1);

            Map<String, Object> map2 = new HashMap<>();
            map2.put("name", "使用");
            map2.put("value", locUseRate.getUqty());
            pie.add(map2);
                Map<String, Object> map2 = new HashMap<>();
                map2.put("name", "使用");
                map2.put("value", locUseRate.getUqty());
                pie.add(map2);

            Map<String, Object> map3 = new HashMap<>();
            map3.put("name", "禁用");
            map3.put("value", locUseRate.getXqty());
            pie.add(map3);
                Map<String, Object> map3 = new HashMap<>();
                map3.put("name", "禁用");
                map3.put("value", locUseRate.getXqty());
                pie.add(map3);
            }

            // 总库位数
            Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
            // 使用中
            Integer used = locUseRate.getFqty() + locUseRate.getUqty();
            // 库位使用率
            double usedDivides = Arith.divides(3, used, total);
            double usedPr = Arith.multiplys(1, usedDivides, 100);

            return R.ok(
                    Cools.add("pie", pie)
                            .add("stockCunt", locUseRate.getFqty())
                            .add("emptyCount", locUseRate.getOqty())
                            .add("noneCount", locUseRate.getXqty())
                            .add("total", total)
                            .add("used", used)
                            .add("usedPr", usedPr)
            );
        }catch (Exception e){
            System.out.println("/loc/rep异常"+e);
            return R.error();
        }

        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
        Integer used = locUseRate.getFqty() + locUseRate.getUqty();
        // 库位使用率
        double usedDivides = Arith.divides(3, used, total);
        double usedPr = Arith.multiplys(1, usedDivides, 100);

        return R.ok(
                Cools.add("pie", pie)
                        .add("stockCunt", locUseRate.getFqty())
                        .add("emptyCount", locUseRate.getOqty())
                        .add("noneCount", locUseRate.getXqty())
                        .add("total", total)
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
    }

    /**
@@ -274,6 +281,24 @@
                }
            }
        }
//        MatDto matDto = new MatDto();
//        matDto.setMatNo("1111");
//        matDto.setCount(100.0);
//        matDto.setMaknx("测试用料");
//        LedCommand ledCommand = new LedCommand();
//        ledCommand.setStaNo(8);
//        ledCommand.setTitle("入库启动");
//        ledCommand.setLocNo("0100101");
//        ledCommand.setWorkNo(9998);
//        ledCommand.setEmptyMk(false);
//        ledCommand.setIoType(1);
//        ledCommand.setSourceStaNo(15);
//        ArrayList<MatDto> matDtos = new ArrayList<>();
//        matDtos.add(matDto);
//        ledCommand.setMatDtos(matDtos);
//        ArrayList<LedCommand> ledCommands = new ArrayList<>();
//        ledCommands.add(ledCommand);
//        return R.ok(ledCommands);
        return R.ok().add(commandList);
    }
    /**
@@ -320,9 +345,7 @@
            }
        }

        // 获取输送线plc线程
        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
        String ledContent = ledThread.getStringBuffer().toString();

//        ledContent = "ask的模块萨满大算了萨满大了\n 是窘境到埃及嗲家嗲\n 萨达姆打开萨满大凯撒麦当劳萨满大老师";

        return R.ok(
@@ -334,8 +357,6 @@
                        .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1))   // 累计升降距离km
                        .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1))    // 累计走行时长h
                        .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1))    // 累计升降时长h
                        .add("isShow", !Cools.isEmpty(ledContent)) // 是否显示内容
                        .add("content", ledContent) // 显示内容
        );
    }