OWL ITS + 탐지시스템(인터넷 진흥원)
blame | 히스토리 | 패치 | 커밋 | 커밋비교 | ignore whitespace
jhjang
2022-01-05 ce82939b2d2ef793e446f464314c6e570c7ebad5 
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java


@@ -313,7 +313,7 @@


        }


    }




    private void findCompanyField(IssueForm issueForm) {


    private IssueForm findCompanyField(IssueForm issueForm) {


        if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {


            CompanyFieldCondition condition = new CompanyFieldCondition();


            List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);


@@ -356,6 +356,7 @@


                issueForm.setIssueHostingFields(issueHostingFields);


            }


        }


        return issueForm;


    }




    private User convertToUser(String token) {


@@ -381,7 +382,14 @@


        } else {


            // 가상 상위 이슈 추가


            IssueForm parentIssueForm = issueForm.clone();


            // 가상 상위 이슈 추가


            parentIssueForm.setUseIssueCustomFields(issueApiForm.getUseIssueCustomFieldIds());


            //  같은 도메인 업체 찾기


            IssueForm partners = this.findCompanyField(parentIssueForm);


            parentIssueForm.setIssueCompanyFields(partners.getIssueCompanyFields());


            parentIssueForm.setIssueIspFields(partners.getIssueIspFields());


            parentIssueForm.setIssueHostingFields(partners.getIssueHostingFields());




            Issue issue = addIssue(user, parentIssueForm, null);


            issues.add(issue);


            // 하위 이슈 추가


@@ -414,7 +422,9 @@


            IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();


            Collections.sort(issueCustomFieldValueForms, comp);




            List<String> userValues = Lists.newArrayList();


            for (IssueCustomFieldValueForm issueCustomFieldValueForm : issueCustomFieldValueForms) {


                userValues.add(issueCustomFieldValueForm.getUseValue());


                for(CustomFieldApiOverlap customFieldApiOverlap : customFieldApiOverlaps) {


                    if (customFieldApiOverlap.getCustomField().getId().equals(issueCustomFieldValueForm.getCustomFieldId())) {


                        if (useIdx > 0) {


@@ -428,6 +438,7 @@




            IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();


            issueCustomFieldValueCondition.setUseValue(concatUseValue);


            issueCustomFieldValueCondition.setUseValues(userValues);


            issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());


            List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);


            if (results != null && results.size() > 0) {


@@ -493,12 +504,11 @@


        //  담당부서 지정


        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());


        //  업체 정보 저장


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);


        //  ISP 정보 저장


        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());


        this.issueIspService.modifyIssueIspField(issue, issueForm);


        //  HOSTING 정보 저장


        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());




        this.issueHostingService.modifyIssueHostingField(issue, issueForm);




        //  첨부 파일 저장


        //  multipartFile 을 file Map List 객체로 변경한다.


@@ -587,11 +597,11 @@


        //  담당부서 지정


        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());


        //  업체 정보 저장


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);


        //  ISP 정보 저장


        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());


        this.issueIspService.modifyIssueIspField(issue, issueForm);


        //  HOSTING 정보 저장


        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());


        this.issueHostingService.modifyIssueHostingField(issue, issueForm);




        //  첨부 파일 저장


        //  multipartFile 을 file Map List 객체로 변경한다.


@@ -664,11 +674,11 @@


        //  담당부서 지정


        this.issueDepartmentService.modifyIssueDepartment(issue, user, project.getWorkspace(), issueForm.getDepartmentIds());


        //  업체 정보 저장


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);


        //  ISP 정보 저장


        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());


        this.issueIspService.modifyIssueIspField(issue, issueForm);


        //  HOSTING 정보 저장


        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());


        this.issueHostingService.modifyIssueHostingField(issue, issueForm);




        //  첨부 파일 저장


        //  multipartFile 을 file Map List 객체로 변경한다.


@@ -716,7 +726,7 @@


    }




    //  이슈 정보를 이메일 전송에 사용하기 위해 Map 형태로 변환한다.


    private void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {


    public void makeIssueMapToIssue(Issue issue, Map<String, Object> issueMap) {


        issueMap.put("title", issue.getTitle());


        issueMap.put("issueNumber", issue.getIssueNumber());


        issueMap.put("issueTypeName", issue.getIssueType().getName());


@@ -1536,6 +1546,8 @@


                this.setIssueHistory(downIssue, downIssueVo);   //  이슈 기록 정보 셋팅


                this.setIssueComments(downIssue, downIssueVo);  //  댓글 정보 셋팅




                downIssueVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());




                resultList.add(downIssueVo);


            }


            issueVo.setIssueDownVos(resultList);


@@ -1638,6 +1650,8 @@


                IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(relationIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");


                issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());


                issueRelationVo.setIssueStatusVo(issueStatusVo);




                issueRelationVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());




                this.setRegister(relationIssue, relIssueVo); // 등록자


                this.setIssueDepartment(relationIssue, relIssueVo);  //  담당부서 정보 셋팅


@@ -1755,6 +1769,7 @@


        List<Issue> resultIssueVos = Lists.newArrayList();


        String comma = ",";




        List<String> userValues = Lists.newArrayList();


        if (issueCustomFieldValueForms.size() > 0) {


            IssueCustomFieldValueFormComparator comp = new IssueCustomFieldValueFormComparator();


            Collections.sort(issueCustomFieldValueForms, comp);


@@ -1762,6 +1777,7 @@


            String concatUseValue = "";


            for (int i = 0; i < issueCustomFieldValueForms.size(); i++) {


                IssueCustomFieldValueForm issueCustomFieldValueForm = issueCustomFieldValueForms.get(i);


                userValues.add(issueCustomFieldValueForm.getUseValue());


                if (i > 0) {


                    concatUseValue = concatUseValue.concat(comma);


                }


@@ -1770,6 +1786,7 @@




            IssueCustomFieldValueCondition issueCustomFieldValueCondition = new IssueCustomFieldValueCondition();


            issueCustomFieldValueCondition.setUseValue(concatUseValue);


            issueCustomFieldValueCondition.setUseValues(userValues);


            issueCustomFieldValueCondition.setIssueTypeId(issueApiform.getIssueTypeId());


            List<Map<String, Object>> results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);


            if (results != null && results.size() > 0) {


@@ -1894,6 +1911,13 @@


    private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {


        CheckIssueData checkIssueData = this.checkIssue(user, issueForm);




        if (issueForm.getComment() != null && !issueForm.getComment().equals("")) { //댓글 추가


            IssueCommentForm issueCommentForm = new IssueCommentForm();


            issueCommentForm.setDescription(issueForm.getComment());


            issueCommentForm.setIssueId(issueForm.getId());


            this.issueCommentService.addIssueComment(issueCommentForm, user);


        }




        // 이슈 이력 남기기


        this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);




@@ -1997,11 +2021,11 @@


        log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));




        //  업체 정보 저장


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm.getIssueCompanyFields());


        this.issueCompanyService.modifyIssueCompanyField(issue, issueForm);


        //  ISP 정보 저장


        this.issueIspService.modifyIssueIspField(issue, issueForm.getIssueIspFields());


        this.issueIspService.modifyIssueIspField(issue, issueForm);


        //  HOSTING 정보 저장


        this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());


        this.issueHostingService.modifyIssueHostingField(issue, issueForm);




        return issue;


    }


@@ -2871,11 +2895,8 @@


        excelInfo.setFileName(this.messageAccessor.message("common.registerExcelIssue")); // 엑셀로 이슈 등록하기


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.title"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // 제목


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.content"), 40, ExportExcelAttrVo.ALIGN_CENTER)); // 내용


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.projectKey"), 10, ExportExcelAttrVo.ALIGN_LEFT)); // 프로젝트 키


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 이슈 타입


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.priority"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // 우선순위


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.importance"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // 중요도


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.department"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 담당부서


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.startDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 시작일


        excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.endDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 종료일


        //  프로젝트에 연결된 사용자 정의 필드 정보를 추출하여 엑셀 download 템플릿을 만든다.


@@ -2899,7 +2920,7 @@


    //  엑셀 import 로 이슈를 등록한다.


    @Override


    @Transactional


    public void importExcel(MultipartFile multipartFile) throws Exception {


    public void importExcel(IssueForm issueForm, MultipartFile multipartFile) throws Exception {


        /*StopWatch serviceStart = new StopWatch();


        serviceStart.start();*/




@@ -2910,19 +2931,16 @@


            //  업로드 파일 확장자 체크


            this.verifyMultipartFileExtension(multipartFile);




            Map<String, Project> projectMaps = new HashMap<>(); //  프로젝트 모음


            Map<String, IssueType> issueTypeMaps = new HashMap<>(); //  이슈 타입 모음


            Map<String, Priority> priorityMaps = new HashMap<>();   //  우선 순위 모음


            Map<String, Severity> severityMaps = new HashMap<>();   //  중요도 모음


            Map<String, Object> userMaps = new HashMap<>(); //  사용자 모음


            Map<String, DepartmentVo> departmentMaps = new HashMap<>(); //  부서 모음


            Map<String, CustomField> customFieldMaps = new HashMap<>();


            Map<String, IssueStatus> issueStatusReadyMaps = new HashMap<>();   //  상태 속성 '대기'인 이슈 상태


            Map<Long, Long> issueNumberMaps = new HashMap<>();  //  이슈 번호 모음


            Map<String, Long> issueTypeCustomFieldMaps = new HashMap<>(); //  이슈 타입 + 사용자 정의 필드 연결 정보




            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());  //  이슈를 넣으려는 업무 공간


            //  이슈의 주요 속성을 map 에 저장하여 엑셀 import 에서 지정한 대상(이슈 속성)을 빠르게 찾을 수 있게 한다.


            this.IssueAttributeMapToList(projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, departmentMaps, customFieldMaps, issueNumberMaps, issueTypeCustomFieldMaps, issueStatusReadyMaps);


            this.IssueAttributeMapToList(priorityMaps, severityMaps, departmentMaps, customFieldMaps, issueTypeCustomFieldMaps);


            //  0.237 - 0.230




            List<IssueForm> issueForms = Lists.newArrayList();


@@ -2965,7 +2983,14 @@


                //  1번 헤더부터 데이터 영역


                if (rowIndex > 1) {


                    //  이슈로 등록하기 위해 IssueForm 에 데이터를 셋팅한다.


                    issueForms.add(this.setIssueFormToExcelField(row, (rowIndex + 1), issueStatusReadyMaps, projectMaps, issueTypeMaps, priorityMaps, severityMaps, userMaps, departmentMaps, customFieldMaps, issueNumberMaps, headers));


                    IssueForm newIssueForm = this.setIssueFormToExcelField(row, (rowIndex + 1), priorityMaps, severityMaps, departmentMaps, customFieldMaps, headers);


                    ConvertUtil.copyProperties(issueForm, newIssueForm);








                    issueForms.add(newIssueForm);






                }


            }




@@ -2976,7 +3001,46 @@






            //  이슈 등록


            this.issueMapper.insertBatch(issueForms);


//            this.issueMapper.insertBatch(issueForms);




            for (IssueForm saveIssueForm : issueForms) {


                Issue issue = new Issue();


                ConvertUtil.copyProperties(saveIssueForm, issue);




                IssueType issueType = this.issueTypeService.getIssueType(saveIssueForm.getIssueTypeId());


                Workflow workflow = issueType.getWorkflow();




                Project project = this.projectService.getProject(saveIssueForm.getProjectId());


                Long issueNumber = this.issueNumberGeneratorService.generateIssueNumber(project);




                IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(workflow);




                issue.setPriority(this.priorityService.getPriority(saveIssueForm.getPriorityId()));


                issue.setSeverity(this.severityService.getSeverity(saveIssueForm.getSeverityId()));


                issue.setIssueStatus(issueStatus);


                issue.setIssueType(issueType);


                issue.setProject(project);


                issue.setIssueNumber(issueNumber);


                issue.setParentIssue(this.getIssue(saveIssueForm.getParentIssueId()));




                issue = this.issueRepository.saveAndFlush(issue);




                saveIssueForm.setId(issue.getId());




                IssueDepartment issueDepartment = new IssueDepartment();


                issueDepartment.setIssue(issue);


                issueDepartment.setWorkspace(workspace);




                List<Long> departmentsIds = this.workflowDepartmentService.findFirstDepartmentIds(workflow);


                for (Long departmentId : departmentsIds) {


                    issueDepartment.setDepartment(this.departmentService.getDepartment(departmentId));


                }


                issue.addIssueDepartment(issueDepartment);




                saveIssueForm.setIssueStatusId(issueStatus.getId());


            }






            //  0.416 - 0.439




            //  1.373 ~ 1.394


@@ -3006,7 +3070,8 @@


            //  reverse index 업데이트


            this.issueMapper.updateBatch(issueForms);


            //  증가된 이슈 번호를 업데이트 한다.


            this.issueNumberGeneratorService.updateIssueNumber(issueNumberMaps);


//            issueNumberMaps.put(issueForm.getProjectId(), issueForm.getProjectId());


//            this.issueNumberGeneratorService.updateIssueNumber(issueNumberMaps);


        }


    }




@@ -3115,49 +3180,8 @@


    }




    //  이슈의 주요 속성을 map 에 저장하여 엑셀 import 에서 지정한 대상(이슈 속성)을 빠르게 찾을 수 있게 한다.


    private void IssueAttributeMapToList(Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,


                                         Map<String, Object> userMaps, Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, Map<String, Long> issueTypeCustomFieldMaps, Map<String, IssueStatus> issueStatusReadyMaps) {


        //  프로젝트 키로 바로 찾을 수 있게 준비


        List<Project> projects = this.projectService.findByWorkspaceId();


        List<Long> projectIds = Lists.newArrayList();




        for (Project project : projects) {


            projectIds.add(project.getId());


            //  해당 프로젝트에서 생성되는 다음 이슈 번호를 생성해온다.


            issueNumberMaps.put(project.getId(), this.issueNumberGeneratorService.generateIssueNumber(project));


            projectMaps.put(project.getProjectKey(), project);




            for (IssueTypeCustomField issueTypeCustomField : project.getIssueTypeCustomFields()) {


                //  빠르게 찾기 위해 이슈 타입 아이디 + 사용자 정의 필드 아이디를 키로 한다.


                String makeKey = issueTypeCustomField.getIssueType().getId().toString() + issueTypeCustomField.getCustomField().getId().toString();


                issueTypeCustomFieldMaps.put(makeKey, issueTypeCustomField.getId());


            }




            //  프로젝트에 참여하는 사용자 정보


            List<Map<String, Object>> users = this.userService.findProjectMember(project);


            Map<String, Object> userMap = new HashMap<>();


            //  사용자 정보를 Map 에 저장


            for (Map<String, Object> user : users) {


                userMap.put(CommonUtil.decryptAES128(MapUtil.getString(user, "account")), MapUtil.getLong(user, "userId"));


            }


            userMaps.put(project.getProjectKey(), userMap);


        }




        //  이슈 유형을 바로 찾을 수 있게 준비


        List<IssueType> issueTypes = this.issueTypeService.findByWorkspaceId();


        for (IssueType issueType : issueTypes) {


            issueTypeMaps.put(issueType.getName(), issueType);




            IssueStatus issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());


            issueStatusReadyMaps.put(issueType.getId().toString(), issueStatus);




            //  워크플로우에 속해있는 부서 정보


            List<DepartmentVo> departments = this.departmentService.findWorkflowDepartment(issueType.getId());


            //  부서 정보를 저장


            for (DepartmentVo department : departments) {


                departmentMaps.put(department.getDepartmentName(), department);


            }


        }


    private void IssueAttributeMapToList(Map<String, Priority> priorityMaps, Map<String, Severity> severityMaps,


                                         Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps,Map<String, Long> issueTypeCustomFieldMaps) {




        //  우선순위를 바로 찾을 수 있게 준비


        List<Priority> priorities = this.priorityService.findByWorkspaceId();


@@ -3179,8 +3203,9 @@


    }




    //  엑셀 필드에 있는 정보를 이슈 form 으로 옮긴다.


    private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, IssueStatus> issueStatusReadyMaps, Map<String, Project> projectMaps, Map<String, IssueType> issueTypeMaps, Map<String,


            Priority> priorityMaps, Map<String, Severity> severityMaps, Map<String, Object> userMaps, Map<String, DepartmentVo> departmentMaps, Map<String, CustomField> customFieldMaps, Map<Long, Long> issueNumberMaps, List<String> headers) {


    private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, Priority> priorityMaps,


                                               Map<String, Severity> severityMaps, Map<String, DepartmentVo> departmentMaps,


                                               Map<String, CustomField> customFieldMaps, List<String> headers) {


        IssueForm issueForm = new IssueForm();


        issueForm.setRegisterId(this.webAppUtil.getLoginId());


        Project project = null;


@@ -3204,23 +3229,12 @@




                    break;




                case 2:    //  프로젝트 키와 이슈 번호


                    project = this.setIssueFormProjectKeyAndIssueNumber(cell, issueForm, projectMaps, issueNumberMaps, rowIndex);


                    break;




                case 3:


                    //  이슈 타입을 IssueForm 에 저장한다.


                    this.setIssueFormIssueType(cell, issueTypeMaps, issueForm, rowIndex);


                    //  이슈 타입에 연결된 워크플로우의 상태 속성 '대기' 인 상태를 issueForm 에 저장한다.


                    this.setIssueFormIssueStatus(issueStatusReadyMaps, issueForm, rowIndex);


                    break;




                case 4:


                case 2:


                    //  우선순위를 IssueForm 에 저장한다.


                    this.setIssueFormPriority(cell, priorityMaps, issueForm, rowIndex);


                    break;




                case 5:


                case 3:


                    //  중요도를 IssueForm 에 저장한다.


                    this.setIssueFormSeverity(cell, severityMaps, issueForm, rowIndex);


                    break;


@@ -3228,17 +3242,17 @@


                    //  담당자를 IssueForm 에 저장한다.


                    this.setIssueFormAssignee(cell, userMaps, issueForm, project);


                    break;*/


                case 6:


                    //  담당부서를 IssueForm 에 저장한다.


                    this.setIssueFormDepartment(cell, departmentMaps, issueForm, project);


                    break;


                case 7:


                case 4:


                    //  시작일을 IssueForm 에 저장한다.


                    this.setIssueFormPeriod(cell, issueForm, true, rowIndex);


                    if (cell != null) {


                        this.setIssueFormPeriod(cell, issueForm, true, rowIndex);


                    }


                    break;


                case 8:


                case 5:


                    //  종료일을 IssueForm 에 저장한다.


                    this.setIssueFormPeriod(cell, issueForm, false, rowIndex);


                    if (cell != null) {


                        this.setIssueFormPeriod(cell, issueForm, false, rowIndex);


                    }


                    break;


                default:


                    //  9번 부터는 사용자 정의 필드. 사용자 정의 필드 정보를 IssueForm 에 저장한다.


@@ -3261,17 +3275,6 @@


        //  제목 유효성 체크


        this.verifyTitle(title);


        issueForm.setTitle(title);


    }




    //  프로젝트 키, 이슈 고유 번호, 담당자를 IssueForm 에 저장한다.


    private Project setIssueFormProjectKeyAndIssueNumber(Cell cell, IssueForm issueForm, Map<String, Project> projectMaps, Map<Long, Long> issueNumberMaps, int rowIndex) {


        //  프로젝트 아이디를 IssueForm 에 저장한다.


        Project project = this.setIssueFormProject(cell, projectMaps, issueForm, rowIndex);




        //  이슈 고유 번호를 IssueForm 에 저장한다.


        this.setIssueFormIssueNumber(issueForm, issueNumberMaps, project, rowIndex);




        return project;


    }




    //  프로젝트 아이디를 IssueForm 에 저장한다.


@@ -3307,34 +3310,6 @@


        issueNumberMaps.put(project.getId(), ++issueNumber);  //  이슈 번호를 1씩 증가 시킨다.


    }




    //  이슈 타입을 IssueForm 에 저장한다.


    private void setIssueFormIssueType(Cell cell, Map<String, IssueType> issueTypeMaps, IssueForm issueForm, int rowIndex) {


        if (cell == null) {


            throw new OwlRuntimeException(


                    this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TYPE_IS_NULL, rowIndex));


        }




        IssueType issueType = issueTypeMaps.get(CommonUtil.convertExcelStringToCell(cell));




        if (issueType == null) {


            throw new OwlRuntimeException(


                    this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_TYPE_NOT_EXIST, rowIndex));


        }




        issueForm.setIssueTypeId(issueType.getId());


    }




    //  이슈 타입에 연결된 워크플로우의 상태 속성 '대기' 인 상태를 issueForm 에 저장한다.


    private void setIssueFormIssueStatus(Map<String, IssueStatus> issueStatusReadyMaps, IssueForm issueForm, int rowIndex) {


        IssueStatus issueStatus = issueStatusReadyMaps.get(issueForm.getIssueTypeId().toString());




        if (issueStatus == null) {


            throw new OwlRuntimeException(


                    this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_ISSUE_STATUS_READY_NOT_EXIST, rowIndex));


        }




        issueForm.setIssueStatusId(issueStatus.getId());


    }




    //  우선순위를 IssueForm 에 저장한다.


    private void setIssueFormPriority(Cell cell, Map<String, Priority> priorityMaps, IssueForm issueForm, int rowIndex) {


@@ -3385,28 +3360,6 @@


            issueForm.setUserIds(userIds);


        }


    }




    //  담당부서를 IssueForm 에 저장한다.


    private void setIssueFormDepartment(Cell cell, Map<String, DepartmentVo> departmentMaps, IssueForm issueForm, Project project) {


        if (cell != null) {


            String[] splitDepartment = CommonUtil.convertExcelStringToCell(cell).split("#");




            //  값이 공백이면 중지


            String cellValue = CommonUtil.convertExcelStringToCell(cell);


            if (StringUtils.isEmpty(cellValue)) {


                return;


            }




            List<Long> departmentIds = Lists.newArrayList();




            for (String department : splitDepartment) {


                DepartmentVo departmentVo = departmentMaps.get(department);


                departmentIds.add(departmentVo.getId());


            }


            issueForm.setDepartmentIds(departmentIds);


        }


    }




    //  시작일, 종료일을 IssueForm 에 저장한다.


    private void setIssueFormPeriod(Cell cell, IssueForm issueForm, Boolean checkStartDate, int rowIndex) {


        if (cell != null && !cell.toString().equals("")) {


@@ -3442,7 +3395,7 @@


        }


    }




    //  사용자 정의 필드 정보를 IssueForm 에 저장한다.


    //  사용자 정의 필드 정보를 IssueForm 에 저장한다.-


    private void setIssueFormCustomFieldValue(Cell cell, Map<String, CustomField> customFieldMaps, IssueForm issueForm, String customFieldName, int rowIndex) {


        if (cell != null) {


            String cellValue = CommonUtil.convertExcelStringToCell(cell);


@@ -3779,28 +3732,31 @@


    @Transactional


    @Override


    public void modifyParentIssue(IssueForm issueDownForm) {


        Issue issue = this.getIssue(issueDownForm.getId()); //하위 이슈


        //Issue issue = this.getIssue(issueDownForm.getId()); //하위 이슈


        Long newParentIssueId = issueDownForm.getParentIssueId(); //변경할 하위이슈의 상위이슈




        StringBuilder sb = new StringBuilder();




        Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈


        if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //변경 전 하위이슈의 상위이슈가 존재 할 경우


            this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);


            this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());


        }


        for (Long downId : issueDownForm.getIds()) {


            Issue issue = this.getIssue(downId);




        if (newParentIssueId != null) { // 추가 할 경우


            parentIssue = this.getIssue(newParentIssueId); //상위이슈(myIssue)


            issue.setParentIssue(parentIssue); //myIssue를 하위이슈의 상위이슈로 set


            this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = 하위이슈


        } else{


            // 삭제 할 경우


            this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);


            issue.setParentIssue(null);


            Issue parentIssue = issue.getParentIssue(); //변경 전 하위이슈의 상위이슈


            if(parentIssue != null && parentIssue.getId().equals(newParentIssueId)){ //변경 전 하위이슈의 상위이슈가 존재 할 경우


                this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);


                this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString());


            }




            if (newParentIssueId != null) { // 추가 할 경우


                parentIssue = this.getIssue(newParentIssueId); //상위이슈(myIssue)


                issue.setParentIssue(parentIssue); //myIssue를 하위이슈의 상위이슈로 set


                this.issueHistoryService.detectDownIssues(IssueHistoryType.ADD, issue, sb); //issue = 하위이슈


            } else{


                // 삭제 할 경우


                this.issueHistoryService.detectDownIssues(IssueHistoryType.DELETE, issue, sb);


                issue.setParentIssue(null);


            }


            this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(기록은 현재 상세페이지에 해야하니까)


            this.issueRepository.saveAndFlush(issue);


        }


        this.issueHistoryService.addIssueHistory(parentIssue, IssueHistoryType.MODIFY, sb.toString()); //parentIssue = myIssue(기록은 현재 상세페이지에 해야하니까)


        this.issueRepository.saveAndFlush(issue);


    }




    @Override