#

zjj

2025-04-03 785af73325fe0cd928a7e059f4bf010dc7bdf25f

#

 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,16 @@
    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("model,COUNT(*) as modelCount").groupBy("model");
        List<Map<String, Object>>  selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
        return R.ok(selectMap);
    }

    /**
     * 获取当前时间

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -107,10 +107,10 @@
        int row = getRow(shallowLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        int targetRow;
        if (remainder == 2) {
            targetRow = row - 1;
        } else if (remainder == 3) {
        if (remainder == 0  ) {
            targetRow = row + 1;
        } else if (remainder == 3) {
            targetRow = row - 1;
        } else {
            throw new RuntimeException(shallowLoc + "不是浅库位，系统繁忙");
        }