#

1

9 天以前 6fcad8a10aab91b9a0825b0465b7e21d37df2332

 src/main/java/com/zy/asrs/controller/MonitorController.java

@@ -62,42 +62,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 +114,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(
@@ -220,14 +195,18 @@
    }


    /**
     * 库位使用情况统计
     */


    @GetMapping("/loc/rep")
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();


        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
        Integer used = locUseRate.getFqty() + locUseRate.getUqty();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
            map.put("name", "在库");
@@ -236,7 +215,7 @@

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

            Map<String, Object> map2 = new HashMap<>();
@@ -250,65 +229,77 @@
            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 usedDivides = Arith.divides(3, used, 11200);
        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)
                        .add("stockCunt", locUseRate.getFqty())
                        .add("emptyCount", 11200-used)
                        .add("noneCount", locUseRate.getXqty())
                        .add("total", 11200)
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
    }


    /**
     * 库位使用情况统计
     */
//    @GetMapping("/loc/rep")
//    public R monitorLocRep(){
//        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);
//
//            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> 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)
//        );
//    }

    /**
     * 获取其他信息
     */
    @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 +319,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)) {