更新mybatis-plus 版本为2.2.1 支持全局逻辑删除（但这个版本似乎没有编译对）

重要更新：BaseMapper中的方法无需手动写入sql即可使用。

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDicServiceImpl.kt

@@ -47,7 +47,6 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
         if (cached != null) {
             return cached
         }
-//        val ret = baseMapper.selectByParams(null)
         val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
             RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
@@ -56,13 +55,6 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
     }
 
     override fun getList(enable: Boolean?): MutableList<SysDic> {
-//        return if (enable != null) {
-//            baseMapper.selectByParams(mutableMapOf(
-//                    "enable" to enable
-//            ))
-//        } else {
-//            baseMapper.selectByParams(null)
-//        }
         return if (enable != null) {
             baseMapper.selectWOLogic(EntityWrapper<SysDic>().eq("enable", enable))
         } else {
@@ -95,18 +87,16 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService, C
     }
 
     override fun getOneByKey(key: String, value: String?, sort: Int?): SysDic? {
-//        val result = baseMapper.selectByParams(mutableMapOf(
-//                "key" to key,
-//                "value" to value!!,
-//                "sort" to sort!!,
-//                "enable" to true
-//        ))
-
-        val result = baseMapper.selectWOLogic(EntityWrapper<SysDic>()
-                .eq("key", key)
-                .eq("value", value!!)
-                .eq("sort", sort!!)
-                .eq("enable", true))
+        val result = baseMapper.selectWOLogic(EntityWrapper<SysDic>().apply {
+            eq("key", key)
+            if (value.isNullOrEmpty()) {
+                eq("value", value!!)
+            }
+            if (sort != null) {
+                eq("sort", sort)
+            }
+            eq("enable", true)
+        })
         return if (result.size > 0) {
             result.filter {
                 it.sort == sort && it.value == value

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysParamServiceImpl.kt

@@ -47,7 +47,6 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
         if (cached != null) {
             return cached
         }
-//        val ret = baseMapper.selectByParams(null)
         val ret = baseMapper.selectWOLogic(null)
         if (PlatformUtil.getPlatform(platformProperties) == PLATFORM.SYSTEM) {
             RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, ret)
@@ -56,13 +55,6 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     override fun getList(enable: Boolean?): MutableList<SysParam> {
-//        return if (enable != null) {
-//            baseMapper.selectByParams(mutableMapOf(
-//                    "enable" to enable
-//            ))
-//        } else {
-//            baseMapper.selectByParams(null)
-//        }
         return if (enable != null) {
             baseMapper.selectWOLogic(EntityWrapper<SysParam>().eq("enable", enable))
         } else {
@@ -95,17 +87,16 @@ class SysParamServiceImpl : ServiceImpl<SysParamMapper, SysParam>(), ISysParamSe
     }
 
     override fun getOneByKey(key: String, value: String?, sort: Int?): SysParam? {
-//        val result = baseMapper.selectByParams(mutableMapOf(
-//                "key" to key,
-//                "value" to value!!,
-//                "sort" to sort!!,
-//                "enable" to true
-//        ))
-        val result = baseMapper.selectWOLogic(EntityWrapper<SysParam>()
-                .eq("key", key)
-                .eq("value", value!!)
-                .eq("sort", sort!!)
-                .eq("enable", true))
+        val result = baseMapper.selectWOLogic(EntityWrapper<SysParam>().apply {
+            eq("key", key)
+            if (value.isNullOrEmpty()) {
+                eq("value", value!!)
+            }
+            if (sort != null) {
+                eq("sort", sort)
+            }
+            eq("enable", true)
+        })
         return if (result.size > 0) {
             result.filter {
                 it.sort == sort && it.value == value

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysRoleServiceImpl.kt

@@ -23,42 +23,36 @@ import org.springframework.stereotype.Service
 class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleService {
 
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
-        val wrapper = EntityWrapper<SysRole>()
-                .eq("name", name)
-                .eq("code", code?.toUpperCase())
-        if (enable != null) {
-            wrapper.eq("enable", enable)
+        val wrapper = EntityWrapper<SysRole>().apply {
+            if (!name.isNullOrEmpty()) {
+                eq("name", name)
+            }
+            if (!code.isNullOrEmpty()) {
+                eq("code", code?.toUpperCase())
+            }
+            if (enable != null) {
+                eq("enable", enable)
+            }
         }
-        return baseMapper.selectWOLogic(wrapper)
-//        val params: LinkedHashMap<String, Any?> = linkedMapOf(
-//                "name" to name,
-//                "code" to code?.toUpperCase()
-//        )
-//        if (enable != null) {
-//            params["enable"] = enable
-//        }
-//        return baseMapper.selectByParams(params)
 
+        return baseMapper.selectWOLogic(wrapper)
     }
 
     override fun getListByParamPage(name: String?, code: String?, enable: Boolean?, current: Int, size: Int): Page<SysRole> {
         val page = Page<SysRole>(current, size)
 
-        val wrapper = EntityWrapper<SysRole>()
-                .eq("name", name)
-                .eq("code", code?.toUpperCase())
-        if (enable != null) {
-            wrapper.eq("enable", enable)
+        val wrapper = EntityWrapper<SysRole>().apply {
+            if (!name.isNullOrEmpty()) {
+                eq("name", name)
+            }
+            if (!code.isNullOrEmpty()) {
+                eq("code", code?.toUpperCase())
+            }
+            if (enable != null) {
+                eq("enable", enable)
+            }
         }
         page.records = baseMapper.selectWOLogicPage(page, wrapper)
-//        val params: LinkedHashMap<String, Any?> = linkedMapOf(
-//                "name" to name,
-//                "code" to code?.toUpperCase()
-//        )
-//        if (enable != null) {
-//            params["enable"] = enable
-//        }
-//        page.records = baseMapper.selectByParamsPage(page, params)
         return page
     }
 

zen-api/src/main/resources/mapping/sys/SysDicMapper.xml

@@ -17,97 +17,4 @@
         <result column="sort" property="sort"/>
     </resultMap>
 
-    <sql id="dynamicSqlWhere">
-        <where>
-            <if test="p != null">
-                <if test="p.enable != null">
-                    <choose>
-                        <when test="p.enable == true">
-                            AND enable = 1
-                        </when>
-                        <otherwise>
-                            AND enable = 0
-                        </otherwise>
-                    </choose>
-                </if>
-                <if test="p.key != null">
-                    AND `key` = #{p.key}
-                </if>
-                <if test="p.value != null">
-                    AND `value` = #{p.value}
-                </if>
-                <if test="p.sort != null">
-                    AND sort = #{p.sort}
-                </if>
-                <if test="p.id != null">
-                    AND id = #{p.id}
-                </if>
-            </if>
-        </where>
-    </sql>
-
-    <sql id="dynamicSqlSet">
-        <set>
-            <if test="et.key != null">
-                `key` = #{et.key},
-            </if>
-            <if test="et.value != null">
-                `value` = #{et.value},
-            </if>
-            <if test="et.label != null">
-                `label` = #{et.label},
-            </if>
-            <if test="et.sort != null">
-                sort = #{et.sort},
-            </if>
-            <if test="et.createTime != null">
-                create_time = #{et.createTime},
-            </if>
-            <if test="et.createBy != null">
-                create_by = #{et.createBy},
-            </if>
-            <if test="et.updateTime != null">
-                update_time = #{et.updateTime},
-            </if>
-            <if test="et.updateBy != null">
-                update_by = #{et.updateBy},
-            </if>
-            <if test="et.remark != null">
-                remark = #{et.remark},
-            </if>
-            <if test="et.enable != null">
-                <choose>
-                    <when test="et.enable == true">
-                        `enable` = 1
-                    </when>
-                    <otherwise>
-                        `enable` = 0
-                    </otherwise>
-                </choose>
-            </if>
-        </set>
-    </sql>
-
-    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysDic">
-        SELECT *
-        FROM sys_dic
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id,sort
-    </select>
-
-    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysDic">
-        UPDATE sys_dic
-        <include refid="dynamicSqlSet"/>
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </update>
-
-    <delete id="physicalDelete">
-        DELETE FROM sys_dic
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </delete>
-
 </mapper>

zen-api/src/main/resources/mapping/sys/SysParamMapper.xml

@@ -17,105 +17,4 @@
         <result column="sort" property="sort"/>
     </resultMap>
 
-    <sql id="dynamicSqlWhere">
-        <where>
-            <if test="p != null">
-                <if test="p.enable != null">
-                    <choose>
-                        <when test="p.enable == true">
-                            AND enable = 1
-                        </when>
-                        <otherwise>
-                            AND enable = 0
-                        </otherwise>
-                    </choose>
-                </if>
-                <if test="p.key != null">
-                    AND `key` = #{p.key}
-                </if>
-                <if test="p.value != null">
-                    AND `value` = #{p.value}
-                </if>
-                <if test="p.sort != null">
-                    AND sort = #{p.sort}
-                </if>
-                <if test="p.id != null">
-                    AND id = #{p.id}
-                </if>
-            </if>
-        </where>
-    </sql>
-
-    <sql id="dynamicSqlSet">
-        <set>
-            <if test="et.key != null">
-                `key` = #{et.key},
-            </if>
-            <if test="et.value != null">
-                `value` = #{et.value},
-            </if>
-            <if test="et.label != null">
-                `label` = #{et.label},
-            </if>
-            <if test="et.sort != null">
-                sort = #{et.sort},
-            </if>
-            <if test="et.createTime != null">
-                create_time = #{et.createTime},
-            </if>
-            <if test="et.createBy != null">
-                create_by = #{et.createBy},
-            </if>
-            <if test="et.updateTime != null">
-                update_time = #{et.updateTime},
-            </if>
-            <if test="et.updateBy != null">
-                update_by = #{et.updateBy},
-            </if>
-            <if test="et.remark != null">
-                remark = #{et.remark},
-            </if>
-            <if test="et.enable != null">
-                <choose>
-                    <when test="et.enable == true">
-                        `enable` = 1
-                    </when>
-                    <otherwise>
-                        `enable` = 0
-                    </otherwise>
-                </choose>
-            </if>
-        </set>
-    </sql>
-
-    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysParam">
-        SELECT *
-        FROM sys_param
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id,sort
-    </select>
-
-    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysParam">
-        SELECT *
-        FROM sys_param
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id,sort
-    </select>
-
-    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysParam">
-        UPDATE sys_param
-        <include refid="dynamicSqlSet"/>
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </update>
-
-    <delete id="physicalDelete">
-        DELETE FROM sys_param
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </delete>
-
-
 </mapper>

zen-api/src/main/resources/mapping/sys/SysRoleMapper.xml

@@ -16,98 +16,4 @@
         <result column="perms" property="perms"/>
     </resultMap>
 
-    <sql id="dynamicSqlWhere">
-        <where>
-            <if test="p != null">
-                <if test="p.enable != null">
-                    <choose>
-                        <when test="p.enable == true">
-                            AND enable = 1
-                        </when>
-                        <otherwise>
-                            AND enable = 0
-                        </otherwise>
-                    </choose>
-                </if>
-                <if test="p.name != null">
-                    AND `name` LIKE CONCAT('%', #{p.name}, '%')
-                </if>
-                <if test="p.code != null">
-                    AND code LIKE CONCAT('%', #{p.code}, '%')
-                </if>
-                <if test="p.id != null">
-                    AND id = #{p.id}
-                </if>
-            </if>
-        </where>
-    </sql>
-
-    <sql id="dynamicSqlSet">
-        <set>
-            <if test="et.name != null">
-                `name` = #{et.name},
-            </if>
-            <if test="et.code != null">
-                code = #{et.code},
-            </if>
-            <if test="et.perms != null">
-                perms = #{et.perms},
-            </if>
-            <if test="et.createTime != null">
-                create_time = #{et.createTime},
-            </if>
-            <if test="et.createBy != null">
-                create_by = #{et.createBy},
-            </if>
-            <if test="et.updateTime != null">
-                update_time = #{et.updateTime},
-            </if>
-            <if test="et.updateBy != null">
-                update_by = #{et.updateBy},
-            </if>
-            <if test="et.remark != null">
-                remark = #{et.remark},
-            </if>
-            <if test="et.enable != null">
-                <choose>
-                    <when test="et.enable == true">
-                        `enable` = 1
-                    </when>
-                    <otherwise>
-                        `enable` = 0
-                    </otherwise>
-                </choose>
-            </if>
-        </set>
-    </sql>
-
-    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT *
-        FROM sys_role
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id
-    </select>
-
-    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysRole">
-        SELECT *
-        FROM sys_role
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id
-    </select>
-
-    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysRole">
-        UPDATE sys_role
-        <include refid="dynamicSqlSet"/>
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </update>
-
-    <delete id="physicalDelete">
-        DELETE FROM sys_role
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </delete>
-
 </mapper>

zen-core/src/main/kotlin/com/gxzc/zen/common/base/BaseMapper.kt

@@ -14,6 +14,8 @@ import java.io.Serializable
  * @url https://noahlan.com
  */
 interface BaseMapper<T> : BaseMapper<T> {
+//    fun testSelect(@Param("ew") wrapper: Wrapper<T>): MutableList<T>
+
     /**
      * 通过自定义SQL查询
      * 忽略 全局 逻辑删除

zen-orm/src/main/kotlin/com/gxzc/zen/orm/sql/ZenSqlInjector.kt

@@ -24,6 +24,7 @@ class ZenSqlInjector : LogicSqlInjector() {
 
     override fun inject(configuration: Configuration, builderAssistant: MapperBuilderAssistant, mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
         super.inject(configuration, builderAssistant, mapperClass, modelClass, table)
+//        this.testSelect(mapperClass, modelClass, table)
         this.updateWOLogic(mapperClass, modelClass, table)
         this.physicalDeleteById(mapperClass, modelClass, table)
         this.physicalDelete(mapperClass, modelClass, table)
@@ -31,9 +32,16 @@ class ZenSqlInjector : LogicSqlInjector() {
         this.selectWOLogicPage(mapperClass, modelClass, table)
     }
 
+//    fun testSelect(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
+//        val sqlMethod = "testSelect"
+//        val sql = "<script>SELECT ${sqlSelectColumns(table, true)} FROM ${table.tableName} ${zenSqlWhereEntityWrapper(table)}</script>"
+//        val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
+//        this.addSelectMappedStatement(mapperClass, sqlMethod, sqlSource, modelClass, table)
+//    }
+
     fun updateWOLogic(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
         val sqlMethod = "updateWOLogic"
-        val sql = "<script>UPDATE ${table.tableName} ${sqlSet(true, table, "et.")} ${sqlWhereEntityWrapper(table)}</script>"
+        val sql = "<script>UPDATE ${table.tableName} ${sqlSet(true, table, "et.")} ${zenSqlWhereEntityWrapper(table)}</script>"
         val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
         this.addUpdateMappedStatement(mapperClass, modelClass, sqlMethod, sqlSource)
     }
@@ -47,26 +55,26 @@ class ZenSqlInjector : LogicSqlInjector() {
 
     fun physicalDelete(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
         val sqlMethod = "physicalDelete"
-        val sql = "<script>DELETE FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}</script>"
+        val sql = "<script>DELETE FROM ${table.tableName} ${zenSqlWhereEntityWrapper(table)}</script>"
         val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
         this.addDeleteMappedStatement(mapperClass, sqlMethod, sqlSource)
     }
 
     fun selectWOLogic(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
         val sqlMethod = "selectWOLogic"
-        val sql = "SELECT ${sqlSelectColumns(table, false)} FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}"
+        val sql = "<script>SELECT ${sqlSelectColumns(table, true)} FROM ${table.tableName} ${zenSqlWhereEntityWrapper(table)}</script>"
         val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
         this.addSelectMappedStatement(mapperClass, sqlMethod, sqlSource, modelClass, table)
     }
 
     fun selectWOLogicPage(mapperClass: Class<*>, modelClass: Class<*>, table: TableInfo) {
         val sqlMethod = "selectWOLogicPage"
-        val sql = "SELECT ${sqlSelectColumns(table, false)} FROM ${table.tableName} ${sqlWhereEntityWrapper(table)}"
+        val sql = "<script>SELECT ${sqlSelectColumns(table, true)} FROM ${table.tableName} ${zenSqlWhereEntityWrapper(table)}</script>"
         val sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass)
         this.addSelectMappedStatement(mapperClass, sqlMethod, sqlSource, modelClass, table)
     }
 
-    override fun sqlWhereEntityWrapper(table: TableInfo): String {
+    fun zenSqlWhereEntityWrapper(table: TableInfo): String {
         val where = StringBuilder(128)
         where.append("\n<where>")
         where.append("\n<if test=\"ew!=null\">")

zen-web/src/main/kotlin/com/gxzc/zen/web/sys/controller/TestController.kt

@@ -2,6 +2,8 @@ package com.gxzc.zen.web.sys.controller
 
 import com.baomidou.kisso.annotation.Action
 import com.baomidou.kisso.annotation.Login
+import com.baomidou.mybatisplus.mapper.EntityWrapper
+import com.gxzc.zen.api.sys.mapper.SysDicMapper
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUser
@@ -71,10 +73,15 @@ class TestController : BaseController() {
         return
     }
 
+    @Autowired
+    private lateinit var sysDicMapper: SysDicMapper
+
     @PostMapping("")
     @Login(action = Action.Skip)
     fun test() {
-        println(1)
+        val result = sysDicMapper.selectWOLogic(EntityWrapper<SysDic>().eq("id", 1))
+        var a = 0
+        a = 1
     }
 
     @GetMapping("/download")

zen-web/src/main/resources/application-orm.yml

@@ -17,6 +17,7 @@ spring:
     atomikos:
       properties:
         serial-jta-transactions: false
+        enable-logging: false
 
 
 ################## 数据源 配置 ##################