#

luxiaotao1123

2020-11-17 90ffa7515c367e9be9a2c41e954757898ad2df94

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

@@ -6,9 +6,14 @@
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
@@ -41,6 +46,39 @@
                .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
                .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)) , 2))
                .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK)-1])
        );
    }

    /**
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        if (null != crnId) {
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
            if (crnThread != null) {
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                if (crnProtocol != null) {
                    xSpeed = Double.valueOf(crnProtocol.getXSpeed());
                    ySpeed = Double.valueOf(crnProtocol.getYSpeed());
                }
            }
        }

        xSpeed = Double.valueOf(new Random().nextInt(10));
        ySpeed = Double.valueOf(new Random().nextInt(10));

        int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
        int totalLoc = reportQueryMapper.getTotalLocByCrnId();

        return R.ok(
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
                .add("totalLoc", totalLoc)  // 总库位数
                .add("totalWrk", totalWrk)    // 总任务数

        );
    }

@@ -88,12 +126,22 @@
            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)
        );
    }