From 0ef8f55cca9b7c140a5689bff08f1ac1bf79a7f8 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 10:42:22 +0900
Subject: [PATCH] 회원가입 환영 메일 안 가게 설정
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 9 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 71fe386..9197d24 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -18,7 +18,6 @@
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.UserCondition;
-import kr.wisestone.owl.web.form.DepartmentForm;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.validator.routines.EmailValidator;
@@ -93,6 +92,9 @@
private ProjectService projectService;
@Autowired
+ private IssueTypeService issueTypeService;
+
+ @Autowired
private UserSecurityService userSecurityService;
@Autowired
@@ -103,6 +105,9 @@
@Autowired
private AttachedFileService attachedFileService;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
@Autowired
private IssueService issueService;
@@ -166,6 +171,9 @@
@Value("${total.statistics.email}")
private String totalStatisticsEmail; // �봽濡쒖젥�듃, �씠�뒋, �궗�슜�옄�닔 �븣由�
+
+ @Value("${email.joinEmail}")
+ private boolean bJoinEmail;
@Autowired
private ExcelView excelView;
@@ -237,11 +245,11 @@
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
- DepartmentForm departmentForm = new DepartmentForm();
+ /*DepartmentForm departmentForm = new DepartmentForm();
departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
Department department = this.departmentService.add(departmentForm);
- this.departmentRepository.saveAndFlush(department);
+ this.departmentRepository.saveAndFlush(department);*/
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
@@ -258,7 +266,10 @@
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());
@@ -284,8 +295,9 @@
userMap.put("registerDate", DateUtil.convertDateToYYYYMMDD(user.getRegisterDate()));
// �쉶�썝 媛��엯 �븣由� 硫붿씪 �쟾�넚
- this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
-
+ if(bJoinEmail) {
+ this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
+ }
return user;
}
@@ -541,8 +553,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);
}
@@ -949,6 +965,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)
@@ -1064,6 +1089,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)
@@ -1199,10 +1248,19 @@
@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");
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
- userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
+
+ UserLevel userLevel = user.getUserLevel();
+ if (userLevel != null) {
+ userVo.setLevelName(userLevel.getLevelName());
+ }
+
+ List<Department> departments = this.userDepartmentService.findDepartment(user.getId());
+ if (departments != null) {
+ userVo.setDepartmentVos(ConvertUtil.convertObjectsToClasses(departments, DepartmentVo.class));
+ }
resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
// �궗�슜�옄 �꽭�뀡 �젙蹂대�� 遺꾩꽍�빐�꽌 濡쒓렇�뿉 �궓湲대떎.
log.info(ElasticSearchUtil.makeUserSessionHistoryMessage(httpServletRequest, userVo));
@@ -1237,6 +1295,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