From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
index 09bdbb8..ef389cb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserDepartmentServiceImpl.java
@@ -5,17 +5,19 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
+import kr.wisestone.owl.mapper.UserMapper;
import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.DepartmentService;
import kr.wisestone.owl.service.UserDepartmentService;
+import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.vo.*;
-import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
-import kr.wisestone.owl.web.condition.UserDepartmentCondition;
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -28,6 +30,12 @@
@Autowired
private DepartmentService departmentService;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private SimpMessagingTemplate simpMessagingTemplate;
@Override
protected JpaRepository<UserDepartment, Long> getRepository() {
@@ -72,6 +80,7 @@
@Override
public void userDepartmentModify(UserDepartmentForm userDepartmentForm) {
Long userId = userDepartmentForm.getUserId();
+ User user = this.userService.getUser(userId);
// 湲곗〈 �뜲�씠�꽣 �궘�젣
this.userDepartmentRepository.removeByUserId(userId);
@@ -85,10 +94,33 @@
list.add(userDepartment);
}
-
this.userDepartmentRepository.saveAll(list);
+
+ // 遺��꽌 蹂�寃� �맂 �쑀�� 濡쒓렇�븘�썐 �떆�궎湲�
+ this.simpMessagingTemplate.convertAndSendToUser(user.getAccount(), "/notification/changeUserDepartment", this.messageAccessor.getMessage(MsgConstants.USER_DEPARTMENT_CHANGE));
+ // �꽭�뀡 �뾽�뜲�씠�듃
+ //SecurityUtils.setUserToSession(user);
}
+ @Override
+ public List<UserDepartment> findByDepartmentId(Long id) {
+ return this.userDepartmentRepository.findByDepartmentId(id);
+ }
+
+ @Override
+ public List<Department> findDepartment(Long userId) {
+ List<UserDepartment> userDepartments = this.userDepartmentRepository.findByUserId(userId);
+ if (userDepartments != null && userDepartments.size() > 0) {
+
+ List<Department> departments = Lists.newArrayList();
+ for (UserDepartment userDepartment : userDepartments) {
+ Department department = this.departmentService.getDepartment(userDepartment.getDepartmentId());
+ departments.add(department);
+ }
+ return departments;
+ }
+ return null;
+ }
// �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
// @Override
--
Gitblit v1.8.0