From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/asrs/controller/RgvController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index cd2a285..9ccdb5e 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.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;
@@ -42,7 +42,7 @@
@ManagerAuth(memo = "RGV淇℃伅琛�")
public R rgvStateTable() {
List<RgvStateTableVo> list = new ArrayList<>();
- List<BasRgv> rgvs = basRgvService.selectList(new EntityWrapper<BasRgv>().orderBy("rgv_no"));
+ List<BasRgv> rgvs = basRgvService.list(new QueryWrapper<BasRgv>().orderBy(true, true, "rgv_no"));
for (BasRgv basRgv : rgvs) {
RgvStateTableVo vo = new RgvStateTableVo();
vo.setRgvNo(basRgv.getRgvNo());
@@ -79,7 +79,7 @@
vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
- BasRgvErr err = basRgvErrService.selectById(rgvProtocol.getAlarm());
+ BasRgvErr err = basRgvErrService.getById(rgvProtocol.getAlarm());
vo.setAlarm(err == null ? "鏈煡寮傚父" : err.getErrName());
vo.setDeviceStatus("ERROR");
}
--
Gitblit v1.9.1