부서관리 테이블 변경 및 언어팩 수정

wyu

2021-11-05 a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a

 src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java

@@ -2,15 +2,11 @@

import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.UserWorkspace;
import kr.wisestone.owl.domain.Workspace;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserWorkspaceMapper;
import kr.wisestone.owl.repository.UserWorkspaceRepository;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.service.UserWorkspaceService;
import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.ResPage;
@@ -39,6 +35,12 @@

    @Autowired
    private UserService userService;

    @Autowired
    private UserLevelService userLevelService;

    @Autowired
    private DepartmentManageService departmentManageService;

    @Autowired
    private UserWorkspaceMapper userWorkspaceMapper;
@@ -80,12 +82,12 @@
        condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
        condition.setPageSize(pageable.getPageSize());
        condition.setWorkspaceId(myWorkspace.getId());
        condition.setAccount(CommonUtil.encryptAES128(condition.getAccount()));
        condition.setAccount(CommonUtil.encryptAES128(condition.getAccount())); //계정 암호화(필수 동작)

        List<Map<String, Object>> results = this.userWorkspaceMapper.find(condition);
        Long totalCount = this.userWorkspaceMapper.count(condition);
        int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
        List<UserWorkspaceVo> userWorkspaceVos = ConvertUtil.convertListToListClass(results, UserWorkspaceVo.class);
        List<UserWorkspaceVo> userWorkspaceVos = ConvertUtil.convertListToListClass(results, UserWorkspaceVo.class); //UserWorkspace의 데이터를 리스트 형식으로 복사해서 UserWorkspaceVo에 담기

        for (UserWorkspaceVo userWorkspaceVo : userWorkspaceVos) {
            userWorkspaceVo.setAccount(CommonUtil.decryptAES128(userWorkspaceVo.getAccount()));
@@ -104,32 +106,51 @@
    public void modifyUserWorkspace(UserWorkspaceForm userWorkspaceForm) {
        UserWorkspace userWorkspace = this.getUserWorkspace(userWorkspaceForm.getId());

        //  참여로 상태를 변경하려고 할때
        if (!userWorkspace.getUseYn()) {
            Integer maxUserCount = userWorkspace.getWorkspace().getMaxUser();  //  최대 사용자
            Integer activeUserCount = this.countByWorkspaceIdAndUseYn(userWorkspace.getWorkspace().getId(), true);

            //  최대 사용자 - 현재 참여 사용자가 0보다 크다면 참여 상태로 변경
            if ((maxUserCount - activeUserCount) < 1) {
                throw new OwlRuntimeException(
                        this.messageAccessor.getMessage(MsgConstants.WORKSPACE_MAX_USER_EXCESS_NOT_INCLUDE));
            }
        }
        else {
        UserLevel currentUserlevel = userWorkspace.getUser().getUserLevel();
        if (currentUserlevel.getId() != userWorkspaceForm.getLevelId()) {
            // 사용자 등급 변경시
            User user = userWorkspace.getUser();
            //  참여 대기 사용자가 현재 해당 업무 공간을 사용하고 있을 경우 즉시 해당 업무 공간에서 튕기게 한다.
            if (user.getLastWorkspaceId().equals(userWorkspace.getWorkspace().getId())){
                //  업무 공간에 참여하던 사용자에게 제외 알림 및 화면 새로고침
                this.simpMessagingTemplate.convertAndSendToUser(user.getAccount(), "/notification/workspace-disabled", this.messageAccessor.getMessage(MsgConstants.WORKSPACE_OUT, userWorkspace.getWorkspace().getName()));
            }

            //  참여 대기 상태로 변경하면 해당 사용자의 마지막 접근 업무 공간는 자신이 관리하는 업무 공간로 변경한다.
            this.userService.updateLastMyWorkspace(user);
            UserLevel userLevel = this.userLevelService.getUserLevel(userWorkspaceForm.getLevelId());
            user.setUserLevel(userLevel);
            userWorkspace.setUser(user);
        }

        userWorkspace.setUseYn(!userWorkspace.getUseYn());
        this.userWorkspaceRepository.saveAndFlush(userWorkspace);
        //todo 부서 변경시
        DepartmentManage currentDepartment = userWorkspace.getUser().getDepartmentManage();
        if (currentDepartment.getId() != userWorkspaceForm.getDepartmentId()) {
            // 부서명 변경시
            User user = userWorkspace.getUser();
            DepartmentManage departmentManage = this.departmentManageService.getDepartment(userWorkspaceForm.getLevelId());
            user.setDepartmentManage(departmentManage);
            userWorkspace.setUser(user);
        }

        //  참여로 상태를 변경하려고 할때
        if (userWorkspace.getUseYn() != userWorkspaceForm.getUseYn()) {
            if (!userWorkspace.getUseYn()) {
                Integer maxUserCount = userWorkspace.getWorkspace().getMaxUser();  //  최대 사용자
                Integer activeUserCount = this.countByWorkspaceIdAndUseYn(userWorkspace.getWorkspace().getId(), true);

                //  최대 사용자 - 현재 참여 사용자가 0보다 크다면 참여 상태로 변경
                if ((maxUserCount - activeUserCount) < 1) {
                    throw new OwlRuntimeException(
                            this.messageAccessor.getMessage(MsgConstants.WORKSPACE_MAX_USER_EXCESS_NOT_INCLUDE));
                }
            } else {
                User user = userWorkspace.getUser();
                //  참여 대기 사용자가 현재 해당 업무 공간을 사용하고 있을 경우 즉시 해당 업무 공간에서 튕기게 한다.
                if (user.getLastWorkspaceId().equals(userWorkspace.getWorkspace().getId())) {
                    //  업무 공간에 참여하던 사용자에게 제외 알림 및 화면 새로고침
                    this.simpMessagingTemplate.convertAndSendToUser(user.getAccount(), "/notification/workspace-disabled", this.messageAccessor.getMessage(MsgConstants.WORKSPACE_OUT, userWorkspace.getWorkspace().getName()));
                }

                //  참여 대기 상태로 변경하면 해당 사용자의 마지막 접근 업무 공간는 자신이 관리하는 업무 공간로 변경한다.
                this.userService.updateLastMyWorkspace(user);
            }
            userWorkspace.setUseYn(!userWorkspace.getUseYn());
        }

        this.userWorkspaceRepository.saveAndFlush(userWorkspace);
    }