Add get role controller. Optimize code.

src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt

@@ -1,7 +1,9 @@
 package top.fatweb.api.service.permission
 
+import com.baomidou.mybatisplus.core.metadata.IPage
 import com.baomidou.mybatisplus.extension.service.IService
 import top.fatweb.api.entity.permission.Group
+import top.fatweb.api.param.authentication.GroupGetParam
 
 /**
  * <p>
@@ -11,4 +13,6 @@ import top.fatweb.api.entity.permission.Group
  * @author FatttSnake
  * @since 2023-10-25
  */
-interface IGroupService : IService<Group>
+interface IGroupService : IService<Group> {
+    fun getPage(groupGetParam: GroupGetParam?): IPage<Group>
+}

src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt

@@ -1,7 +1,11 @@
 package top.fatweb.api.service.permission
 
+import com.baomidou.mybatisplus.core.metadata.IPage
 import com.baomidou.mybatisplus.extension.service.IService
 import top.fatweb.api.entity.permission.Role
+import top.fatweb.api.param.authentication.RoleAddParam
+import top.fatweb.api.param.authentication.RoleGetParam
+import top.fatweb.api.vo.permission.RoleVo
 
 /**
  * <p>
@@ -11,4 +15,8 @@ import top.fatweb.api.entity.permission.Role
  * @author FatttSnake
  * @since 2023-10-25
  */
-interface IRoleService : IService<Role>
+interface IRoleService : IService<Role> {
+    fun getPage(roleGetParam: RoleGetParam?): IPage<Role>
+
+    fun add(roleAddParam: RoleAddParam): RoleVo?
+}

src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt

@@ -1,10 +1,14 @@
 package top.fatweb.api.service.permission.impl
 
+import com.baomidou.mybatisplus.core.metadata.IPage
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 import top.fatweb.api.entity.permission.Group
 import top.fatweb.api.mapper.permission.GroupMapper
+import top.fatweb.api.param.authentication.GroupGetParam
 import top.fatweb.api.service.permission.IGroupService
+import top.fatweb.api.util.PageUtil
 
 /**
  * <p>
@@ -15,4 +19,12 @@ import top.fatweb.api.service.permission.IGroupService
  * @since 2023-10-25
  */
 @Service
-class GroupServiceImpl : ServiceImpl<GroupMapper, Group>(), IGroupService
+class GroupServiceImpl : ServiceImpl<GroupMapper, Group>(), IGroupService {
+    override fun getPage(groupGetParam: GroupGetParam?): IPage<Group> {
+        val groupPage = Page<Group>(groupGetParam?.currentPage ?: 1, groupGetParam?.pageSize ?: 20)
+
+        PageUtil.setPageSort(groupGetParam, groupPage)
+
+        return baseMapper.selectPage(groupPage)
+    }
+}

src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt

@@ -1,10 +1,20 @@
 package top.fatweb.api.service.permission.impl
 
+import com.baomidou.mybatisplus.core.metadata.IPage
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import top.fatweb.api.converter.permission.RoleConverter
+import top.fatweb.api.entity.permission.PowerRole
 import top.fatweb.api.entity.permission.Role
 import top.fatweb.api.mapper.permission.RoleMapper
+import top.fatweb.api.param.authentication.RoleAddParam
+import top.fatweb.api.param.authentication.RoleGetParam
+import top.fatweb.api.service.permission.IPowerRoleService
 import top.fatweb.api.service.permission.IRoleService
+import top.fatweb.api.util.PageUtil
+import top.fatweb.api.vo.permission.RoleVo
 
 /**
  * <p>
@@ -15,4 +25,35 @@ import top.fatweb.api.service.permission.IRoleService
  * @since 2023-10-25
  */
 @Service
-class RoleServiceImpl : ServiceImpl<RoleMapper, Role>(), IRoleService
+class RoleServiceImpl(
+    private val powerRoleService: IPowerRoleService
+) : ServiceImpl<RoleMapper, Role>(), IRoleService {
+    override fun getPage(roleGetParam: RoleGetParam?): IPage<Role> {
+        val rolePage = Page<Role>(roleGetParam?.currentPage ?: 1, roleGetParam?.pageSize ?: 20)
+
+        PageUtil.setPageSort(roleGetParam, rolePage)
+
+        return baseMapper.selectPage(rolePage)
+    }
+
+
+    @Transactional
+    override fun add(roleAddParam: RoleAddParam): RoleVo? {
+        val role = RoleConverter.roleAddParamToRole(roleAddParam)
+        if (baseMapper.insert(role) == 1) {
+            if (powerRoleService.saveBatch(
+                    roleAddParam.powerIds?.map {
+                        PowerRole().apply {
+                            roleId = role.id
+                            powerId = it
+                        }
+                    }
+                )
+            ) {
+                return RoleConverter.roleToRoleVo(role)
+            }
+        }
+
+        return null
+    }
+}

src/main/kotlin/top/fatweb/api/service/system/impl/SysLogServiceImpl.kt

@@ -9,7 +9,7 @@ import top.fatweb.api.entity.system.SysLog
 import top.fatweb.api.mapper.system.SysLogMapper
 import top.fatweb.api.param.system.SysLogGetParam
 import top.fatweb.api.service.system.ISysLogService
-import top.fatweb.api.util.StrUtil
+import top.fatweb.api.util.PageUtil
 
 /**
  * <p>
@@ -24,20 +24,7 @@ class SysLogServiceImpl : ServiceImpl<SysLogMapper, SysLog>(), ISysLogService {
     override fun getPage(sysLogGetParam: SysLogGetParam?): IPage<SysLog> {
         val sysLogPage = Page<SysLog>(sysLogGetParam?.currentPage ?: 1, sysLogGetParam?.pageSize ?: 20)
 
-        if (sysLogGetParam?.sortField == null && sysLogGetParam?.sortOrder == null) {
-            sysLogPage.addOrder(OrderItem.desc("start_time"))
-        } else {
-            sysLogPage.addOrder(
-                if (sysLogGetParam.sortOrder?.startsWith(
-                        "desc", true
-                    ) == true
-                ) OrderItem.desc(StrUtil.upperToUnderLetter(sysLogGetParam.sortField)) else OrderItem.asc(
-                    StrUtil.upperToUnderLetter(
-                        sysLogGetParam.sortField
-                    )
-                )
-            )
-        }
+        PageUtil.setPageSort(sysLogGetParam, sysLogPage, OrderItem.desc("start_time"))
 
         return baseMapper.selectPage(
             sysLogPage,