添加几个通用的系统业务异常(CRUD),进一步优化SysDic的缓存逻辑

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDicMapper.kt

@@ -1,7 +1,9 @@
 package com.gxzc.zen.api.sys.mapper
 
+import com.baomidou.mybatisplus.mapper.Wrapper
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.common.base.BaseMapper
+import org.apache.ibatis.annotations.Param
 import org.springframework.stereotype.Repository
 
 /**
@@ -13,4 +15,6 @@ import org.springframework.stereotype.Repository
  * @since 2018-02-06
  */
 @Repository
-interface SysDicMapper : BaseMapper<SysDic>
+interface SysDicMapper : BaseMapper<SysDic> {
+    fun updateNoLogic(@Param("et") entity: SysDic, @Param("ew") wrapper: Wrapper<SysDic>)
+}

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

@@ -38,4 +38,14 @@ interface ISysDicService : BaseService<SysDic> {
      * TODO 同时通知其他系统
      */
     fun modifySysDic(data: SysDic): SysDic
+
+    /**
+     * 新增字典并刷新缓存
+     */
+    fun insertCacheable(data: SysDic)
+
+    /**
+     * 删除字典项并刷新缓存
+     */
+    fun realDeleteCacheable(data: SysDic)
 }

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

@@ -1,14 +1,19 @@
 package com.gxzc.zen.api.sys.service.impl
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysDicMapper
 import com.gxzc.zen.api.sys.model.SysDic
 import com.gxzc.zen.api.sys.service.ISysDicService
 import com.gxzc.zen.common.contants.CACHEKEYS
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.orm.annotation.MultiTransactional
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
+import javax.annotation.PostConstruct
 
 /**
  * <p>
@@ -20,17 +25,20 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
-
-
     companion object {
-        const val CACHE_KEY_ALL = "'dic_all'"
+        const val CACHE_KEY_ALL = "dic_all"
     }
 
     @Autowired
     private lateinit var cacheManager: CacheManager
 
-    @Cacheable(CACHEKEYS.SYS, key = CACHE_KEY_ALL)
-//    @PostConstruct
+    @PostConstruct
+    fun initCache() {
+        val cache = cacheManager.getCache(CACHEKEYS.SYS)
+        cache.put(CACHE_KEY_ALL, getListCacheable())
+    }
+
+    @Cacheable(CACHEKEYS.SYS, key = "'$CACHE_KEY_ALL'")
     override fun getListCacheable(): MutableList<SysDic> {
         return baseMapper.selectByParams(null)
     }
@@ -51,17 +59,18 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
 
     //    @CacheEvict(CACHEKEYS.SYS, key = "'dic_key_' + #sysDic.key")
     @Suppress("UNCHECKED_CAST")
+    @MultiTransactional
     override fun modifySysDic(data: SysDic): SysDic {
-        baseMapper.updateById(data)
+        baseMapper.updateNoLogic(data, EntityWrapper<SysDic>().eq("id", data.id))
         // 更新缓存
         val cache = cacheManager.getCache(CACHEKEYS.SYS)
-        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>
+        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
         cachedList?.let {
-            it.removeIf { it.id == data.id }
-            it.add(data)
-            cache.put(CACHE_KEY_ALL, cachedList)
+            val idx = it.indexOfFirst { it.id == data.id }
+            if (idx != -1) {
+                it[idx] = data
+            }
         }
-
         return data
     }
 
@@ -80,4 +89,19 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
             null
         }
     }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun insertCacheable(data: SysDic) {
+        if (baseMapper.insert(data) == 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
+        }
+        val cache = cacheManager.getCache(CACHEKEYS.SYS)
+        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
+        cachedList?.add(data)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun realDeleteCacheable(data: SysDic) {
+        // TODO 删除啊
+    }
 }

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

@@ -29,22 +29,81 @@
                     </otherwise>
                 </choose>
             </if>
-            <if test="key != null and key != ''">
+            <if test="key != null">
                 AND `key` = #{key}
             </if>
-            <if test="value != null and value != ''">
+            <if test="value != null">
                 AND `value` = #{value}
             </if>
-            <if test="sort != null and sort != ''">
+            <if test="sort != null">
                 AND sort = #{sort}
             </if>
+            <if test="id != null">
+                AND id = #{id}
+            </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>
+
+    <sql id="sqlOrder">
+        ORDER BY id,sort
+    </sql>
+
     <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysDic">
         SELECT *
         FROM sys_dic
         <include refid="dynamicSqlWhere"/>
+        <include refid="sqlOrder"/>
     </select>
 
+    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysDic">
+        UPDATE sys_dic
+        <include refid="dynamicSqlSet"/>
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        <include refid="sqlOrder"/>
+    </update>
+
 </mapper>

zen-core/src/main/kotlin/com/gxzc/zen/common/exception/ZenExceptionEnum.kt

@@ -24,5 +24,16 @@ enum class ZenExceptionEnum(val code: Int, val msg: String) {
      * 错误的请求
      */
     REQUEST_NULL(400, "请求有错误"),
-    SERVER_ERROR(500, "服务器异常");
+    SERVER_ERROR(500, "服务器异常"),
+
+    /**
+     * 业务异常
+     */
+    BIZ_EXCEPTION(600, "业务异常"), // 业务异常通用枚举
+    BIZ_INSERT_ERROR(601, "新增失败"),
+    BIZ_DELETE_ERROR(602, "删除失败"),
+    BIZ_SELECT_ERROR(603, "查询失败"),
+    BIZ_UPDATE_ERROR(604, "修改失败")
+    ;
+
 }

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

@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import java.net.URI
 
 /**
  * 系统参数 控制器
@@ -37,19 +38,37 @@ class SysDicController : BaseController() {
         })
     }
 
-    @GetMapping("{key}")
+    @GetMapping("{id}")
+    @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-    fun get(@PathVariable key: String): ResponseEntity<*> {
+    fun getById(@PathVariable id: Long): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto().apply {
-            data = sysDicService.getListByKey(key)
+            data = sysDicService.selectById(id)
         })
     }
 
-    @PutMapping("{key}")
+    @GetMapping("keys/{key}")
+    @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
-    fun putDic(@PathVariable key: String, @RequestBody requestDic: SysDic): ResponseEntity<*> {
+    fun getByKey(@PathVariable key: String): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto().apply {
-            data = sysDicService.modifySysDic(requestDic)
+            data = sysDicService.getListByKey(key)
         })
     }
+
+    @PutMapping
+    @Login(action = Action.Skip)
+    @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
+    fun putDic(@RequestBody data: SysDic): ResponseEntity<*> {
+        return if (data.id == null) {
+            // insert
+            sysDicService.insertCacheable(data.apply { id = null })
+            ResponseEntity.created(URI.create("/sys/dic/${data.id}")).body(ResponseDto()) // 201
+        } else {
+            // update
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = sysDicService.modifySysDic(data) // 200
+            })
+        }
+    }
 }