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/LocMastController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index f9d151f..4929264 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -3,9 +3,9 @@
import com.alibaba.fastjson.JSON;
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;
@@ -42,7 +42,7 @@
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(locMastService.selectById(String.valueOf(id)));
+ return R.ok(locMastService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/locMast/list/auth")
@@ -53,13 +53,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(locMastService.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)){
@@ -101,7 +101,7 @@
return R.error();
}
for (LocMast entity : list){
- locMastService.delete(new EntityWrapper<>(entity));
+ locMastService.remove(new QueryWrapper<>(entity));
}
return R.ok();
}
@@ -110,19 +110,19 @@
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
convert(map, wrapper);
- List<LocMast> list = locMastService.selectList(wrapper);
+ List<LocMast> list = locMastService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/locMastQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
wrapper.like("loc_no", condition);
- Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
+ Page<LocMast> page = locMastService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (LocMast locMast : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -136,8 +136,8 @@
@RequestMapping(value = "/locMast/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locMastService.selectOne(wrapper)){
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != locMastService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -147,7 +147,7 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
@Transactional
public R locMastInit(@RequestParam Integer lev) {
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ BasMap basMap = basMapService.getOne(new QueryWrapper<BasMap>().eq("lev", 1));
if (Cools.isEmpty(basMap)){
return R.error("璇峰厛鍒濆鍖栧湴鍥�");
}
@@ -170,12 +170,16 @@
initBay = 2;
}
+ int userConfigRow = -1;
int userConfirmBay = -1;
try {
- userConfirmBay = (int) Double.parseDouble(value);
+ String[] split = value.split("-");
+ userConfigRow = Integer.parseInt(split[0]);
+ userConfirmBay = Integer.parseInt(split[1]);
}catch (Exception e){}
if (userConfirmBay != -1) {
+ initRow = userConfigRow;
initBay = userConfirmBay;
}
@@ -196,7 +200,7 @@
}
}
- locMastService.delete(new EntityWrapper<LocMast>());
+ locMastService.remove(new QueryWrapper<LocMast>());
for (int i = 1; i <= lev; i++) {
int finalLev = i;
@@ -214,11 +218,12 @@
locMast.setLocType(Utils.getLocNo(mapX, mapY, finalLev));
locMast.setStatus(1);
locMast.setAppeTime(new Date());
- locMastService.insert(locMast);
+ locMastService.save(locMast);
});
}
redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
+ redisUtil.del(RedisKeyType.LOC_MAST_MAP_LIST.key);
return R.ok();
}
--
Gitblit v1.9.1