From 72c49f3afa22c4f84760d57001e45a4fadf2d482 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 09:32:33 +0800
Subject: [PATCH] #升级JDK17
---
src/main/java/com/zy/asrs/controller/OpenController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 41b3835..3b5f9d6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-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;
@@ -26,8 +26,8 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
@@ -156,15 +156,15 @@
public R getLedInfos(HttpServletRequest request) {
HashMap<String, Object> map = new HashMap<>();
String remoteAddr = request.getRemoteAddr();
- TvDevice tvDevice = tvDeviceService.selectOne(
- new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
+ TvDevice tvDevice = tvDeviceService.getOne(
+ new QueryWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice == null) {
return R.error("鏈壘鍒癐P瀵瑰簲鐨勭數瑙嗘満璁惧: " + remoteAddr);
}
map.put("deviceName", tvDevice.getName());
List<BasStationTv> relations = basStationTvService
- .selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
+ .list(new QueryWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations == null || relations.isEmpty()) {
map.put("data", new ArrayList<>());
return R.ok().add(map);
@@ -236,11 +236,11 @@
}
String remoteAddr = request.getRemoteAddr();
- TvDevice tvDevice = tvDeviceService.selectOne(
- new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
+ TvDevice tvDevice = tvDeviceService.getOne(
+ new QueryWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice != null) {
List<BasStationTv> relations = basStationTvService
- .selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
+ .list(new QueryWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations != null && !relations.isEmpty()) {
for (BasStationTv relation : relations) {
WcsStationDto wcsStationDto = stationUtils.stationMap.get(relation.getStationId());
@@ -297,11 +297,11 @@
@GetMapping("/announcement")
public R top5(){
- EntityWrapper<Announcement> wrapper = new EntityWrapper<>();
+ QueryWrapper<Announcement> wrapper = new QueryWrapper<>();
wrapper.eq("status", 1);
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy(true, false, "create_time");
wrapper.last("limit 5");
- return R.ok(announcementService.selectList(wrapper));
+ return R.ok(announcementService.list(wrapper));
}
/**
--
Gitblit v1.9.1