From 8abf5efd48aba1cfc101966bd4f420e463d41dcd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 03 11월 2021 20:47:54 +0900
Subject: [PATCH] defaultYn 추가 basicUser 추가 엑셀, 상세조회 진행중 일반회원 조회 추가 V1_10 Table 변경(데이터 삭제후 진행)
---
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 149 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 132 insertions(+), 17 deletions(-)
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 23a7a91..b721a16 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -1,32 +1,40 @@
package kr.wisestone.owl.service.impl;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MngPermission;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.User;
-import kr.wisestone.owl.domain.UserLevel;
+import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserLevelMapper;
import kr.wisestone.owl.mapper.UserMapper;
import kr.wisestone.owl.repository.UserLevelRepository;
import kr.wisestone.owl.service.UserLevelService;
import kr.wisestone.owl.service.UserService;
+import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.vo.ResPage;
-import kr.wisestone.owl.vo.UserLevelVo;
-import kr.wisestone.owl.vo.UserVo;
+import kr.wisestone.owl.vo.*;
+import kr.wisestone.owl.web.condition.IssueStatusCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
+import kr.wisestone.owl.web.condition.WorkflowCondition;
import kr.wisestone.owl.web.form.ManageUserForm;
+import kr.wisestone.owl.web.form.ProjectForm;
import kr.wisestone.owl.web.form.UserLevelForm;
+import kr.wisestone.owl.web.view.ExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.ModelAndView;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,6 +50,18 @@
@Autowired
private UserService userService;
+ @Autowired
+ private UserLevelService userLevelService;
+
+ @Autowired
+ private WorkspaceService workspaceService;
+
+ @Autowired
+ private ExcelView excelView;
+
+ @Autowired
+ private ExcelConditionCheck excelConditionCheck;
+
@Override
protected JpaRepository<UserLevel, Long> getRepository() {
return this.userLevelRepository;
@@ -55,22 +75,34 @@
userLevelRepository.saveAndFlush(userLevel);
return userLevel;
}
-
- // 理쒓퀬愿�由ъ옄 �벑湲� 異붽�
@Override
public UserLevel addSuperUserLevel() {
- UserLevel userLevel = new UserLevel();
- userLevel.setLevelName("理쒓퀬愿�由ъ옄");
- userLevel.setPermission(MngPermission.makeAllPermission());
+ return addUserLevel("理쒓퀬愿�由ъ옄", MngPermission.makeAllPermission(),"Y", "N");
+ }
- userLevel = userLevelRepository.saveAndFlush(userLevel);
- return userLevel;
+ public UserLevel addNormalUserLevel() {
+ return addUserLevel("�씪諛섑쉶�썝", 0,"Y" , "Y");
+ }
+
+ public UserLevel addNormalAdminUserLevel() {
+ return addUserLevel("�씪諛섍�由ъ옄", MngPermission.makeSubAllPermission(),"N", "N");
+ }
+
+ // �궗�슜�옄 �벑湲� 異붽�
+ public UserLevel addUserLevel(String name, Integer permission, String defaultYn, String basicUser) {
+ UserLevel userLevel = new UserLevel();
+ userLevel.setLevelName(name);
+ userLevel.setPermission(permission);
+ userLevel.setDefaultYn(defaultYn);
+ userLevel.setBasicUser(basicUser);
+
+ return userLevelRepository.saveAndFlush(userLevel);
}
// �궗�슜�옄 �벑湲� 紐⑸줉�쓣 媛��졇�삩�떎.
@Override
public List<UserLevelVo> findUser(Map<String, Object> resJsonData,
- UserLevelCondition condition, Pageable pageable) {
+ UserLevelCondition condition, Pageable pageable) {
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
@@ -80,19 +112,72 @@
return this.convertUserLevelVoToMap(results, totalUsersCount, pageable, resJsonData);
}
+
+ // �궗�슜�옄 �벑湲� ID濡� 議고쉶�븳�떎.
+ @Override
+ public UserLevel getUserLevel(Long id) {
+ if (id == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_NOT_EXIST));
+ }
+
+ UserLevel userLevel = this.findOne(id);
+
+ if (userLevel == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_NOT_EXIST));
+ }
+
+ return userLevel;
+ }
+
+ @Override
+ public UserLevel getBasicUserLevel() {
+ List<UserLevel> userLevels = userLevelRepository.findByBasicUser("Y");
+ if (userLevels.size() > 0) {
+ return userLevels.get(0);
+ }
+ return null;
+ }
+
+ // �궗�슜�옄 �벑湲� �긽�꽭 議고쉶�븳�떎.
+ @Override
+ public void detailUserLevel(Map<String, Object> resJsonData, UserLevelCondition userLevelCondition) {
+ UserLevelVo userLevelVo = new UserLevelVo();
+
+ if (userLevelCondition.getId() != null) {
+ UserLevel userLevel = this.getUserLevel(userLevelCondition.getId());
+ userLevelVo = ConvertUtil.copyProperties(userLevel, UserLevelVo.class);
+ }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, userLevelVo);
+ }
+
+
// �궗�슜�옄 �벑湲� �젙蹂대�� �닔�젙�븳�떎.
@Override
public void modifyUserLevel(UserLevelForm userLevelForm) {
- userLevelForm.makePermission();
- UserLevel userLevel = ConvertUtil.copyProperties(userLevelForm, UserLevel.class);
- userLevelRepository.saveAndFlush(userLevel);
+ if (userLevelForm.getId() == 1){ // �궗�슜�옄 �벑湲됱씠 理쒓퀬愿�由ъ옄�씠�뼱�빞留� �젙蹂대�� �닔�젙�븷�닔 �엳�떎.
+ userLevelForm.makePermission();
+ UserLevel userLevel = ConvertUtil.copyProperties(userLevelForm, UserLevel.class);
+ userLevelRepository.saveAndFlush(userLevel);
+ } else {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_PERMISSION_DENIED));
+ }
}
+ // �궗�슜�옄 �벑湲됱쓣 �궘�젣�븳�떎.
@Override
public void removeUserLevel(UserLevelForm userLevelForm) {
if (userLevelForm.getRemoveIds().size() < 1) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
+ }
+
+ // 湲곕낯 �궗�슜�옄 �벑湲� �궘�젣 泥댄겕
+ if (userLevelForm.getDefaultYn() == "Y") {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_NOT_DELETE));
}
for (Long id : userLevelForm.getRemoveIds()) {
@@ -103,9 +188,9 @@
this.messageAccessor.getMessage(MsgConstants.USER_LEVEL_ALREADY_IN_USE));
}
}
-
this.userLevelRepository.flush();
}
+
// 寃��깋 寃곌낵瑜� UserLevelVo 濡� 蹂��솚�븳�떎.
private List<UserLevelVo> convertUserLevelVoToMap(List<Map<String, Object>> results, Long totalUsersCount, Pageable pageable, Map<String, Object> resJsonData) {
@@ -126,4 +211,34 @@
return userLevelVos;
}
+ // �궗�슜�옄 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ @Override
+ public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
+ ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ Map<String, Object> conditions = new HashMap<>();
+ // �뿊�� �떎�슫濡쒕뱶�뿉 �븘�슂�븳 寃��깋 議곌굔 �젙蹂대�� 異붿텧�븯怨� 寃��깋 議곌굔 異붿텧�뿉 �삤瑜섍� 諛쒖깮�븯硫� 寃쎄퀬瑜� �몴�떆�빐以��떎.
+ modelAndView = this.excelConditionCheck.checkCondition(conditions, request, model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ UserLevelCondition userLevelCondition = UserLevelCondition.make(conditions);
+ userLevelCondition.setLevelName(this.userLevelService.getUserLevel(this.webAppUtil.getLoginId()).getLevelName());
+ List<Map<String, Object>> results = this.userLevelMapper.find(userLevelCondition);
+ List<UserLevelVo> userLevelVos = ConvertUtil.convertListToListClass(results, UserLevelVo.class);
+
+ ExportExcelVo excelInfo = new ExportExcelVo();
+ excelInfo.setFileName(this.messageAccessor.message("�궗�슜�옄 紐⑸줉"));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("levelName", "�벑湲됰챸", 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.setDatas(userLevelVos);
+
+ model.addAttribute(Constants.EXCEL, excelInfo);
+ return new ModelAndView(this.excelView);
+ }
+
+
}
--
Gitblit v1.8.0