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/WrkMastLogController.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 7e0bec4..f0238c8 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.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;
@@ -30,7 +30,7 @@
     @RequestMapping(value = "/wrkMastLog/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(wrkMastLogService.selectById(String.valueOf(id)));
+        return R.ok(wrkMastLogService.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/wrkMastLog/list/auth")
@@ -42,21 +42,21 @@
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
         excludeTrash(param);
-        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+        QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
         convert(param, wrapper);
         allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){
             if (orderByField.endsWith("$")){
                 orderByField = orderByField.substring(0, orderByField.length()-1);
             }
-            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+            wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
         }else {
-            wrapper.orderBy("modi_time", false);
+            wrapper.orderBy(true, false, "modi_time");
         }
-        return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
+        return R.ok(wrkMastLogService.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)){
@@ -76,7 +76,7 @@
     @RequestMapping(value = "/wrkMastLog/add/auth")
     @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ坊鍔�")
     public R add(WrkMastLog wrkMastLog) {
-        wrkMastLogService.insert(wrkMastLog);
+        wrkMastLogService.save(wrkMastLog);
         return R.ok();
     }
 
@@ -98,7 +98,7 @@
             return R.error();
         }
         for (WrkMastLog entity : list){
-            wrkMastLogService.delete(new EntityWrapper<>(entity));
+            wrkMastLogService.remove(new QueryWrapper<>(entity));
         }
         return R.ok();
     }
@@ -107,19 +107,19 @@
     @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
     public R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+        QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
         convert(map, wrapper);
-        List<WrkMastLog> list = wrkMastLogService.selectList(wrapper);
+        List<WrkMastLog> list = wrkMastLogService.list(wrapper);
         return R.ok(exportSupport(list, fields));
     }
 
     @RequestMapping(value = "/wrkMastLogQuery/auth")
     @ManagerAuth
     public R query(String condition) {
-        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+        QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<>();
         wrapper.like("id", condition);
-        Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
+        Page<WrkMastLog> page = wrkMastLogService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (WrkMastLog wrkMastLog : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
@@ -133,8 +133,8 @@
     @RequestMapping(value = "/wrkMastLog/check/column/auth")
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
-        Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != wrkMastLogService.selectOne(wrapper)){
+        QueryWrapper<WrkMastLog> wrapper = new QueryWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != wrkMastLogService.getOne(wrapper)){
             return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
         }
         return R.ok();

--
Gitblit v1.9.1