OWL ITS + 탐지시스템(인터넷 진흥원)
blame | 히스토리 | 패치 | 커밋 | 커밋비교 | ignore whitespace
이민희
2021-12-02 616d76059d929650113f8a4ec750d86c4647b064 
 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java


@@ -12,14 +12,14 @@


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.DepartmentManagementForm;


import kr.wisestone.owl.web.form.DepartmentForm;


import kr.wisestone.owl.web.form.UserForm;


import kr.wisestone.owl.web.form.UserLevelForm;


import kr.wisestone.owl.web.view.ExcelView;


import org.apache.commons.validator.routines.EmailValidator;


import org.slf4j.Logger;


@@ -34,7 +34,6 @@


import org.springframework.security.core.session.SessionRegistry;


import org.springframework.security.core.userdetails.UserDetails;


import org.springframework.security.crypto.password.PasswordEncoder;


import org.springframework.stereotype.Repository;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.ui.Model;


@@ -58,10 +57,13 @@


    private UserRepository userRepository;




    @Autowired


    private DepartmentRepository departmentRepository;




    @Autowired


    private UserLevelService userLevelService;




    @Autowired


    private DepartmentManagementService departmentManagementService;


    private DepartmentService departmentService;




    @Autowired


    private SystemRoleService systemRoleService;


@@ -227,24 +229,28 @@




            this.userInviteService.includePrimaryWorkspace(user, primaryWorkspace);






            UserLevel userLevel = this.userLevelService.getBasicUserLevel();


            user.setUserLevel(userLevel);




            // edit by zenith for permission at 20200803


            /*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();


            user.setUserLevel(userLevel);




            // DepartmentManagement에 임시로 Name, Description 값 추가


            DepartmentManagementForm departmentManagementForm = new DepartmentManagementForm();


            this.userLevelService.addNormalAdminUserLevel();




            departmentManagementForm.setDepartmentName("개발팀");


            departmentManagementForm.setDepartmentDescription("웹사이트 및 앱 서비스 개발");


            DepartmentManagement departmentManagement = this.departmentManagementService.addDepartment(departmentManagementForm);


            user.setDepartmentId(departmentManagement);


            this.userLevelService.addNormalUserLevel();




            if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) {


                //  업무 공간를 생성한다. 가입한 사용자는 업무 공간의 주인이다.


@@ -1069,7 +1075,7 @@


    @Override


    @Transactional(readOnly = true)


    public List<User> findAdmin() {


        return this.userRepository.findAdmin();


        return this.userRepository.findAdmin(MngPermission.makeAllPermission());


    }




    //  해당 사용자가 관리하는 업무 공간을 마지막으로 접근한 업무 공간 정보로 업데이트한다.


@@ -1193,7 +1199,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");


        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission");


        // user에서 Permission 값을 가져와서 userVo 에 setPermission 함


        userVo.setPermission(user.getPermission());


        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));


@@ -1231,6 +1237,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)