From 48fc1ca070da39739e35fa573d8c51e47cc694b9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 04 11월 2021 14:42:00 +0900
Subject: [PATCH] 사용자 등급 권한 수정 변경
---
src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java | 6 ++++--
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 12 ++++++------
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 20 ++++++++++++++++++++
src/main/java/kr/wisestone/owl/service/UserLevelService.java | 3 +++
4 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/UserLevelService.java b/src/main/java/kr/wisestone/owl/service/UserLevelService.java
index 365996e..dd2c965 100644
--- a/src/main/java/kr/wisestone/owl/service/UserLevelService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserLevelService.java
@@ -5,6 +5,7 @@
import kr.wisestone.owl.vo.UserLevelVo;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
+import kr.wisestone.owl.web.form.ManageUserForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.data.domain.Pageable;
@@ -40,4 +41,6 @@
void detailUserLevel(Map<String, Object> resJsonData, UserLevelCondition make);
ModelAndView downloadExcel(HttpServletRequest request, Model model);
+
+ void modifyLevelPermission(UserLevelForm userLevelForm);
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
index f1c5faa..a35c05c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -255,5 +255,25 @@
return new ModelAndView(this.excelView);
}
+ // �궗�슜�옄 �벑湲� �긽�깭瑜� 蹂�寃쏀븳�떎.
+ @Override
+ public void modifyLevelPermission(UserLevelForm userLevelForm) {
+ int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermEvent(), MngPermission.USER_PERMISSION_MNG_EVENT);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermGuide(), MngPermission.USER_PERMISSION_MNG_GUIDE);
+
+ UserLevel userLevel = userLevelService.getUserLevel(userLevelForm.getId());
+ /* user.setPermission(newPermission);*/
+
+ userLevel.setPermission(newPermission);
+ this.userLevelRepository.saveAndFlush(userLevel);
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
index aaebf39..93bedf9 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
@@ -8,6 +8,7 @@
import kr.wisestone.owl.web.condition.NoticeCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
+import kr.wisestone.owl.web.form.ManageUserForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,8 +75,8 @@
@ResponseBody
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.userLevelService.modifyUserLevel(UserLevelForm.make(content));
+
+ this.userLevelService.modifyLevelPermission(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -100,6 +101,7 @@
return this.userLevelService.downloadExcel(request, model);
}
+
/*// �씠踰ㅽ듃 �떦泥⑥옄 �뿊�� �떎�슫濡쒕뱶
@RequestMapping(value = "/user/downloadExcelEvent", method = RequestMethod.POST)
public ModelAndView downloadExcelEvent(HttpServletRequest request, Model model) {
diff --git a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
index 57cab6a..f78a811 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -21,7 +21,7 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
- public Boolean permWorkspaceSetting;
+ public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
public Boolean permApi;
@@ -85,12 +85,12 @@
this.basicUser = basicUser;
}
- public Boolean getPermWorkspaceSetting() {
- return permWorkspaceSetting;
+ public Boolean getPermWorkSpaceSetting() {
+ return permWorkSpaceSetting;
}
- public void setPermWorkspaceSetting(Boolean permWorkspaceSetting) {
- this.permWorkspaceSetting = permWorkspaceSetting;
+ public void setPermWorkSpaceSetting(Boolean permWorkSpaceSetting) {
+ this.permWorkSpaceSetting = permWorkSpaceSetting;
}
public Boolean getPermProjectSetting() {
@@ -168,7 +168,7 @@
public void makePermission() {
this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
- this.permission |= MngPermission.makePermission(getPermWorkspaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+ this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
--
Gitblit v1.8.0