From de2abff4377c9ee83161c954a51de4c9390fff76 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 18:34:21 +0900
Subject: [PATCH] 프로필에 내 사용자 등급/부서 표시
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 47e33bb..f209240 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -12,12 +12,12 @@
import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserMapper;
+import kr.wisestone.owl.repository.DepartmentRepository;
import kr.wisestone.owl.repository.UserRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
-import kr.wisestone.owl.web.form.DepartmentManageForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
@@ -56,10 +56,13 @@
private UserRepository userRepository;
@Autowired
+ private DepartmentRepository departmentRepository;
+
+ @Autowired
private UserLevelService userLevelService;
@Autowired
- private DepartmentManageService departmentManageService;
+ private DepartmentService departmentService;
@Autowired
private SystemRoleService systemRoleService;
@@ -87,6 +90,9 @@
@Autowired
private ProjectService projectService;
+
+ @Autowired
+ private IssueTypeService issueTypeService;
@Autowired
private UserSecurityService userSecurityService;
@@ -232,6 +238,13 @@
/*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
+
+ /*DepartmentForm departmentForm = new DepartmentForm();
+
+ departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
+ Department department = this.departmentService.add(departmentForm);
+ this.departmentRepository.saveAndFlush(department);*/
+
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
UserLevel userLevel = this.userLevelService.addSuperUserLevel();
@@ -241,21 +254,16 @@
this.userLevelService.addNormalUserLevel();
- // DepartmentManage�뿉 �엫�떆濡� Name, Description 媛� 異붽�
- DepartmentManageForm departmentManageForm = new DepartmentManageForm();
-
- departmentManageForm.setDepartmentName("媛쒕컻��");
- departmentManageForm.setDepartmentDescription("�쎒�궗�씠�듃 諛� �빋 �꽌鍮꾩뒪 媛쒕컻");
- DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm);
- user.setDepartmentManage(departmentManage);
-
if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {
// �뾽臾� 怨듦컙瑜� �깮�꽦�븳�떎. 媛��엯�븳 �궗�슜�옄�뒗 �뾽臾� 怨듦컙�쓽 二쇱씤�씠�떎.
Workspace workspace = this.workspaceService.addWorkspace(userForm.getWorkspaceName());
this.userWorkspaceService.addUserWorkspace(user, workspace, true, true);
// 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃瑜� �깮�꽦�븳�떎.
-// this.projectService.addDefaultProject(user, workspace);
+ this.projectService.addDefaultProject(user, workspace);
+
+ // 湲곕낯�쑝濡� �젣怨듬릺�뒗 �봽濡쒖젥�듃瑜� �씠�뒋 �쑀�삎�쓽 �궗�슜 �봽濡쒖젥�듃濡� �꽕�젙
+ this.issueTypeService.addDefaultUsedProject(workspace);
user.setLastWorkspaceId(workspace.getId());
@@ -538,8 +546,12 @@
User user = this.getUser(userCondition.getId());
userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
- }
+ Map<String, Object> projectManagerYN = this.projectRoleUserService.findProjectManager((userCondition.getId()));
+ if(projectManagerYN != null){
+ userVo.setProjectManagerYN(true);
+ }
+ }
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
}
@@ -946,6 +958,15 @@
return this.convertUserVoToMap(results, totalUsersCount, pageable, resJsonData);
}
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public void findMyLevelAndDepartment(Map<String, Object> resJsonData) {
+ Long loginId = this.webAppUtil.getLoginId();
+ Map<String, Object> result = this.userMapper.findByMyLevelAndDepartment(loginId);
+ resJsonData.put(Constants.RES_KEY_CONTENTS, result);
+ }
+
// �궗�슜�옄 �븘�씠�뵒濡� �궗�슜�옄瑜� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
@@ -1061,6 +1082,30 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
}
+ // 留덉�留됱쑝濡� �꽑�깮�븳 �씠�뒋 ���엯 �젙蹂대�� ���옣�븳�떎.
+ @Override
+ @Transactional
+ public void updateLastIssueType(Map<String, Object> resJsonData, UserForm userForm) {
+ User user = this.getUser(this.webAppUtil.getLoginId());
+
+ if (userForm.getLastIssueTypeId() != null) {
+ user.setLastIssueTypeId(userForm.getLastIssueTypeId());
+ }
+
+ this.userRepository.saveAndFlush(user);
+ // �꽭�뀡 �뾽�뜲�씠�듃
+ SecurityUtils.setUserToSession(user);
+ // �겢�씪�씠�뼵�듃�쓽 �궗�슜�옄 �젙蹂� �뾽�뜲�씠�듃
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
+
+ if (user.getSocialType() != null) {
+ userVo.setSocialType(user.getSocialType().toString());
+ }
+
+ userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
+ }
// �듅�젙 �븘�씠�뵒�뿉 �빐�떦�븯�뒗 �궗�슜�옄 紐⑸줉�쓣 媛��졇�삩�떎.
@Override
@Transactional(readOnly = true)
@@ -1196,7 +1241,7 @@
@Transactional(readOnly = true)
public User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest) {
User user = this.getUser(this.webAppUtil.getLoginId());
- UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission"); // wyu - ignores permission ??
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
@@ -1234,6 +1279,22 @@
return results;
}
+ // �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쓣 �떎�떆媛꾩쑝濡� �꽕�젙�븳 �궗�슜�옄瑜� 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public List<String> findByRealTimeNotifyTime() {
+ Map<String, Object> conditions = new HashMap<>();
+
+ List<Map<String, Object>> users = this.userMapper.findByRealTimeNotifyTime(conditions);
+ List<String> results = Lists.newArrayList();
+
+ for (Map<String, Object> user : users) {
+ results.add(MapUtil.getString(user, "account"));
+ }
+
+ return results;
+ }
+
// �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 �궗�슜�옄 �젙蹂대�� 議고쉶�븳�떎.
@Override
@Transactional(readOnly = true)
--
Gitblit v1.8.0