From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/GroupController.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/GroupController.java b/screen-manage/src/main/java/com/moral/api/controller/GroupController.java
index e967b71..72fdbaf 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/GroupController.java
@@ -1,18 +1,20 @@
package com.moral.api.controller;
+import com.moral.api.pojo.dto.group.GroupDTO;
+import com.moral.api.pojo.form.group.AdminGroupUpdateMenuForm;
+import com.moral.api.service.GroupService;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* @ClassName GroupController
* @Description TODO
* @Author ���������
- * @Date 2021/5/11 10:16
+ * @Date 2021/5/13 15:29
* @Version TODO
**/
@Slf4j
@@ -22,15 +24,20 @@
@RequestMapping("/group")
public class GroupController {
- /**
- * @Description: ���admin������������������������
- * @Param: []
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/5/11
- */
- @PostMapping("update")
- public ResultMessage update() {
- return null;
+ @Autowired
+ GroupService groupService;
+
+ @PostMapping("updateAdminGroupMenu")
+ public ResultMessage updateMenu(@RequestBody AdminGroupUpdateMenuForm form) {
+
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ GroupDTO dto = groupService.updateAdminGroupMenu(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
}
--
Gitblit v1.8.0