由上次更新框架，更新几个系统service的方法

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

@@ -15,6 +15,11 @@ interface ISysPermissionService {
      */
     fun getPermissionSetByUserId(id: Long): HashSet<String>
 
+    /**
+     * 移除 {@code id} 指定用户的权限缓存
+     */
+    fun evictCache(id: Long)
+
 //    /**
 //     * 初始化所有用户的权限缓存
 //     *

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

@@ -18,8 +18,27 @@ interface ISysUserRoleService : BaseService<SysUserRole> {
      */
     fun getUserRoleListByUserId(id: Long): MutableList<SysRole>
 
+    /**
+     * 物理删除 roleIds指定的 用户角色列表
+     */
+    fun physicalDeleteBatch(userId: Long, roleIds: List<Long>)
+
+    fun physicalDeleteById(id: Long)
+
+    fun physicalDeleteByUserId(userId: Long)
+
+    /**
+     * 批量插入
+     */
+    fun insertBatch(userId: Long, roleIds: List<Long>)
+
+    /**
+     * 删除缓存
+     */
+    fun evictCache(id: Long)
+
     /**
      * 获取所有用户的角色列表
      */
-    fun getUserRoleList(): Map<Long, MutableList<SysRole>>
+//    fun getUserRoleList(): Map<Long, MutableList<SysRole>>
 }

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

@@ -32,20 +32,17 @@ interface ISysUserService : BaseService<SysUser> {
 
     /**
      * 插入并缓存
-     * TODO 通知其他系统
      */
     fun insertCacheable(entity: SysUser)
 
     /**
      * 修改 并 更新缓存
-     * TODO 通知其他系统
      */
     fun modify(entity: SysUser): SysUser
 
     /**
      * 物理删除
      * 刷新缓存
-     * TODO 通知其他系统
      */
     fun physicalDeleteCacheable(id: Long)
 }

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

@@ -3,7 +3,9 @@ package com.gxzc.zen.api.sys.service.impl
 import com.gxzc.zen.api.sys.service.ISysPermissionService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
+import com.gxzc.zen.common.util.RedisCacheUtil
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.cache.annotation.CacheEvict
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
@@ -17,8 +19,6 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysPermissionServiceImpl : ISysPermissionService {
-//    @Autowired
-//    private lateinit var cacheManager: CacheManager
 
     @Autowired
     private lateinit var sysUserRoleService: ISysUserRoleService
@@ -33,6 +33,11 @@ class SysPermissionServiceImpl : ISysPermissionService {
         return permIds
     }
 
+    //    @CacheEvict(value = [CACHEKEYS.USER_PERM], key = "'${CACHEKEYS.USER_PERM}:uid_' + #id")
+    override fun evictCache(id: Long) {
+        RedisCacheUtil.evict(CACHEKEYS.USER_PERM, "${CACHEKEYS.USER_PERM}:uid_$id")
+    }
+
 //    @PostConstruct
 //    override fun initAllUserPermissionCache() {
 //        val cache = cacheManager.getCache(CACHEKEYS.USER_PERM)

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

@@ -25,10 +25,10 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
     override fun getListByParam(name: String?, code: String?, enable: Boolean?): MutableList<SysRole> {
         val wrapper = EntityWrapper<SysRole>().apply {
             if (!name.isNullOrEmpty()) {
-                eq("name", name)
+                like("name", name)
             }
             if (!code.isNullOrEmpty()) {
-                eq("code", code?.toUpperCase())
+                like("code", code?.toUpperCase())
             }
             if (enable != null) {
                 eq("enable", enable)
@@ -43,10 +43,10 @@ class SysRoleServiceImpl : ServiceImpl<SysRoleMapper, SysRole>(), ISysRoleServic
 
         val wrapper = EntityWrapper<SysRole>().apply {
             if (!name.isNullOrEmpty()) {
-                eq("name", name)
+                like("name", name)
             }
             if (!code.isNullOrEmpty()) {
-                eq("code", code?.toUpperCase())
+                like("code", code?.toUpperCase())
             }
             if (enable != null) {
                 eq("enable", enable)

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

@@ -1,15 +1,22 @@
 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.SysUserRoleMapper
 import com.gxzc.zen.api.sys.model.SysRole
 import com.gxzc.zen.api.sys.model.SysUserRole
-import com.gxzc.zen.api.sys.service.ISysRoleService
 import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.common.contants.CACHEKEYS
-import org.springframework.beans.factory.annotation.Autowired
+import com.gxzc.zen.common.exception.ZenException
+import com.gxzc.zen.common.exception.ZenExceptionEnum
+import com.gxzc.zen.common.util.RedisCacheUtil
+import com.gxzc.zen.orm.annotation.DynamicDataSource
+import com.gxzc.zen.orm.annotation.ZenTransactional
+import com.gxzc.zen.orm.contants.DSKey
+import org.springframework.cache.annotation.CacheEvict
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -21,25 +28,74 @@ import org.springframework.stereotype.Service
  */
 @Service
 class SysUserRoleServiceImpl : ServiceImpl<SysUserRoleMapper, SysUserRole>(), ISysUserRoleService {
-    @Autowired
-    private lateinit var sysRoleService: ISysRoleService
+//    @Autowired
+//    private lateinit var sysRoleService: ISysRoleService
 
     @Cacheable(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
     override fun getUserRoleListByUserId(id: Long): MutableList<SysRole> {
         return baseMapper.selectUserRoleListByUserId(id)
     }
 
+    @ZenTransactional
+    override fun physicalDeleteBatch(userId: Long, roleIds: List<Long>) {
+        if (roleIds.isEmpty()) {
+            return
+        }
+        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
+                .eq("user_id", userId)
+                .`in`("role_id", roleIds))
+        evictCache(userId)
+    }
+
+    @ZenTransactional
+    override fun physicalDeleteById(id: Long) {
+        val tmp = baseMapper.selectWOLogic(EntityWrapper<SysUserRole>().eq("id", id))
+        if (tmp.size < 1) {
+            return
+        }
+        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
+                .eq("id", id))
+        evictCache(tmp[0].userId!!)
+    }
+
+    @ZenTransactional
+    override fun physicalDeleteByUserId(userId: Long) {
+        baseMapper.physicalDelete(EntityWrapper<SysUserRole>()
+                .eq("user_id", userId))
+        evictCache(userId)
+    }
 
-    override fun getUserRoleList(): Map<Long, MutableList<SysRole>> {
-        val allSysUserRole = baseMapper.selectList(null)
-        val groupUserRole = allSysUserRole.groupBy({ it.userId }, { it.roleId })
-        val result = mutableMapOf<Long, MutableList<SysRole>>()
-        for (item in groupUserRole) {
-            if (item.key == null) {
-                continue
-            }
-            result[item.key!!] = sysRoleService.selectBatchIds(item.value)
+    @DynamicDataSource(DSKey.DSKEY_SYS)
+    @ZenTransactional
+    override fun insertBatch(userId: Long, roleIds: List<Long>) {
+        if (roleIds.isEmpty()) {
+            return
+        }
+        val dataList = mutableListOf<SysUserRole>()
+        roleIds.forEach {
+            dataList.add(SysUserRole(it, userId))
+        }
+        if (!this.insertBatch(dataList)) {
+            throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
         }
-        return result
+        evictCache(userId)
     }
+
+    // @CacheEvict(CACHEKEYS.USER_ROLE, key = "'${CACHEKEYS.USER_ROLE}:uid_'+ #id")
+    override fun evictCache(id: Long) {
+        RedisCacheUtil.evict(CACHEKEYS.USER_ROLE, "${CACHEKEYS.USER_ROLE}:uid_$id")
+    }
+
+//    override fun getUserRoleList(): Map<Long, MutableList<SysRole>> {
+//        val allSysUserRole = baseMapper.selectList(null)
+//        val groupUserRole = allSysUserRole.groupBy({ it.userId }, { it.roleId })
+//        val result = mutableMapOf<Long, MutableList<SysRole>>()
+//        for (item in groupUserRole) {
+//            if (item.key == null) {
+//                continue
+//            }
+//            result[item.key!!] = sysRoleService.selectBatchIds(item.value)
+//        }
+//        return result
+//    }
 }

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

@@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper
 import com.baomidou.mybatisplus.service.impl.ServiceImpl
 import com.gxzc.zen.api.sys.mapper.SysUserMapper
 import com.gxzc.zen.api.sys.model.SysUser
+import com.gxzc.zen.api.sys.service.ISysUserRoleService
 import com.gxzc.zen.api.sys.service.ISysUserService
 import com.gxzc.zen.common.contants.CACHEKEYS
 import com.gxzc.zen.common.contants.PLATFORM
 import com.gxzc.zen.common.exception.ZenException
 import com.gxzc.zen.common.exception.ZenExceptionEnum
 import com.gxzc.zen.common.properties.PlatformProperties
-import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.common.util.PlatformUtil
+import com.gxzc.zen.common.util.RedisCacheUtil
 import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.CommandLineRunner
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 /**
  * <p>
@@ -37,6 +39,9 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
     @Autowired
     private lateinit var platformProperties: PlatformProperties
 
+    @Autowired
+    private lateinit var userRoleService: ISysUserRoleService
+
     override fun run(vararg args: String?) {
         logger.debug("${this::class.simpleName} init.")
         getListCacheable()
@@ -73,10 +78,17 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
             if (baseMapper.insert(entity) == 0) {
                 throw ZenException(ZenExceptionEnum.BIZ_INSERT_ERROR)
             }
+
+            // role
+            val newRoleIdList = entity.roles?.map { it.id!! }
+            if (newRoleIdList != null) {
+                userRoleService.insertBatch(entity.id!!, newRoleIdList)
+            }
+
             val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
             cached?.let {
                 it.add(entity)
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
             }
         }
     }
@@ -84,7 +96,26 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
     @ZenTransactional
     override fun modify(entity: SysUser): SysUser {
         if (PlatformUtil.getPlatform() == PLATFORM.SYSTEM) {
+            /* 更新
+             * 查询原有角色
+             * 删除 / 新增 角色
+             */
+            val userRoleIdList = userRoleService.getUserRoleListByUserId(entity.id!!).map { it.id!! }
+            val newRoleIdList = entity.roles?.map { it.id!! }
+            if (newRoleIdList != null) {
+                // del
+                val delRoleIdList = userRoleIdList.toMutableList()
+                delRoleIdList.removeAll(newRoleIdList)
+                // add
+                val addRoleIdList = newRoleIdList.toMutableList()
+                addRoleIdList.removeAll(userRoleIdList)
+
+                userRoleService.physicalDeleteBatch(entity.id!!, delRoleIdList)
+                userRoleService.insertBatch(entity.id!!, addRoleIdList)
+            }
+
             baseMapper.updateWOLogic(entity, EntityWrapper<SysUser>().eq("id", entity.id))
+//            throw ZenException(ZenExceptionEnum.SERVER_ERROR)
             // 更新缓存
             val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
             cached?.let {
@@ -92,7 +123,7 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
                 if (idx != -1) {
                     it[idx] = entity
                 }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
             }
         }
         return entity
@@ -104,13 +135,15 @@ class SysUserServiceImpl : ServiceImpl<SysUserMapper, SysUser>(), ISysUserServic
             if (baseMapper.physicalDelete(EntityWrapper<SysUser>().eq("id", id)) <= 0) {
                 throw ZenException(ZenExceptionEnum.BIZ_DELETE_ERROR)
             }
+            // 删除与之关联的所有系统表数据
+            userRoleService.physicalDeleteByUserId(id)
             //
             val cached = RedisCacheUtil.get(CACHEKEYS.USER, CACHE_KEY_ALL)?.get() as? MutableList<SysUser>
             cached?.let {
                 it.removeIf {
                     it.id == id
                 }
-                RedisCacheUtil.put(CACHEKEYS.SYS, CACHE_KEY_ALL, it)
+                RedisCacheUtil.put(CACHEKEYS.USER, CACHE_KEY_ALL, it)
             }
         }
     }

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

@@ -27,102 +27,6 @@
         <result column="gender" property="gender"/>
     </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.account != null">
-                    AND account = #{p.account}
-                </if>
-                <if test="p.id != null">
-                    AND id = #{p.id}
-                </if>
-            </if>
-        </where>
-    </sql>
-
-    <sql id="dynamicSqlSet">
-        <set>
-            <if test="et.account != null">
-                account = #{et.account},
-            </if>
-            <if test="et.username != null">
-                `username` = #{et.username},
-            </if>
-            <if test="et.password != null">
-                `password` = #{et.password},
-            </if>
-            <if test="et.salt != null">
-                salt = #{et.salt},
-            </if>
-            <if test="et.phone != null">
-                phone = #{et.phone},
-            </if>
-            <if test="et.email != null">
-                email = #{et.email},
-            </if>
-            <if test="et.position != null">
-                `position` = #{et.position},
-            </if>
-            <if test="et.address != null">
-                address = #{et.address},
-            </if>
-            <if test="et.staffNo != null">
-                staff_no = #{et.staffNo},
-            </if>
-            <if test="et.ext1 != null">
-                ext1 = #{et.ext1},
-            </if>
-            <if test="et.ext2 != null">
-                ext2 = #{et.ext2},
-            </if>
-            <if test="et.ext3 != null">
-                ext3 = #{et.ext3},
-            </if>
-            <if test="et.ext4 != null">
-                ext4 = #{et.ext4},
-            </if>
-            <if test="et.gender != null">
-                gender = #{et.gender},
-            </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="selectByAccount" resultMap="BaseResultMap">
         SELECT *
         FROM sys_user
@@ -130,34 +34,4 @@
           account = #{account}
         LIMIT 1
     </select>
-
-    <select id="selectByParams" resultType="com.gxzc.zen.api.sys.model.SysUser">
-        SELECT *
-        FROM sys_user
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id
-    </select>
-
-    <select id="selectByParamsPage" resultType="com.gxzc.zen.api.sys.model.SysUser">
-        SELECT *
-        FROM sys_user
-        <include refid="dynamicSqlWhere"/>
-        ORDER BY id
-    </select>
-
-    <update id="updateNoLogic" parameterType="com.gxzc.zen.api.sys.model.SysUser">
-        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-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -25,12 +25,12 @@ fun main(args: Array<String>) {
             }
         }
         it.driverName = "com.mysql.jdbc.Driver"
-//        it.username = "archives"
-//        it.password = "archives"
-//        it.url = "jdbc:mysql://192.168.1.124:3307/archives_sys?characterEncoding=utf8"
-        it.url = "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
-        it.username = "root"
-        it.password = "root"
+        it.username = "archives"
+        it.password = "archives"
+        it.url = "jdbc:mysql://192.168.1.124:3307/archives_mgr?characterEncoding=utf8"
+//        it.url = "jdbc:mysql://127.0.0.1:3306/archives_mgr?characterEncoding=utf8"
+//        it.username = "root"
+//        it.password = "root"
     })
 }
 

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

@@ -14,6 +14,7 @@ import com.gxzc.zen.common.config.request.annotation.KVType
 import com.gxzc.zen.common.config.request.annotation.KVTypeEnum
 import com.gxzc.zen.common.config.request.annotation.ZenRequestTypes
 import com.gxzc.zen.common.dto.RequestDto
+import com.gxzc.zen.orm.annotation.ZenTransactional
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
 import org.springframework.core.io.Resource
@@ -113,4 +114,13 @@ class TestController : BaseController() {
         val b = data["data"] as List<SysRole>
         return ResponseEntity.ok(null)
     }
+
+    @GetMapping("tran")
+    @Login(action = Action.Skip)
+    @ZenTransactional
+    fun tran() {
+        sysDicService.selectList(null)
+
+        throw RuntimeException()
+    }
 }

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

@@ -49,19 +49,16 @@ class UserController : BaseController() {
 
     @PutMapping
     @ZenResponseFilter(type = SysUser::class, filter = ["createTime", "createBy", "updateTime", "updateBy", "password", "salt"])
-    // @ZenRequestTypes(KVType("user", SysUser::class), KVType("roles", List::class))
     fun putUser(@RequestBody data: SysUser): ResponseEntity<*> {
-        return ResponseEntity.ok(null)
-//        return if (data.id == null) {
-//            // insert
-//            userService.insertCacheable(data)
-//            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
-//        } else {
-//            // update
-//            ResponseEntity.ok(ResponseDto().apply {
-//                this.data = userService.modify(data) // 200
-//            })
-//        }
+        return if (data.id != null) {
+            ResponseEntity.ok(ResponseDto().apply {
+                this.data = userService.modify(data) // 200
+            })
+        } else {
+            // 插入,新增 角色
+            userService.insertCacheable(data)
+            ResponseEntity.created(URI.create("/user/${data.id}")).body(ResponseDto()) // 201
+        }
     }
 
     @DeleteMapping("{id}")

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

@@ -1,5 +1,5 @@
 orm:
-  multi-datasource-enable: true # 多数据源开关
+  multi-datasource-enable: false # 多数据源开关
 
 
 
@@ -43,7 +43,7 @@ datasource:
     min-evictable-idle-time-millis: 30000
   bus:
     name: business
-    url: jdbc:mysql://192.168.1.124:3307/archives_sys?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://192.168.1.124:3307/archives_mgr?pinGlobalTxToPhysicalConnection=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.jdbc.Driver
     username: archives
     password: archives