Browse Source

菜单管理,bug修复

thing_master
xiachao 1 year ago
parent
commit
62f2725864
  1. 5
      modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java
  2. 13
      modules/visual-design/src/main/java/com/thing/visual/group/controller/IotVisualGroupController.java
  3. 19
      modules/visual-design/src/main/java/com/thing/visual/group/dto/AdjustGroupDto.java
  4. 3
      modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java

5
modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java

@ -102,7 +102,6 @@ public class SysMenuController {
@GetMapping("{id}") @GetMapping("{id}")
@Operation(summary="信息") @Operation(summary="信息")
@RequiresPermissions("sys:menu:info")
public Result<SysMenuDTO> get(@PathVariable("id") Long id) { public Result<SysMenuDTO> get(@PathVariable("id") Long id) {
SysMenuDTO data = sysMenuService.get(id); SysMenuDTO data = sysMenuService.get(id);
@ -112,7 +111,6 @@ public class SysMenuController {
@PostMapping @PostMapping
@Operation(summary="保存") @Operation(summary="保存")
@LogOperation("保存") @LogOperation("保存")
@RequiresPermissions("sys:menu:save")
public Result save(@RequestBody SysMenuDTO dto) { public Result save(@RequestBody SysMenuDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class); ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -125,7 +123,6 @@ public class SysMenuController {
@PutMapping @PutMapping
@Operation(summary="修改") @Operation(summary="修改")
@LogOperation("修改") @LogOperation("修改")
@RequiresPermissions("sys:menu:update")
public Result update(@RequestBody SysMenuDTO dto) { public Result update(@RequestBody SysMenuDTO dto) {
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, DefaultGroup.class); ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@ -138,7 +135,6 @@ public class SysMenuController {
@DeleteMapping("{id}") @DeleteMapping("{id}")
@Operation(summary="删除") @Operation(summary="删除")
@LogOperation("删除") @LogOperation("删除")
@RequiresPermissions("sys:menu:delete")
public Result delete(@PathVariable("id") Long id) { public Result delete(@PathVariable("id") Long id) {
//效验数据 //效验数据
AssertUtils.isNull(id, "id"); AssertUtils.isNull(id, "id");
@ -156,7 +152,6 @@ public class SysMenuController {
@GetMapping("select") @GetMapping("select")
@Operation(summary="角色菜单权限") @Operation(summary="角色菜单权限")
@RequiresPermissions("sys:menu:select")
public Result<List<SysMenuDTO>> select() { public Result<List<SysMenuDTO>> select() {
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
List<SysMenuDTO> list = sysMenuService.getUserMenuList(user, null,null); List<SysMenuDTO> list = sysMenuService.getUserMenuList(user, null,null);

13
modules/visual-design/src/main/java/com/thing/visual/group/controller/IotVisualGroupController.java

@ -4,6 +4,7 @@ import com.thing.common.core.constants.Constant;
import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.AssertUtils;
import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.PageData;
import com.thing.common.core.web.response.Result; import com.thing.common.core.web.response.Result;
import com.thing.visual.group.dto.AdjustGroupDto;
import com.thing.visual.group.dto.GroupSortInfo; import com.thing.visual.group.dto.GroupSortInfo;
import com.thing.visual.group.dto.IotVisualGroupDTO; import com.thing.visual.group.dto.IotVisualGroupDTO;
import com.thing.visual.group.service.IotVisualGroupService; import com.thing.visual.group.service.IotVisualGroupService;
@ -81,10 +82,10 @@ public class IotVisualGroupController {
return new Result<GroupSortInfo>().ok(data); return new Result<GroupSortInfo>().ok(data);
} }
// @GetMapping("adjustGroupSort")
// @Operation(summary="调整组排序")
// public Result<String> adjustGroupSort(){
// String data = iotVisualGroupService.adjustGroupSort();
// return new Result<String>().ok(data);
// }
@PostMapping("adjustGroupSort")
@Operation(summary="调整组排序")
public Result<String> adjustGroupSort(@RequestBody AdjustGroupDto dto){
String data = iotVisualGroupService.adjustGroupSort(dto);
return new Result<String>().ok(data);
}
} }

19
modules/visual-design/src/main/java/com/thing/visual/group/dto/AdjustGroupDto.java

@ -0,0 +1,19 @@
package com.thing.visual.group.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@Schema(description = "调整组排序入参对象")
public class AdjustGroupDto {
private String currentName;
private Long currentSort;
private String upName;
private String upSort;
}

3
modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java

@ -1,6 +1,7 @@
package com.thing.visual.group.service; package com.thing.visual.group.service;
import com.thing.common.orm.service.IBaseService; import com.thing.common.orm.service.IBaseService;
import com.thing.visual.group.dto.AdjustGroupDto;
import com.thing.visual.group.dto.GroupSortInfo; import com.thing.visual.group.dto.GroupSortInfo;
import com.thing.visual.group.dto.IotVisualGroupDTO; import com.thing.visual.group.dto.IotVisualGroupDTO;
import com.thing.visual.group.entity.IotVisualGroupEntity; import com.thing.visual.group.entity.IotVisualGroupEntity;
@ -18,4 +19,6 @@ public interface IotVisualGroupService extends IBaseService<IotVisualGroupEntity
void updateIotVisualGroupDTO(IotVisualGroupDTO dto); void updateIotVisualGroupDTO(IotVisualGroupDTO dto);
GroupSortInfo groupSortInfo(String name); GroupSortInfo groupSortInfo(String name);
String adjustGroupSort(AdjustGroupDto dto);
} }
Loading…
Cancel
Save