#

luxiaotao1123

2020-11-17 ebcaed76a00f824e57ccd7e2c38efe725e160374

 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.*;
@@ -45,6 +50,51 @@
    }

    /**
     * 获取其他信息
     */
    @GetMapping("/other")
    public R monitorOther(@RequestParam("crnId") Integer crnId) {
        Double xSpeed = 0.0D;
        Double ySpeed = 0.0D;
        Double xDistance = 0.0D;
        Double yDistance = 0.0D;
        Double xDuration = 0.0D;
        Double yDuration = 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());
                    xDistance = Double.valueOf(crnProtocol.getXDistance());
                    yDistance = Double.valueOf(crnProtocol.getYDistance());
                    xDuration = Double.valueOf(crnProtocol.getXDuration());
                    yDuration = Double.valueOf(crnProtocol.getYDuration());
                }
            }
        }

        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)    // 总任务数
                .add("xDistance", xDistance)    // 累计走行距离km
                .add("yDistance", yDistance)    // 累计升降距离km
                .add("xDuration", xDuration)    // 累计走行时长h
                .add("yDuration", yDuration)    // 累计升降时长h
        );
    }

    /**
     * 入库报表 -- 折线图
     */
    @GetMapping("/pakin/rep")