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/resources/templates/Controller.txt |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/Controller.txt b/src/main/resources/templates/Controller.txt
index 682fcbc..abf4d8f 100644
--- a/src/main/resources/templates/Controller.txt
+++ b/src/main/resources/templates/Controller.txt
@@ -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.core.domain.KeyValueVo;
 import @{COMPANYNAME}.entity.@{ENTITYNAME};
@@ -28,7 +28,7 @@
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {
-        return R.ok(@{SIMPLEENTITYNAME}Service.selectById(String.valueOf(id)));
+        return R.ok(@{SIMPLEENTITYNAME}Service.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}/list/auth")
@@ -39,15 +39,15 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
-        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+        QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
         allLike(@{ENTITYNAME}.class, param.keySet(), wrapper, condition);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        return R.ok(@{SIMPLEENTITYNAME}Service.selectPage(new Page<>(curr, limit), wrapper));
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+        return R.ok(@{SIMPLEENTITYNAME}Service.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)){
@@ -63,7 +63,7 @@
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}/add/auth")
     @ManagerAuth
     public R add(@{ENTITYNAME} @{SIMPLEENTITYNAME}) {
-        @{SIMPLEENTITYNAME}Service.insert(@{SIMPLEENTITYNAME});
+        @{SIMPLEENTITYNAME}Service.save(@{SIMPLEENTITYNAME});
         return R.ok();
     }
 
@@ -81,7 +81,7 @@
     @ManagerAuth
     public R delete(@RequestParam(value="ids[]") @{PRIMARYKEYTYPE}[] ids){
          for (@{PRIMARYKEYTYPE} id : ids){
-            @{SIMPLEENTITYNAME}Service.deleteById(id);
+            @{SIMPLEENTITYNAME}Service.removeById(id);
         }
         return R.ok();
     }
@@ -89,20 +89,20 @@
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}/export/auth")
     @ManagerAuth
     public R export(@RequestBody JSONObject param){
-        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+        QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         Map<String, Object> map = excludeTrash(param.getJSONObject("@{SIMPLEENTITYNAME}"));
         convert(map, wrapper);
-        List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.selectList(wrapper);
+        List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.list(wrapper);
         return R.ok(exportSupport(list, fields));
     }
 
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}Query/auth")
     @ManagerAuth
     public R query(String condition) {
-        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+        QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
         wrapper.like("@{MAJORCOLUMN}", condition);
-        Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(0, 10), wrapper);
+        Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (@{ENTITYNAME} @{SIMPLEENTITYNAME} : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
@@ -117,11 +117,11 @@
     @ManagerAuth
     public R getDataKV(@RequestParam(required = false) String condition) {
         List<KeyValueVo> vos = new ArrayList<>();
-        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
+        QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<>();
         if (!Cools.isEmpty(condition)) {
             wrapper.like("@{MAJORCOLUMN}", condition);
         }
-        @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(1, 30), wrapper).getRecords()
+        @{SIMPLEENTITYNAME}Service.page(new Page<>(1, 30), wrapper).getRecords()
                 .forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{UPCASEMARJORCOLUMN}()), item.get@{PRIMARYKEYCOLUMN}())));
         return R.ok().add(vos);
     }
@@ -129,8 +129,8 @@
     @RequestMapping(value = "/@{SIMPLEENTITYNAME}/check/column/auth")
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
-        Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != @{SIMPLEENTITYNAME}Service.selectOne(wrapper)){
+        QueryWrapper<@{ENTITYNAME}> wrapper = new QueryWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != @{SIMPLEENTITYNAME}Service.getOne(wrapper)){
             return R.parse(BaseRes.REPEAT).add(getComment(@{ENTITYNAME}.class, String.valueOf(param.get("key"))));
         }
         return R.ok();

--
Gitblit v1.9.1