From 2d2fd991826837d7189cc488aee6f309a6f5e216 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 22:48:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index f0e15a4..9f258f4 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -50,7 +50,7 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable() {
List<CrnStateTableVo> list = new ArrayList<>();
- List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderBy(true, true, "crn_no"));
for (BasCrnp basCrnp : crnps) {
// 琛ㄦ牸琛�
CrnStateTableVo vo = new CrnStateTableVo();
@@ -74,13 +74,13 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos() == 1 ? "涓嶅湪瀹氫綅" : "鍦ㄥ畾浣�");
- vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
- vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
- vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
- vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
- vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
- vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
- vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ vo.setXspeed(String.format("%.2f", crnProtocol.getXSpeed())); // 璧拌閫熷害锛坢/min)
+ vo.setYspeed(String.format("%.2f", crnProtocol.getYSpeed())); // 鍗囬檷閫熷害锛坢/min)
+ vo.setZspeed(String.format("%.2f", crnProtocol.getZSpeed())); // 鍙夌墮閫熷害锛坢/min)
+ vo.setXdistance(String.format("%.2f", crnProtocol.getXDistance())); // 璧拌璺濈(Km)
+ vo.setYdistance(String.format("%.2f", crnProtocol.getYDistance())); // 鍗囬檷璺濈(Km)
+ vo.setXduration(String.format("%.2f", crnProtocol.getXDuration())); // 璧拌鏃堕暱(H)
+ vo.setYduration(String.format("%.2f", crnProtocol.getYDuration())); // 鍗囬檷鏃堕暱(H)
vo.setTaskReceive(crnProtocol.getTaskReceive());
if (crnProtocol.getModeType().equals(CrnModeType.AUTO)) {
@@ -88,7 +88,7 @@
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo())); // 婧愮珯
vo.setStaNo(String.valueOf(wrkMast.getStaNo())); // 鐩爣绔�
@@ -100,7 +100,7 @@
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
- BasCrnpErr crnError = basCrnpErrService.selectById(crnProtocol.getAlarm());
+ BasCrnpErr crnError = basCrnpErrService.getById(crnProtocol.getAlarm());
vo.setAlarm(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
vo.setDeviceStatus("ERROR");
}
@@ -173,7 +173,7 @@
return R.error("绾跨▼涓嶅瓨鍦�");
}
- CrnCommand command = crnThread.getResetCommand(crnNo);
+ CrnCommand command = crnThread.getResetCommand(9999, crnNo);
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
return R.ok();
}
--
Gitblit v1.9.1