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/CrnController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index ba23d00..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();
@@ -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");
}
--
Gitblit v1.9.1