OWL ITS + 탐지시스템(인터넷 진흥원)
이민희
2021-11-22 875d386d01ea72451788eef95067fb5e6de3983d
이슈 테이블 표시 설정 추가 완료(백엔드)
3개 파일 변경됨
182 ■■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java 21 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/IssueTableConfigService.java 2 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java 159 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/domain/IssueTableConfig.java
@@ -15,6 +15,7 @@
    private Long id;
    private String issueTableConfigs;
    private int issueTableType;
    private Long issueId;
    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "workspace_id")
@@ -23,10 +24,6 @@
    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "user_id")
    private User user;
    @ManyToOne(fetch = FetchType.LAZY)
    @JoinColumn(name = "issue_id")
    private Issue issue;
    public IssueTableConfig(){}
@@ -62,14 +59,6 @@
        this.user = user;
    }
    public Issue getIssue() {
        return issue;
    }
    public void setIssue(Issue issue) {
        this.issue = issue;
    }
    public int getIssueTableType() {
        return issueTableType;
    }
@@ -77,4 +66,12 @@
    public void setIssueTableType(int issueTableType) {
        this.issueTableType = issueTableType;
    }
    public Long getIssueId() {
        return issueId;
    }
    public void setIssueId(Long issueId) {
        this.issueId = issueId;
    }
}
src/main/java/kr/wisestone/owl/service/IssueTableConfigService.java
@@ -22,6 +22,4 @@
    IssueTableConfig findByIssueIdAndIssueTableType(Long issueId, int issueTableType);
    void multipleCode();
}
src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java
@@ -1,15 +1,13 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.domain.Issue;
import kr.wisestone.owl.domain.IssueTableConfig;
import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.domain.Workspace;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.repository.IssueTableConfigRepository;
import kr.wisestone.owl.service.IssueService;
import kr.wisestone.owl.service.IssueTableConfigService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.service.WorkspaceService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,104 +33,61 @@
    private UserService userService;
    @Autowired
    private IssueService issueService;
    private IssueTableConfigService issueTableConfigService;
    @Override
    protected JpaRepository<IssueTableConfig, Long> getRepository() {
        return this.issueTableConfigRepository;
    }
    @Override
    public void multipleCode() {
    }
    Long issueId;
    int issueTableType = 0; //issueTableType 초기값 설정
    //  add 중복코드 제거
    public IssueTableConfig addMultipleCode(Map<String, Object> params, Long issueId, int issueTableType) {
        String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        //  아직 테이블 컬럼 설정을 하지 않았을 경우
        if (issueTableConfig == null) {
            issueTableConfig = new IssueTableConfig();
            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }else if(saveIssueTableType == null){
            issueTableConfig.setIssueId(issueId);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }else{
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
        }
        return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
    }
    //  이슈 테이블 컬럼 설정 정보를 저장한다.
    @Override
    @Transactional
    public IssueTableConfig addIssueTableConfig(Map<String, Object> params) {
        String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
        issueId = (long) -1;
        issueTableType = 1;
        //  해당 업무 공간에서 사용자의 이슈 목록 테이블 컬럼 설정을 조회한다.
        IssueTableConfig saveIssueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        //  아직 테이블 컬럼 설정을 하지 않았을 경우
        if (saveIssueTableConfig == null && saveIssueTableType == null) {
            IssueTableConfig issueTableConfig = new IssueTableConfig();
            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            Issue issue = this.issueService.getIssue(issueId);
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssue(issue);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
        }
        else {
            saveIssueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(saveIssueTableConfig);
        }
        return this.addMultipleCode(params, issueId, issueTableType);
    }
    // 연관 이슈 테이블 설정 정보 저장
    @Override
    public IssueTableConfig addRelationIssueTableConfig(Map<String, Object> params) {
        String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
        issueId = MapUtil.getLong(params, "issueId");
        issueTableType = 2;
        //  해당 업무 공간에서 사용자의 이슈 목록 테이블 컬럼 설정을 조회한다.
        IssueTableConfig saveIssueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        //  아직 테이블 컬럼 설정을 하지 않았을 경우
        if (saveIssueTableConfig == null && saveIssueTableType == null) {
            IssueTableConfig issueTableConfig = new IssueTableConfig();
            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            Issue issue = this.issueService.getIssue(issueId);
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssue(issue);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
        }else {
            saveIssueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(saveIssueTableConfig);
        }
        return this.addMultipleCode(params, issueId, issueTableType);
    }
    // 하위 이슈 테이블 설정 정보 저장
    @Override
    public IssueTableConfig addDownIssueTableConfig(Map<String, Object> params) {
        String issueTableConfigs = MapUtil.getString(params, "issueTableConfigs");
        issueId = MapUtil.getLong(params, "issueId");
        issueTableType = 3;
        //  해당 업무 공간에서 사용자의 이슈 목록 테이블 컬럼 설정을 조회한다.
        IssueTableConfig saveIssueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        //  아직 테이블 컬럼 설정을 하지 않았을 경우
        if (saveIssueTableConfig == null && saveIssueTableType == null) {
            IssueTableConfig issueTableConfig = new IssueTableConfig();
            Workspace workspace = this.workspaceService.getWorkspace(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
            User user = this.userService.getUser(this.webAppUtil.getLoginId());
            Issue issue = this.issueService.getIssue(issueId);
            issueTableConfig.setWorkspace(workspace);
            issueTableConfig.setUser(user);
            issueTableConfig.setIssue(issue);
            issueTableConfig.setIssueTableType(issueTableType);
            issueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(issueTableConfig);
        }else {
            saveIssueTableConfig.setIssueTableConfigs(issueTableConfigs);
            return this.issueTableConfigRepository.saveAndFlush(saveIssueTableConfig);
        }
        return this.addMultipleCode(params, issueId, issueTableType);
    }
    //  해당 업무 공간에서 사용자의 이슈 테이블 설정을 조회한다.
@@ -143,10 +98,25 @@
                this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
    }
    //이슈 Id와 IssueTableType 조회
    @Override
    @Transactional(readOnly = true)
    public IssueTableConfig findByIssueIdAndIssueTableType(Long issueId, int issueTableType) {
        return this.issueTableConfigRepository.findByIssueIdAndIssueTableType(issueId, issueTableType);
    }
    // detail 중복 코드 제거
    private void detailMultipleCode(Map<String, Object> resJsonData, Long issueId, int issueTableType) {
        //  해당 업무 공간에서 사용자의 이슈 검색 조건을 조회한다.
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        if (issueTableConfig != null && saveIssueTableType != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
        }
        else {
            resJsonData.put(Constants.RES_KEY_CONTENTS, "");
        }
    }
    //  저장된 이슈 테이블 설정을 조회한다.
@@ -155,48 +125,19 @@
    public void detailIssueTableConfig(Map<String, Object> resJsonData) {
        issueId = (long) -1;
        issueTableType = 1;
        //  해당 업무 공간에서 사용자의 이슈 검색 조건을 조회한다.
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        if (issueTableConfig != null && saveIssueTableType != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
        }
        else {
            resJsonData.put(Constants.RES_KEY_CONTENTS, "");
        }
        this.detailMultipleCode(resJsonData, issueId, issueTableType);
    }
    //  저장된 연관 이슈 테이블 설정 조회
    @Override
    public void detailRelationIssueTableConfig(Long issueId, Map<String, Object> resJsonData) {
        issueTableType = 2;
        //  해당 업무 공간에서 사용자의 이슈 검색 조건을 조회한다.
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        if (issueTableConfig != null && saveIssueTableType != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
        }
        else {
            resJsonData.put(Constants.RES_KEY_CONTENTS, "");
        }
        this.detailMultipleCode(resJsonData, issueId, issueTableType);
    }
    //  저장된 하위 이슈 테이블 설정 조회
    @Override
    public void detailDownIssueTableConfig(Long issueId, Map<String, Object> resJsonData) {
        issueTableType = 3;
        //  해당 업무 공간에서 사용자의 이슈 검색 조건을 조회한다.
        IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceId();
        IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType);
        if (issueTableConfig != null && saveIssueTableType != null) {
            resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs());
        }
        else {
            resJsonData.put(Constants.RES_KEY_CONTENTS, "");
        }
        this.detailMultipleCode(resJsonData, issueId, issueTableType);
    }