Browse Source

refactor 接口

jay 2 years ago
parent
commit
2c4e7d808d

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

@@ -74,7 +74,7 @@ public class SysDictTypeController extends BaseController {
     @ApiOperation(value = "新增字典类型", notes = "新增字典类型")
     @ApiOperation(value = "新增字典类型", notes = "新增字典类型")
     @SaCheckPermission("system:dict:add")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody SysDictTypeBo dict) {
     public void add(@Validated @RequestBody SysDictTypeBo dict) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
             fail("新增字典'" + dict.getDictName() + "'失败,字典类型已存在");
             fail("新增字典'" + dict.getDictName() + "'失败,字典类型已存在");

+ 4 - 4
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysMenuController.java

@@ -74,9 +74,9 @@ public class SysMenuController extends BaseController {
             TenantConstants.TENANT_ADMIN_ROLE_KEY
             TenantConstants.TENANT_ADMIN_ROLE_KEY
     }, mode = SaMode.OR)
     }, mode = SaMode.OR)
     @SaCheckPermission("system:menu:query")
     @SaCheckPermission("system:menu:query")
-    @PostMapping(value = "/{menuId}")
-    public SysMenuVo getInfo(@PathVariable Long menuId) {
-        return menuService.selectMenuById(menuId);
+    @PostMapping(value = "/getDetail")
+    public SysMenuVo getInfo(@PathVariable Request<Long> menuId) {
+        return menuService.selectMenuById(menuId.getData());
     }
     }
 
 
     /**
     /**
@@ -120,7 +120,7 @@ public class SysMenuController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:menu:add")
     @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody Request<SysMenuBo> bo) {
     public void add(@Validated @RequestBody Request<SysMenuBo> bo) {
         SysMenuBo menu = bo.getData();
         SysMenuBo menu = bo.getData();
         if (!menuService.checkMenuNameUnique(menu)) {
         if (!menuService.checkMenuNameUnique(menu)) {

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java

@@ -58,7 +58,7 @@ public class SysNoticeController extends BaseController {
     @ApiOperation(value = "新增通知公告", notes = "新增通知公告")
     @ApiOperation(value = "新增通知公告", notes = "新增通知公告")
     @SaCheckPermission("system:notice:add")
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody Request<SysNoticeBo> bo) {
     public void add(@Validated @RequestBody Request<SysNoticeBo> bo) {
         noticeService.insertNotice(bo.getData());
         noticeService.insertNotice(bo.getData());
     }
     }

+ 1 - 1
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java

@@ -66,7 +66,7 @@ public class SysOssConfigController extends BaseController {
     @ApiOperation(value = "新增对象存储配置", notes = "新增对象存储配置")
     @ApiOperation(value = "新增对象存储配置", notes = "新增对象存储配置")
     @SaCheckPermission("system:oss:add")
     @SaCheckPermission("system:oss:add")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/add")
     public void add(@Validated(AddGroup.class) @RequestBody Request<SysOssConfigBo> bo) {
     public void add(@Validated(AddGroup.class) @RequestBody Request<SysOssConfigBo> bo) {
         ossConfigService.insertByBo(bo.getData());
         ossConfigService.insertByBo(bo.getData());
     }
     }

+ 2 - 2
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java

@@ -66,7 +66,7 @@ public class SysPostController extends BaseController {
      */
      */
     @ApiOperation("根据岗位编号获取详细信息")
     @ApiOperation("根据岗位编号获取详细信息")
     @SaCheckPermission("system:post:query")
     @SaCheckPermission("system:post:query")
-    @PostMapping(value = "/{postId}")
+    @PostMapping(value = "/getDetail")
     public SysPostVo getInfo(@PathVariable Request<Long> postId) {
     public SysPostVo getInfo(@PathVariable Request<Long> postId) {
         return postService.selectPostById(postId.getData());
         return postService.selectPostById(postId.getData());
     }
     }
@@ -77,7 +77,7 @@ public class SysPostController extends BaseController {
     @ApiOperation("新增岗位")
     @ApiOperation("新增岗位")
     @SaCheckPermission("system:post:add")
     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@RequestBody @Validated(EditGroup.class)Request<SysPostBo> post) {
     public void add(@RequestBody @Validated(EditGroup.class)Request<SysPostBo> post) {
         if (!postService.checkPostNameUnique(post.getData())) {
         if (!postService.checkPostNameUnique(post.getData())) {
             fail("新增岗位'" + post.getData().getPostName() + "'失败,岗位名称已存在");
             fail("新增岗位'" + post.getData().getPostName() + "'失败,岗位名称已存在");

+ 2 - 2
iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysProfileController.java

@@ -47,7 +47,7 @@ public class SysProfileController extends BaseController {
      */
      */
 
 
     @ApiOperation(value = "个人信息", notes = "个人信息")
     @ApiOperation(value = "个人信息", notes = "个人信息")
-    @PostMapping
+    @PostMapping("/getDeail")
     public ProfileVo profile() {
     public ProfileVo profile() {
         SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
         SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
         ProfileVo profileVo = new ProfileVo();
         ProfileVo profileVo = new ProfileVo();
@@ -62,7 +62,7 @@ public class SysProfileController extends BaseController {
      */
      */
     @ApiOperation(value = "修改用户", notes = "修改用户")
     @ApiOperation(value = "修改用户", notes = "修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PostMapping
+    @PostMapping("/updateProfile")
     public void updateProfile(@RequestBody Request<SysUserProfileBo> bo) {
     public void updateProfile(@RequestBody Request<SysUserProfileBo> bo) {
         SysUserProfileBo profile = bo.getData();
         SysUserProfileBo profile = bo.getData();
         SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
         SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);

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

@@ -82,7 +82,7 @@ public class SysRoleController extends BaseController {
     @ApiOperation(value = "新增角色", notes = "新增角色")
     @ApiOperation(value = "新增角色", notes = "新增角色")
     @SaCheckPermission("system:role:add")
     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public void add(@Validated @RequestBody Request<SysRoleBo> bo) {
     public void add(@Validated @RequestBody Request<SysRoleBo> bo) {
         SysRoleBo role = bo.getData();
         SysRoleBo role = bo.getData();
 
 
@@ -101,7 +101,7 @@ public class SysRoleController extends BaseController {
     @ApiOperation(value = "修改保存角色", notes = "修改保存角色")
     @ApiOperation(value = "修改保存角色", notes = "修改保存角色")
     @SaCheckPermission("system:role:edit")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PostMapping
+    @PostMapping("/edit")
     public void edit(@Validated @RequestBody Request<SysRoleBo> bo) {
     public void edit(@Validated @RequestBody Request<SysRoleBo> bo) {
         SysRoleBo role = bo.getData();
         SysRoleBo role = bo.getData();
 
 

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

@@ -81,7 +81,7 @@ public class SysTenantPackageController extends BaseController {
     @ApiOperation("获取租户套餐详细信息")
     @ApiOperation("获取租户套餐详细信息")
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:query")
     @SaCheckPermission("system:tenantPackage:query")
-    @PostMapping("/{packageId}")
+    @PostMapping("/getInfo")
     public SysTenantPackageVo getInfo(@NotNull(message = "主键不能为空")
     public SysTenantPackageVo getInfo(@NotNull(message = "主键不能为空")
                                       @PathVariable Long packageId) {
                                       @PathVariable Long packageId) {
         return tenantPackageService.queryById(packageId);
         return tenantPackageService.queryById(packageId);
@@ -95,8 +95,8 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckPermission("system:tenantPackage:add")
     @SaCheckPermission("system:tenantPackage:add")
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @PostMapping("/add")
-    public void add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
-        tenantPackageService.insertByBo(bo);
+    public void add(@Validated(AddGroup.class) @RequestBody Request<SysTenantPackageBo> bo) {
+        tenantPackageService.insertByBo(bo.getData());
     }
     }
 
 
     /**
     /**