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/BasLocStsController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 2a40cc2..e1ced37 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.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.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basLocSts/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basLocStsService.selectById(id));
+ return R.ok(basLocStsService.getById(id));
}
@RequestMapping(value = "/basLocSts/list/auth")
@@ -38,13 +38,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basLocStsService.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)){
@@ -64,7 +64,7 @@
return R.error();
}
if (null == basLocSts.getLocSts()){
- basLocStsService.insert(basLocSts);
+ basLocStsService.save(basLocSts);
} else {
basLocStsService.updateById(basLocSts);
}
@@ -78,7 +78,7 @@
basLocSts.setModiTime(new Date());
basLocSts.setAppeUser(getUserId());
basLocSts.setAppeTime(new Date());
- basLocStsService.insert(basLocSts);
+ basLocStsService.save(basLocSts);
return R.ok();
}
@@ -102,7 +102,7 @@
return R.error();
}
for (BasLocSts entity : list){
- basLocStsService.delete(new EntityWrapper<>(entity));
+ basLocStsService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -111,19 +111,19 @@
@ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts"));
convert(map, wrapper);
- List<BasLocSts> list = basLocStsService.selectList(wrapper);
+ List<BasLocSts> list = basLocStsService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basLocStsQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<>();
wrapper.like("loc_desc", condition);
- Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasLocSts> page = basLocStsService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasLocSts basLocSts : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -137,8 +137,8 @@
@RequestMapping(value = "/basLocSts/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basLocStsService.selectOne(wrapper)){
+ QueryWrapper<BasLocSts> wrapper = new QueryWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basLocStsService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1