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/BasRgvController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvController.java b/src/main/java/com/zy/asrs/controller/BasRgvController.java
index d4d684e..aeb1d71 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasRgvService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basRgv/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basRgvService.selectById(String.valueOf(id)));
+ return R.ok(basRgvService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basRgv/list/auth")
@@ -38,15 +38,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgv.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basRgvService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basRgvService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -62,7 +62,7 @@
@RequestMapping(value = "/basRgv/add/auth")
@ManagerAuth
public R add(BasRgv basRgv) {
- basRgvService.insert(basRgv);
+ basRgvService.save(basRgv);
return R.ok();
}
@@ -80,7 +80,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basRgvService.deleteById(id);
+ basRgvService.removeById(id);
}
return R.ok();
}
@@ -88,20 +88,20 @@
@RequestMapping(value = "/basRgv/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basRgv"));
convert(map, wrapper);
- List<BasRgv> list = basRgvService.selectList(wrapper);
+ List<BasRgv> list = basRgvService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basRgvQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasRgv> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<>();
wrapper.like("rgv_no", condition);
- Page<BasRgv> page = basRgvService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasRgv> page = basRgvService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasRgv basRgv : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -115,8 +115,8 @@
@RequestMapping(value = "/basRgv/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasRgv> wrapper = new EntityWrapper<BasRgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basRgvService.selectOne(wrapper)){
+ QueryWrapper<BasRgv> wrapper = new QueryWrapper<BasRgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basRgvService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasRgv.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1