完成调试

zc

4 天以前 293c4c383056045ce4e86935d7179920db591256

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

@@ -1,12 +1,15 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -38,6 +41,17 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private LocDetlService locDetlService;

    @GetMapping(value = "/locDetl/pda/statisticalModel")
    public R statisticalModel() {
        //仓库数据
        EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
        locDetlEntityWrapper.setSqlSelect("matnr,count(*)as matnrCount").groupBy("matnr");
        List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
        return R.ok(selectMap);
    }

    /**
     * 获取当前时间
@@ -62,42 +76,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.getInStaArr()) {
                if (staNo.equals(sta)) {
                    ledId = led.getId();
                    break;
                }
            }
        }

        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double zSpeed = 0.0D;
@@ -139,7 +128,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(
@@ -227,6 +216,7 @@
    public R monitorLocRep(){
        List<Map<String, Object>> pie = new ArrayList<>();


        LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
        if(locUseRate!=null) {
            Map<String, Object> map = new HashMap<>();
@@ -250,6 +240,7 @@
            pie.add(map3);
        }


        // 总库位数
        Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
        // 使用中
@@ -260,12 +251,12 @@

        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", locUseRate.getOqty())
                        .add("noneCount", locUseRate.getXqty())
                        .add("total", total)
                        .add("used", used)
                        .add("usedPr", usedPr)
        );
    }

@@ -277,7 +268,7 @@
        String ledContent = "";
        List<LedCommand> commandList = null;
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
            if (slave.getInStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    ledContent = ledThread.getStringBuffer().toString();
@@ -295,7 +286,7 @@
    public R monitorLedError(@RequestParam("ledId") Integer ledId) {
        String errorMsg = "";
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
            if (slave.getInStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    errorMsg = ledThread.getErrorMsg().toString();