v3.15.0【新增】升级SaToken到最新版本;【新增】重磅优化 数据字典;【新增】升级wangEditor-next;【新增】优化缓存实现redis与caffeine

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictDataDao">
+
+
+    <select id="queryByDictId" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
+        select *
+        from t_dict_data
+        where dict_id = #{dictId}
+        order by sort_order desc
+    </select>
+
+    <select id="getAll" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
+        select t_dict_data.*,
+               t_dict.dict_code
+        from t_dict_data
+                 left join t_dict on t_dict_data.dict_id = t_dict.dict_id
+        order by t_dict_data.sort_order desc
+    </select>
+
+
+    <select id="selectByDictIdAndValue"
+            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictDataEntity">
+        select *
+        from t_dict_data
+        where dict_id = #{dictId}
+          and data_value = #{dataValue}
+    </select>
+
+    <select id="selectByDictDataIds" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
+        select
+        t_dict_data.*,
+        t_dict.dict_code
+        from t_dict_data
+        left join t_dict on t_dict_data.dict_id = t_dict.dict_id
+        <where>
+            <if test="dictDataIdList != null and dictDataIdList.size > 0">
+                and t_dict_data.dict_data_id in
+                <foreach collection="dictDataIdList" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictKeyDao">
-
-    <update id="updateDeletedFlagByIdList">
-        update t_dict_key set deleted_flag = #{deletedFlag} where dict_key_id in
-        <foreach collection="dictKeyIdList" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-
-    <select id="query" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictKeyVO">
-        SELECT * FROM t_dict_key
-        <where>
-            <if test="query.searchWord != null and query.searchWord !=''">
-                AND (INSTR(key_code,#{query.searchWord}) or INSTR(key_name,#{query.searchWord}))
-            </if>
-            <if test="query.deletedFlag != null">
-                AND deleted_flag = #{query.deletedFlag}
-            </if>
-        </where>
-        <if test="query.sortItemList == null or query.sortItemList.size == 0">
-            ORDER BY dict_key_id DESC
-        </if>
-    </select>
-
-    <select id="selectByCode"
-            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictKeyEntity">
-        select * from t_dict_key where key_code = #{keyCode} and deleted_flag = #{deletedFlag}
-    </select>
-
-    <select id="selectByDeletedFlag"
-            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictKeyEntity">
-        select * from t_dict_key where deleted_flag = #{deletedFlag}
-    </select>
-
-</mapper>

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictDao">
+
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        t_dict.dict_id,
+        t_dict.dict_name,
+        t_dict.dict_code,
+        t_dict.remark,
+        t_dict.disabled_flag,
+        t_dict.create_time,
+        t_dict.update_time
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictVO">
+        SELECT
+        <include refid="base_columns"/>
+        FROM t_dict
+        <where>
+            <!--关键字-->
+            <if test="queryForm.keywords != null and queryForm.keywords != ''">
+                AND (
+                INSTR(t_dict.dict_name,#{queryForm.keywords})
+                OR INSTR(t_dict.dict_code,#{queryForm.keywords})
+                OR INSTR(t_dict.remark,#{queryForm.keywords})
+                )
+            </if>
+            <!--禁用状态-->
+            <if test="queryForm.disabledFlag != null">
+                AND t_dict.disabled_flag = #{queryForm.disabledFlag}
+            </if>
+        </where>
+        <if test="queryForm.sortItemList == null or queryForm.sortItemList.size == 0">
+            order by create_time desc
+        </if>
+    </select>
+
+    <select id="selectByCode" resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictEntity">
+        select * from t_dict where dict_code = #{code}
+    </select>
+
+
+</mapper>

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictValueMapper.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.dict.dao.DictValueDao">
-
-    <update id="updateDeletedFlagByIdList">
-        update t_dict_value set deleted_flag = #{deletedFlag} where dict_value_id in
-        <foreach collection="dictValueIdList" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-
-    <select id="query" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictValueVO">
-        SELECT * FROM t_dict_value
-        <where>
-            <if test="query.dictKeyId != null">
-                AND dict_key_id = #{query.dictKeyId}
-            </if>
-            <if test="query.searchWord != null and query.searchWord !=''">
-                AND (INSTR(value_code,#{query.searchWord}) or INSTR(value_name,#{query.searchWord}))
-            </if>
-            <if test="query.deletedFlag != null">
-                AND deleted_flag = #{query.deletedFlag}
-            </if>
-        </where>
-        <if test="query.sortItemList == null or query.sortItemList.size == 0">
-            ORDER BY sort,dict_value_id DESC
-        </if>
-    </select>
-
-    <select id="selectByCode"
-            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
-        select * from t_dict_value where dict_Key_id = #{dictKeyId} and value_code = #{valueCode} and deleted_flag = #{deletedFlag}
-    </select>
-
-    <select id="selectByDeletedFlag"
-            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
-        select * from t_dict_value where deleted_flag = #{deletedFlag} order by sort;
-    </select>
-    <select id="selectByDeletedFlagAndKeyId"
-            resultType="net.lab1024.sa.base.module.support.dict.domain.entity.DictValueEntity">
-        select * from t_dict_value where dict_key_id = #{dictKeyId} and deleted_flag = #{deletedFlag}
-    </select>
-
-</mapper>

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml

@@ -9,7 +9,7 @@
             <if test="query.searchWord != null and query.searchWord != '' ">
                 AND (
                 INSTR(feedback_content,#{query.searchWord})
-                OR INSTR(create_name,#{query.searchWord})
+                OR INSTR(user_name,#{query.searchWord})
                 )
             </if>
             <if test="query.startDate != null">