From 62f27258640f028aed5ef88948dfb96c2e56f268 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Fri, 23 Aug 2024 14:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=EF=BC=8Cbu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/biz/controller/SysMenuController.java |  5 -----
 .../controller/IotVisualGroupController.java  | 13 +++++++------
 .../visual/group/dto/AdjustGroupDto.java      | 19 +++++++++++++++++++
 .../group/service/IotVisualGroupService.java  |  3 +++
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 modules/visual-design/src/main/java/com/thing/visual/group/dto/AdjustGroupDto.java

diff --git a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java
index 13f54ed..26e3145 100644
--- a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java
+++ b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysMenuController.java
@@ -102,7 +102,6 @@ public class SysMenuController {
 
     @GetMapping("{id}")
     @Operation(summary="信息")
-    @RequiresPermissions("sys:menu:info")
     public Result<SysMenuDTO> get(@PathVariable("id") Long id) {
         SysMenuDTO data = sysMenuService.get(id);
 
@@ -112,7 +111,6 @@ public class SysMenuController {
     @PostMapping
     @Operation(summary="保存")
     @LogOperation("保存")
-    @RequiresPermissions("sys:menu:save")
     public Result save(@RequestBody SysMenuDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@@ -125,7 +123,6 @@ public class SysMenuController {
     @PutMapping
     @Operation(summary="修改")
     @LogOperation("修改")
-    @RequiresPermissions("sys:menu:update")
     public Result update(@RequestBody SysMenuDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, DefaultGroup.class);
@@ -138,7 +135,6 @@ public class SysMenuController {
     @DeleteMapping("{id}")
     @Operation(summary="删除")
     @LogOperation("删除")
-    @RequiresPermissions("sys:menu:delete")
     public Result delete(@PathVariable("id") Long id) {
         //效验数据
         AssertUtils.isNull(id, "id");
@@ -156,7 +152,6 @@ public class SysMenuController {
 
     @GetMapping("select")
     @Operation(summary="角色菜单权限")
-    @RequiresPermissions("sys:menu:select")
     public Result<List<SysMenuDTO>> select() {
         UserDetail user = SecurityUser.getUser();
         List<SysMenuDTO> list = sysMenuService.getUserMenuList(user, null,null);
diff --git a/modules/visual-design/src/main/java/com/thing/visual/group/controller/IotVisualGroupController.java b/modules/visual-design/src/main/java/com/thing/visual/group/controller/IotVisualGroupController.java
index 1815410..d09d801 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/group/controller/IotVisualGroupController.java
+++ b/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.web.response.PageData;
 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.IotVisualGroupDTO;
 import com.thing.visual.group.service.IotVisualGroupService;
@@ -81,10 +82,10 @@ public class IotVisualGroupController {
         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);
+    }
 }
\ No newline at end of file
diff --git a/modules/visual-design/src/main/java/com/thing/visual/group/dto/AdjustGroupDto.java b/modules/visual-design/src/main/java/com/thing/visual/group/dto/AdjustGroupDto.java
new file mode 100644
index 0000000..2b780c3
--- /dev/null
+++ b/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;
+
+}
diff --git a/modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java b/modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java
index 431caec..6c4e003 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/group/service/IotVisualGroupService.java
@@ -1,6 +1,7 @@
 package com.thing.visual.group.service;
 
 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.IotVisualGroupDTO;
 import com.thing.visual.group.entity.IotVisualGroupEntity;
@@ -18,4 +19,6 @@ public interface IotVisualGroupService extends IBaseService<IotVisualGroupEntity
     void updateIotVisualGroupDTO(IotVisualGroupDTO dto);
 
     GroupSortInfo groupSortInfo(String name);
+
+    String adjustGroupSort(AdjustGroupDto dto);
 }
\ No newline at end of file