refactor 接口

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java

@@ -1,5 +1,7 @@
 package cc.iotkit.data.system;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.data.ICommonData;
 import cc.iotkit.model.system.SysUser;
 
@@ -36,4 +38,7 @@ public interface ISysUserData extends ICommonData<SysUser, Long> {
     SysUser selectTenantUserByUserName(String username, String tenantId);
 
     SysUser selectUserByUserName(String username);
+
+
+    Paging<SysUser> selectAllocatedList(PageRequest<SysUser> to);
 }

iot-module/iot-system/pom.xml

@@ -63,6 +63,10 @@
             <artifactId>iot-common-oss</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.linpeilie</groupId>
+            <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+        </dependency>
 
     </dependencies>
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java

@@ -76,7 +76,7 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:add")
     @ApiOperation("新增部门")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody Request<SysDeptBo> bo) {
         SysDeptBo dept = bo.getData();
         if (!deptService.checkDeptNameUnique(dept)) {
@@ -91,7 +91,7 @@ public class SysDeptController extends BaseController {
     @ApiOperation("修改部门")
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public void edit(@Validated @RequestBody Request<SysDeptBo> bo) {
         SysDeptBo dept = bo.getData();
         Long deptId = dept.getDeptId();
@@ -114,7 +114,7 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:remove")
     @ApiOperation("删除部门")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @PostMapping("/delete}")
+    @PostMapping("/delete")
     public void remove(@Validated @RequestBody Request<Long> bo) {
         Long deptId = bo.getData();
         if (deptService.hasChildByDeptId(deptId)) {

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java

@@ -90,7 +90,7 @@ public class SysDictDataController {
      */
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody Request<SysDictDataBo> bo) {
         dictDataService.insertDictData(bo.getData());
     }
@@ -101,7 +101,7 @@ public class SysDictDataController {
     @ApiOperation(value = "修改保存字典类型", notes = "修改保存字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     public void edit(@Validated @RequestBody Request<SysDictDataBo> bo) {
         dictDataService.updateDictData(bo.getData());
     }
@@ -113,7 +113,7 @@ public class SysDictDataController {
     @ApiOperation(value = "删除字典类型", notes = "删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/delete")
+    @PostMapping("/delete")
     public void remove(@Validated @RequestBody Request<Long[]> bo) {
         dictDataService.deleteDictDataByIds(bo.getData());
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java

@@ -102,7 +102,7 @@ public class SysDictTypeController extends BaseController {
      */
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictIds}")
+    @PostMapping("/delete")
     public void remove(@PathVariable Collection<Long> dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
     }
@@ -112,7 +112,7 @@ public class SysDictTypeController extends BaseController {
      */
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/refreshCache")
+    @PostMapping("/refreshCache")
     public void refreshCache() {
         dictTypeService.resetDictCache();
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysLogininforController.java

@@ -77,7 +77,7 @@ public class SysLogininforController extends BaseController {
     @ApiOperation("清理系统访问记录")
     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
+    @PostMapping("/clean")
     public void clean() {
         logininforService.cleanLogininfor();
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOperlogController.java

@@ -62,7 +62,7 @@ public class SysOperlogController extends BaseController {
     @ApiOperation("批量删除操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @SaCheckPermission("monitor:operlog:remove")
-    @DeleteMapping("/{operIds}")
+    @PostMapping("/{operIds}")
     public void remove(@PathVariable Long[] operIds) {
         operLogService.deleteOperLogByIds(List.of(operIds));
     }
@@ -73,7 +73,7 @@ public class SysOperlogController extends BaseController {
     @ApiOperation("清理操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @SaCheckPermission("monitor:operlog:remove")
-    @DeleteMapping("/clean")
+    @PostMapping("/clean")
     public void clean() {
         operLogService.cleanOperLog();
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java

@@ -175,8 +175,8 @@ public class SysRoleController extends BaseController {
     @ApiOperation(value = "查询已分配用户角色列表", notes = "查询已分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @PostMapping("/authUser/allocatedList")
-    public Paging<SysUserVo> allocatedList(Request<SysUserBo> bo, PageRequest<?> query) {
-        return userService.selectAllocatedList(bo.getData(), query);
+    public Paging<SysUserVo> allocatedList(@RequestBody @Validated PageRequest<SysUserBo> query) {
+        return userService.selectAllocatedList(query);
     }
 
     /**
@@ -185,8 +185,8 @@ public class SysRoleController extends BaseController {
     @ApiOperation(value = "查询未分配用户角色列表", notes = "查询未分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @PostMapping("/authUser/unallocatedList")
-    public Paging<SysUserVo> unallocatedList(Request<SysUserBo> bo, PageRequest<?> query) {
-        return userService.selectUnallocatedList(bo.getData(), query);
+    public Paging<SysUserVo> unallocatedList( PageRequest<SysUserBo> query) {
+        return userService.selectUnallocatedList( query);
     }
 
     /**

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java

@@ -2,6 +2,7 @@ package cc.iotkit.system.controller;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
+import cc.iotkit.common.api.Request;
 import cc.iotkit.common.constant.TenantConstants;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
@@ -49,8 +50,8 @@ public class SysTenantController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:list")
     @PostMapping("/list")
-    public Paging<SysTenantVo> list(SysTenantBo bo, PageRequest<?> query) {
-        return tenantService.queryPageList(bo, query);
+    public Paging<SysTenantVo> list(@Validated @RequestBody PageRequest<SysTenantBo> query) {
+        return tenantService.queryPageList(query);
     }
 
     /**
@@ -61,36 +62,36 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:export")
     @Log(title = "租户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SysTenantBo bo, HttpServletResponse response) {
-        List<SysTenantVo> list = tenantService.queryList(bo);
+    public void export(Request<SysTenantBo> bo, HttpServletResponse response) {
+        List<SysTenantVo> list = tenantService.queryList(bo.getData());
         ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response);
     }
 
     /**
      * 获取租户详细信息
      *
-     * @param id 主键
      */
     @ApiOperation("获取租户详细信息")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:query")
-    @GetMapping("/{id}")
-    public SysTenantVo getInfo(@NotNull(message = "主键不能为空")
-                               @PathVariable Long id) {
-        return tenantService.queryById(id);
+    @PostMapping("/getDetail")
+    public SysTenantVo getInfo(@Validated @RequestBody Request<Long> bo) {
+        return tenantService.queryById(bo.getData());
     }
 
     /**
      * 新增租户
      */
+    @ApiOperation("新增租户")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:add")
     @Log(title = "租户", businessType = BusinessType.INSERT)
     @Lock4j
     @PostMapping()
-    public void add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
-        if (!tenantService.checkCompanyNameUnique(bo)) {
-            fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
+    public void add(@Validated(AddGroup.class) @RequestBody Request<SysTenantBo> bo) {
+        SysTenantBo data = bo.getData();
+        if (!tenantService.checkCompanyNameUnique(data)) {
+            fail("新增租户'" + data.getCompanyName() + "'失败，企业名称已存在");
         }
         //TenantHelper.ignore(() -> tenantService.insertByBo(bo));
     }
@@ -98,16 +99,18 @@ public class SysTenantController extends BaseController {
     /**
      * 修改租户
      */
+    @ApiOperation("修改租户")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @PutMapping()
-    public void edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
-        tenantService.checkTenantAllowed(bo.getTenantId());
-        if (!tenantService.checkCompanyNameUnique(bo)) {
-            fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
+    public void edit(@Validated(EditGroup.class) @RequestBody Request<SysTenantBo> bo) {
+        SysTenantBo data = bo.getData();
+        tenantService.checkTenantAllowed(data.getTenantId());
+        if (!tenantService.checkCompanyNameUnique(data)) {
+            fail("修改租户'" + data.getCompanyName() + "'失败，公司名称已存在");
         }
-        tenantService.updateByBo(bo);
+        tenantService.updateByBo(data);
     }
 
     /**
@@ -117,41 +120,42 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public void changeStatus(@RequestBody SysTenantBo bo) {
-        tenantService.checkTenantAllowed(bo.getTenantId());
-        tenantService.updateTenantStatus(bo);
+    public void changeStatus(@RequestBody Request<SysTenantBo> bo) {
+        SysTenantBo data = bo.getData();
+        tenantService.checkTenantAllowed(data.getTenantId());
+        tenantService.updateTenantStatus(data);
     }
 
     /**
      * 删除租户
      *
-     * @param ids 主键串
      */
+    @ApiOperation("删除租户")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:remove")
     @Log(title = "租户", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public void remove(@NotEmpty(message = "主键不能为空")
-                       @PathVariable Long[] ids) {
-        tenantService.deleteWithValidByIds(List.of(ids), true);
+    @PostMapping("/delete")
+    public void remove(@Validated @RequestBody Request<Long[]> bo) {
+        tenantService.deleteWithValidByIds(List.of(bo.getData()), true);
     }
 
     /**
      * 动态切换租户
      *
-     * @param tenantId 租户ID
      */
+    @ApiOperation("动态切换租户")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @GetMapping("/dynamic/{tenantId}")
-    public void dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) {
-        TenantHelper.setDynamic(tenantId);
+    @PostMapping("/dynamic")
+    public void dynamicTenant(@Validated @RequestBody Request<String> bo) {
+        TenantHelper.setDynamic(bo.getData());
     }
 
     /**
      * 清除动态租户
      */
+    @ApiOperation("清除动态租户")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @GetMapping("/dynamic/clear")
+    @PostMapping("/dynamic/clear")
     public void dynamicClear() {
         TenantHelper.clearDynamic();
     }
@@ -163,10 +167,11 @@ public class SysTenantController extends BaseController {
      * @param tenantId  租户id
      * @param packageId 套餐id
      */
+    @ApiOperation("同步租户套餐")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
-    @GetMapping("/syncTenantPackage")
+    @PostMapping("/syncTenantPackage")
     public void syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, @NotBlank(message = "套餐ID不能为空") String packageId) {
         //TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId));
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java

@@ -1,6 +1,7 @@
 package cc.iotkit.system.controller;
 
 import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Request;
 import cc.iotkit.common.constant.TenantConstants;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.excel.utils.ExcelUtil;
@@ -14,6 +15,7 @@ import cc.iotkit.system.dto.vo.SysTenantPackageVo;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import cc.iotkit.system.service.ISysTenantPackageService;
+import io.swagger.annotations.ApiOperation;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -39,19 +41,21 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐列表
      */
+    @ApiOperation("查询租户套餐列表")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:list")
-    @GetMapping("/list")
-    public Paging<SysTenantPackageVo> list(SysTenantPackageBo bo, PageRequest<?> query) {
-        return tenantPackageService.queryPageList(bo, query);
+    @PostMapping("/list")
+    public Paging<SysTenantPackageVo> list(  PageRequest<SysTenantPackageBo> query) {
+        return tenantPackageService.queryPageList( query);
     }
 
     /**
      * 查询租户套餐下拉选列表
      */
+    @ApiOperation("查询租户套餐下拉选列表")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:list")
-    @GetMapping("/selectList")
+    @PostMapping("/selectList")
     public List<SysTenantPackageVo> selectList() {
         return tenantPackageService.selectList();
     }
@@ -59,6 +63,7 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 导出租户套餐列表
      */
+    @ApiOperation("导出租户套餐列表")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:export")
     @Log(title = "租户套餐", businessType = BusinessType.EXPORT)
@@ -73,9 +78,10 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageId 主键
      */
+    @ApiOperation("获取租户套餐详细信息")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:query")
-    @GetMapping("/{packageId}")
+    @PostMapping("/{packageId}")
     public SysTenantPackageVo getInfo(@NotNull(message = "主键不能为空")
                                       @PathVariable Long packageId) {
         return tenantPackageService.queryById(packageId);
@@ -84,10 +90,11 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 新增租户套餐
      */
+    @ApiOperation("新增租户套餐")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:add")
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/add")
     public void add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
         tenantPackageService.insertByBo(bo);
     }
@@ -95,23 +102,25 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 修改租户套餐
      */
+    @ApiOperation("修改租户套餐")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public void edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) {
-        tenantPackageService.updateByBo(bo);
+    @PostMapping("/edit")
+    public void edit(@Validated(EditGroup.class) @RequestBody Request<SysTenantPackageBo> bo) {
+        tenantPackageService.updateByBo(bo.getData());
     }
 
     /**
      * 状态修改
      */
+    @ApiOperation("状态修改")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
-    public void changeStatus(@RequestBody SysTenantPackageBo bo) {
-        tenantPackageService.updatePackageStatus(bo);
+    @PostMapping("/changeStatus")
+    public void changeStatus(@RequestBody Request<SysTenantPackageBo> bo) {
+        tenantPackageService.updatePackageStatus(bo.getData());
     }
 
     /**
@@ -119,10 +128,11 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageIds 主键串
      */
+    @ApiOperation("删除租户套餐")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:remove")
     @Log(title = "租户套餐", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{packageIds}")
+    @PostMapping("/delete")
     public void remove(@NotEmpty(message = "主键不能为空")
                        @PathVariable Long[] packageIds) {
         tenantPackageService.deleteWithValidByIds(List.of(packageIds), true);

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java

@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -149,7 +150,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("新增用户")
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated(EditGroup.class) @RequestBody Request<SysUserBo> reqUser) {
         SysUserBo user=reqUser.getData();
         if (!userService.checkUserNameUnique(user)) {
@@ -174,7 +175,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("修改用户")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public void edit(@Validated(EditGroup.class) @RequestBody Request<SysUserBo> reqUser) {
         SysUserBo user=reqUser.getData();
         userService.checkUserAllowed(user);
@@ -192,14 +193,14 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      *
-     * @param userIds 角色ID串
      */
     @ApiOperation("删除用户")
     @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public void remove(@PathVariable Long[] userIds) {
-        if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) {
+    @PostMapping("/delete")
+    public void remove(@Validated @RequestBody Request<List<Long>> bo) {
+        List<Long> userIds = bo.getData();
+        if (userIds.contains( LoginHelper.getUserId())) {
             fail("当前用户不能删除");
         }
         userService.deleteUserByIds(userIds);
@@ -211,7 +212,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("重置密码")
     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/resetPwd")
+    @PostMapping("/resetPwd")
     public void resetPwd(@RequestBody @Validated(EditGroup.class)Request<SysUserBo> reqUser) {
         SysUserBo user=reqUser.getData();
         userService.checkUserAllowed(user);
@@ -226,7 +227,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("状态修改")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public void changeStatus(@RequestBody @Validated(EditGroup.class)Request<SysUserBo> reqUser) {
         SysUserBo user=reqUser.getData();
         userService.checkUserAllowed(user);
@@ -241,7 +242,7 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation("根据用户编号获取授权角色")
     @SaCheckPermission("system:user:query")
-    @GetMapping("/authRole/{userId}")
+    @PostMapping("/authRole/{userId}")
     public SysUserInfoVo authRole(@PathVariable Long userId) {
         SysUserVo user = userService.selectUserById(userId);
         List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
@@ -260,7 +261,7 @@ public class SysUserController extends BaseController {
     @ApiOperation("用户授权角色")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authRole")
+    @PostMapping("/authRole")
     public void insertAuthRole(Request<Long> reqUserId, Long[] roleIds) {
         Long userId=reqUserId.getData();
         userService.checkUserDataScope(userId);
@@ -272,7 +273,7 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation("获取部门树列表")
     @SaCheckPermission("system:user:list")
-    @GetMapping("/deptTree")
+    @PostMapping("/deptTree")
     public List<Tree<Long>> deptTree(@RequestBody @Validated(QueryGroup.class) Request<SysDeptBo> reqDept) {
         SysDeptBo dept=reqDept.getData();
         return deptService.selectDeptTreeList(dept);

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserOnlineController.java

@@ -1,6 +1,7 @@
 package cc.iotkit.system.controller;
 
 import cc.iotkit.common.api.Paging;
+import cc.iotkit.common.api.Request;
 import cc.iotkit.common.constant.CacheConstants;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
@@ -17,6 +18,7 @@ import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -36,13 +38,14 @@ public class SysUserOnlineController extends BaseController {
     /**
      * 获取在线用户监控列表
      *
-     * @param ipaddr   IP地址
-     * @param userName 用户名
      */
     @ApiOperation("获取在线用户监控列表")
     @SaCheckPermission("monitor:online:list")
-    @GetMapping("/list")
-    public Paging<SysUserOnline> list(String ipaddr, String userName) {
+    @PostMapping("/list")
+    public Paging<SysUserOnline> list(@RequestBody @Validated Request<SysUserOnline> request) {
+        SysUserOnline data = request.getData();
+        String ipaddr = data.getIpaddr();
+        String userName = data.getUserName();
         // 获取所有未过期的 token
         List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
         List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
@@ -77,15 +80,14 @@ public class SysUserOnlineController extends BaseController {
     /**
      * 强退用户
      *
-     * @param tokenId token值
      */
     @ApiOperation("强退用户")
     @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
-    public void forceLogout(@PathVariable String tokenId) {
+    @PostMapping("/kickoutByTokenValue")
+    public void forceLogout(@RequestBody @Validated Request<String> bo) {
         try {
-            StpUtil.kickoutByTokenValue(tokenId);
+            StpUtil.kickoutByTokenValue(bo.getData());
         } catch (NotLoginException ignored) {
         }
     }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/UserOnlineBo.java

@@ -0,0 +1,44 @@
+package cc.iotkit.system.dto.bo;
+
+import cc.iotkit.common.api.BaseDto;
+import cc.iotkit.common.constant.UserConstants;
+import cc.iotkit.model.system.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户信息业务对象 sys_user
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@NoArgsConstructor
+
+@EqualsAndHashCode(callSuper = true)
+public class UserOnlineBo extends BaseDto {
+
+
+    /**
+     * 用户账号
+     */
+
+    @ApiModelProperty(value = "用户账号")
+    private String ipaddr;
+
+    /**
+     * 用户昵称
+     */
+
+    @ApiModelProperty("用户昵称")
+    private String userName;
+
+
+}

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantPackageService.java

@@ -23,7 +23,7 @@ public interface ISysTenantPackageService {
     /**
      * 查询租户套餐列表
      */
-    Paging<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query);
+    Paging<SysTenantPackageVo> queryPageList( PageRequest<SysTenantPackageBo> query);
 
     /**
      * 查询租户套餐已启用列表

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysTenantService.java

@@ -28,7 +28,7 @@ public interface ISysTenantService {
     /**
      * 查询租户列表
      */
-    Paging<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query);
+    Paging<SysTenantVo> queryPageList(  PageRequest<SysTenantBo> query);
 
     /**
      * 查询租户列表

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysUserService.java

@@ -5,6 +5,7 @@ import cc.iotkit.common.api.Paging;
 import cc.iotkit.system.dto.bo.SysUserBo;
 import cc.iotkit.system.dto.vo.SysUserVo;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,18 +29,16 @@ public interface ISysUserService {
     /**
      * 根据条件分页查询已分配用户角色列表
      *
-     * @param user 用户信息
      * @return 用户信息集合信息
      */
-    Paging<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query);
+    Paging<SysUserVo> selectAllocatedList( PageRequest<SysUserBo> query);
 
     /**
      * 根据条件分页查询未分配用户角色列表
      *
-     * @param user 用户信息
      * @return 用户信息集合信息
      */
-    Paging<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query);
+    Paging<SysUserVo> selectUnallocatedList( PageRequest<SysUserBo> query);
 
     /**
      * 通过用户名查询用户
@@ -200,6 +199,6 @@ public interface ISysUserService {
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    void deleteUserByIds(Long[] userIds);
+    void deleteUserByIds(Collection<Long> userIds);
 
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java

@@ -2,6 +2,7 @@ package cc.iotkit.system.service.impl;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.system.ISysTenantPackageData;
 import cc.iotkit.model.system.SysTenantPackage;
 import cc.iotkit.system.dto.bo.SysTenantPackageBo;
@@ -38,13 +39,14 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
      * 查询租户套餐列表
      */
     @Override
-    public Paging<SysTenantPackageVo> queryPageList(SysTenantPackageBo bo, PageRequest<?> query) {
-        return new Paging<>();
+    public Paging<SysTenantPackageVo> queryPageList( PageRequest<SysTenantPackageBo> query) {
+        return sysTenantPackageData.findAll(query.to(SysTenantPackage.class)).to(SysTenantPackageVo.class);
     }
 
     @Override
     public List<SysTenantPackageVo> selectList() {
-        return new ArrayList<>();
+        List<SysTenantPackage> all = sysTenantPackageData.findAll();
+        return MapstructUtils.convert(all,SysTenantPackageVo.class);
     }
 
     /**
@@ -52,7 +54,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
      */
     @Override
     public List<SysTenantPackageVo> queryList(SysTenantPackageBo bo) {
-        return new ArrayList<>();
+        List<SysTenantPackage> all = sysTenantPackageData.findAllByCondition(bo.to(SysTenantPackage.class));
+        return MapstructUtils.convert(all,SysTenantPackageVo.class);
     }
 
     /**
@@ -61,7 +64,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SysTenantPackageBo bo) {
-        return false;
+        sysTenantPackageData.save(bo.to(SysTenantPackage.class));
+        return true;
     }
 
     /**
@@ -70,7 +74,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(SysTenantPackageBo bo) {
-        return false;
+        sysTenantPackageData.save(bo.to(SysTenantPackage.class));
+        return true;
     }
 
     /**
@@ -90,6 +95,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        return false;
+        sysTenantPackageData.deleteByIds(ids);
+        return true;
     }
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java

@@ -46,8 +46,8 @@ public class SysTenantServiceImpl implements ISysTenantService {
     }
 
     @Override
-    public Paging<SysTenantVo> queryPageList(SysTenantBo bo, PageRequest<?> query) {
-        return null;
+    public Paging<SysTenantVo> queryPageList(PageRequest<SysTenantBo> query) {
+        return sysTenantData.findAll(query.to(SysTenant.class)).to(SysTenantVo.class);
     }
 
     @Override

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -72,12 +73,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     }
 
     @Override
-    public Paging<SysUserVo> selectAllocatedList(SysUserBo user, PageRequest<?> query) {
-        return null;
+    public Paging<SysUserVo> selectAllocatedList( PageRequest<SysUserBo> query) {
+        return sysUserData.selectAllocatedList(query.to(SysUser.class)).to(SysUserVo.class);
     }
 
     @Override
-    public Paging<SysUserVo> selectUnallocatedList(SysUserBo user, PageRequest<?> query) {
+    public Paging<SysUserVo> selectUnallocatedList( PageRequest<SysUserBo> query) {
         return null;
     }
 
@@ -283,7 +284,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     }
 
     @Override
-    public void deleteUserByIds(Long[] userIds) {
-        sysUserData.deleteByIds(List.of(userIds));
+    public void deleteUserByIds(Collection<Long> userIds) {
+        sysUserData.deleteByIds(userIds);
     }
 }