优化sysdic行为

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

@@ -16,5 +16,6 @@ import org.springframework.stereotype.Repository
  */
 @Repository
 interface SysDicMapper : BaseMapper<SysDic> {
-    fun updateNoLogic(@Param("et") entity: SysDic, @Param("ew") wrapper: Wrapper<SysDic>)
+    fun updateNoLogic(@Param("et") entity: SysDic, @Param("ew") wrapper: Wrapper<SysDic>): Long
+    fun physicalDelete(@Param("ew") wrapper: Wrapper<SysDic>): Long
 }

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

@@ -40,12 +40,16 @@ interface ISysDicService : BaseService<SysDic> {
     fun modifySysDic(data: SysDic): SysDic
 
     /**
-     * 新增字典并刷新缓存
+     * 新增字典
+     * 刷新缓存
+     * TODO 通知其他系统
      */
     fun insertCacheable(data: SysDic)
 
     /**
-     * 删除字典项并刷新缓存
+     * 物理删除字典项
+     * 刷新缓存
+     * TODO 通知其他系统
      */
-    fun realDeleteCacheable(data: SysDic)
+    fun physicalDeleteCacheable(id: Long)
 }

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

@@ -91,6 +91,7 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
     }
 
     @Suppress("UNCHECKED_CAST")
+    @MultiTransactional
     override fun insertCacheable(data: SysDic) {
         if (baseMapper.insert(data) == 0) {
             throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
@@ -101,7 +102,18 @@ class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
     }
 
     @Suppress("UNCHECKED_CAST")
-    override fun realDeleteCacheable(data: SysDic) {
-        // TODO 删除啊
+    @MultiTransactional
+    override fun physicalDeleteCacheable(id: Long) {
+        if (baseMapper.physicalDelete(EntityWrapper<SysDic>().eq("id", id)) <= 0) {
+            throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
+        }
+        //
+        val cache = cacheManager.getCache(CACHEKEYS.SYS)
+        val cachedList: MutableList<SysDic>? = cache[CACHE_KEY_ALL].get() as MutableList<SysDic>?
+        cachedList?.let {
+            it.removeIf {
+                it.id == id
+            }
+        }
     }
 }

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

@@ -106,4 +106,11 @@
         <include refid="sqlOrder"/>
     </update>
 
+    <delete id="physicalDelete">
+        DELETE FROM sys_dic
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </delete>
+
 </mapper>

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

@@ -39,7 +39,6 @@ class SysDicController : BaseController() {
     }
 
     @GetMapping("{id}")
-    @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun getById(@PathVariable id: Long): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto().apply {
@@ -48,7 +47,6 @@ class SysDicController : BaseController() {
     }
 
     @GetMapping("keys/{key}")
-    @Login(action = Action.Skip)
     @ZenResponseFilter(type = SysDic::class, filter = ["createBy", "updateBy", "createTime", "updateTime"])
     fun getByKey(@PathVariable key: String): ResponseEntity<*> {
         return ResponseEntity.ok(ResponseDto().apply {
@@ -57,7 +55,6 @@ class SysDicController : BaseController() {
     }
 
     @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) {
@@ -71,4 +68,11 @@ class SysDicController : BaseController() {
             })
         }
     }
+
+    @DeleteMapping("{id}")
+    fun deleteDic(@PathVariable id: Long): ResponseEntity<*> {
+        // 物理删除数据
+        sysDicService.physicalDeleteCacheable(id)
+        return ResponseEntity.ok(ResponseDto())
+    }
 }