Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

jhjang

2021-12-07 30ddd2cf095d2857ba1134fb3deaf51392ef1030

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

@@ -1,11 +1,18 @@
package kr.wisestone.owl.service.impl;

import kr.wisestone.owl.domain.Department;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.repository.WorkflowDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentForm;
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.jsoup.Jsoup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
@@ -13,8 +20,6 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.repository.DepartmentRepository;
import kr.wisestone.owl.service.DepartmentService;
import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.view.ExcelView;
@@ -32,6 +37,8 @@
@Service
public class DepartmentServiceImpl extends AbstractServiceImpl<Department, Long, JpaRepository<Department, Long>> implements DepartmentService {

    private static final Logger log = LoggerFactory.getLogger(IssueServiceImpl.class);

    @Autowired
    private DepartmentRepository departmentRepository;

@@ -39,7 +46,22 @@
    private DepartmentMapper departmentMapper;

    @Autowired
    private UserService userService;
    private DepartmentService departmentService;

    @Autowired
    private UserDepartmentService userDepartmentService;

    @Autowired
    private ProjectRoleDepartmentService projectRoleDepartmentService;

    @Autowired
    private ProjectRoleService projectRoleService;

    @Autowired
    private WorkflowDepartmentRepository workflowDepartmentRepository;

    @Autowired
    private IssueTypeService issueTypeService;

    @Autowired
    private WorkspaceService workspaceService;
@@ -105,17 +127,63 @@
        }

        for (Long id : departmentForm.getRemoveIds()) {
            if (!this.userService.useUserLevel(id)) {
            if (!this.departmentService.countInDepartment(id)) {
                this.departmentRepository.deleteById(id);
            } else {
                throw new OwlRuntimeException(
                        this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
            }

        }
        this.departmentRepository.flush();
    }

    //  프로젝트에 참여하는 부서 정보를 조회한다.
    @Override
    @Transactional(readOnly = true)
    public List<Map<String, Object>> findProjectDepartment(Project project) {
        DepartmentCondition departmentCondition = new DepartmentCondition();
        departmentCondition.setProjectId(project.getId());
        return this.departmentMapper.findProjectDepartment(departmentCondition);
    }

    //  프로젝트에 참여하는 부서 목록을 가져온다.
    @Override
    @Transactional(readOnly = true)
    public void findProjectDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition) {
        ProjectRole projectRole = this.projectRoleService.findByProjectIdAndRoleType(departmentCondition.getProjectId(), ProjectRole.TYPE_DEFAULT);
        List<ProjectRoleDepartment> projectRoleDepartments = this.projectRoleDepartmentService.findByProjectRoleId(projectRole.getId());
        List<DepartmentVo> departmentVos = Lists.newArrayList();

        for (ProjectRoleDepartment projectRoleDepartment : projectRoleDepartments) {
            DepartmentVo departmentVo = ConvertUtil.copyProperties(projectRoleDepartment.getDepartment(), DepartmentVo.class);
            departmentVo.setByName(departmentVo.getDepartmentName());
            departmentVos.add(departmentVo);
        }

        resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
    }

    //  워크플로우에 속해있는 부서 목록 조회
    @Override
    @Transactional(readOnly = true)
    public void findWorkflowDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition) {

        IssueType issueType = this.issueTypeService.getIssueType(departmentCondition.getIssueTypeId());
        Long workflowId = issueType.getWorkflow().getId();
        List<WorkflowDepartment> workflowDepartmentList = this.workflowDepartmentRepository.findByWorkflowId(workflowId);
        List<DepartmentVo> departmentVos = Lists.newArrayList();

        //List<Long> workflowDepartmentIds = Lists.newArrayList();
        if(workflowDepartmentList != null && workflowDepartmentList.size()>0){
            for(WorkflowDepartment workflowDepartment : workflowDepartmentList){
                DepartmentVo departmentVo = ConvertUtil.copyProperties(workflowDepartment.getDepartment(), DepartmentVo.class);
                departmentVo.setByName(departmentVo.getDepartmentName());
                //workflowDepartmentIds.add(workflowDepartment.getDepartment().getId());
                departmentVos.add(departmentVo);
            }
            resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
        }
    }


    // 부서 목록을 엑셀로 다운로드 한다.
@@ -146,11 +214,44 @@
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("department.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("department.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));

        excelInfo.setDatas(departmentVos);
        //  DepartmentVos 데이터를 엑셀에서 표시할 수 있는 데이터로 변경한다.
        List<Map<String, Object>> convertExcelViewToDepartmentMaps = this.convertExcelViewToDepartmentVos(departmentVos);

        excelInfo.setDatas(convertExcelViewToDepartmentMaps);

        model.addAttribute(Constants.EXCEL, excelInfo);
        return new ModelAndView(this.excelView);

    }

    @Override
    public boolean countInDepartment(Long id) {
        return this.departmentMapper.countInDepartment(id) > 0;
    }

    //  DepartmentVos 데이터를 엑셀에서 표시할 수 있는 데이터로 변경한다.
    private List<Map<String, Object>> convertExcelViewToDepartmentVos(List<DepartmentVo> departmentVos) {
        List<Map<String, Object>> results = Lists.newArrayList();

        for (DepartmentVo departmentVo : departmentVos){
            try {
                Map<String, Object> result = new HashMap<>();
                result.put("departmentName", departmentVo.getDepartmentName());
                result.put("departmentCount", departmentVo.getDepartmentCount());

                String description= "";

                if(departmentVo.getDepartmentDescription() != null){
                    description = Jsoup.parse(departmentVo.getDepartmentDescription()).text(); //HTML 태그 제거
                    description = description.replaceAll("\\<.*?>", ""); //공백 제거
                }
                result.put("departmentDescription", description);
                results.add(result);
            } catch (Exception e) {
                log.error("엑셀 다운로드 오류 발생");
            }
        }
        return results;
    }

    // 사용자 부서 ID로 조회한다.
@@ -171,18 +272,10 @@
        return department;
    }


    //  삭제 할 부서 유저가 사용하고 있는지 확인
    @Override
    public boolean department(Long Id) {
        return this.departmentMapper.findBydepartmentId(Id) > 0;
    }

    @Override
    public List<Map<String, Object>> findByDepartmentIds(UserCondition condition) {
        return this.departmentMapper.findByDepartmentIds(condition);
    }


    //  검색 결과를 DepartmentVo 로 변환한다.
    private List<DepartmentVo> convertDepartmentVoToMap(List<Map<String, Object>> results, Long totalDepartmentsCount, Pageable pageable, Map<String, Object> resJsonData) {
@@ -190,9 +283,10 @@

        for (Map<String, Object> result : results) {
            DepartmentVo departmentVo = ConvertUtil.convertMapToClass(result, DepartmentVo.class);
            departmentVo.setByName(departmentVo.getDepartmentName());
            departmentVos.add(departmentVo);
        }

        
        int totalPage = (int) Math.ceil((totalDepartmentsCount - 1) / pageable.getPageSize()) + 1;

        resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);