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

diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java b/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java
index be40340..72ffa87 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpOptController.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.BasCrnpOpt;
 import com.zy.asrs.service.BasCrnpOptService;
@@ -27,7 +27,7 @@
     @RequestMapping(value = "/basCrnpOpt/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(basCrnpOptService.selectById(String.valueOf(id)));
+        return R.ok(basCrnpOptService.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/basCrnpOpt/list/auth")
@@ -38,15 +38,16 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
-        EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+        QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
         allLike(BasCrnpOpt.class, param.keySet(), wrapper, condition);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        return R.ok(basCrnpOptService.selectPage(new Page<>(curr, limit), wrapper));
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+        wrapper.orderBy(true, false, "send_time");
+        return R.ok(basCrnpOptService.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 +63,7 @@
     @RequestMapping(value = "/basCrnpOpt/add/auth")
     @ManagerAuth
     public R add(BasCrnpOpt basCrnpOpt) {
-        basCrnpOptService.insert(basCrnpOpt);
+        basCrnpOptService.save(basCrnpOpt);
         return R.ok();
     }
 
@@ -80,7 +81,7 @@
     @ManagerAuth
     public R delete(@RequestParam(value="ids[]") Integer[] ids){
         for (Integer id : ids) {
-            basCrnpOptService.deleteById(id);
+            basCrnpOptService.removeById(id);
         }
         return R.ok();
     }
@@ -88,20 +89,20 @@
     @RequestMapping(value = "/basCrnpOpt/export/auth")
     @ManagerAuth
     public R export(@RequestBody JSONObject param){
-        EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+        QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnpOpt"));
         convert(map, wrapper);
-        List<BasCrnpOpt> list = basCrnpOptService.selectList(wrapper);
+        List<BasCrnpOpt> list = basCrnpOptService.list(wrapper);
         return R.ok(exportSupport(list, fields));
     }
 
     @RequestMapping(value = "/basCrnpOptQuery/auth")
     @ManagerAuth
     public R query(String condition) {
-        EntityWrapper<BasCrnpOpt> wrapper = new EntityWrapper<>();
+        QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<>();
         wrapper.like("id", condition);
-        Page<BasCrnpOpt> page = basCrnpOptService.selectPage(new Page<>(0, 10), wrapper);
+        Page<BasCrnpOpt> page = basCrnpOptService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (BasCrnpOpt basCrnpOpt : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
@@ -115,8 +116,8 @@
     @RequestMapping(value = "/basCrnpOpt/check/column/auth")
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
-        Wrapper<BasCrnpOpt> wrapper = new EntityWrapper<BasCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != basCrnpOptService.selectOne(wrapper)){
+        QueryWrapper<BasCrnpOpt> wrapper = new QueryWrapper<BasCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != basCrnpOptService.getOne(wrapper)){
             return R.parse(BaseRes.REPEAT).add(getComment(BasCrnpOpt.class, String.valueOf(param.get("key"))));
         }
         return R.ok();

--
Gitblit v1.9.1