#

luxiaotao1123

2020-11-17 90ffa7515c367e9be9a2c41e954757898ad2df94

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

@@ -6,6 +6,10 @@
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;
@@ -50,12 +54,32 @@
     */
    @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("year", calendar.get(Calendar.YEAR))
        ).add(crnId);
                Cools.add("xSpeed", xSpeed) // 行走速度
                .add("ySpeed", ySpeed)  // 升降速度
                .add("totalLoc", totalLoc)  // 总库位数
                .add("totalWrk", totalWrk)    // 总任务数

        );
    }

    /**