From c3b8248962bd9b78a8207d5d275395a886d2ee5a Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 15 12월 2021 10:31:02 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/IssueService.java | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/IssueService.java b/src/main/java/kr/wisestone/owl/service/IssueService.java index 671e472..9d252a4 100644 --- a/src/main/java/kr/wisestone/owl/service/IssueService.java +++ b/src/main/java/kr/wisestone/owl/service/IssueService.java @@ -2,10 +2,14 @@ import kr.wisestone.owl.domain.Issue; import kr.wisestone.owl.domain.IssueType; +import kr.wisestone.owl.domain.User; import kr.wisestone.owl.domain.Workflow; import kr.wisestone.owl.vo.IssueVo; +import kr.wisestone.owl.web.condition.ApiMonitorCondition; import kr.wisestone.owl.web.condition.IssueCondition; import kr.wisestone.owl.web.condition.ProjectCondition; +import kr.wisestone.owl.web.form.EmailTemplateForm; +import kr.wisestone.owl.web.form.IssueApiForm; import kr.wisestone.owl.web.form.IssueForm; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -22,6 +26,19 @@ Issue addIssue(IssueForm issueForm, List<MultipartFile> files); + Issue addIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + + Issue addRelIssue(IssueForm issueForm, List<MultipartFile> files); + + Issue addRelIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + + List<Issue> addApiIssue(IssueApiForm issueApiForm) throws CloneNotSupportedException; + + List<Issue> modifyIssue(IssueApiForm issueApiForm, List<MultipartFile> files); + + List<Issue> findIssue(IssueApiForm issueApiform); + + List<IssueVo> findIssue(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable); @@ -35,9 +52,15 @@ Issue modifyIssue(IssueForm issueForm, List<MultipartFile> files); + Issue modifyIssue(User user, IssueForm issueForm, List<MultipartFile> multipartFiles); + void removeIssues(IssueForm issueForm); - void modifyIssueStatus(IssueForm issueForm); + void removeAllIssues(IssueForm issueForm); + + void removeDownIssues(IssueForm issueForm); + + void modifyIssueStatus(IssueForm issueForm, User user); Issue getIssue(Long taskId); @@ -61,9 +84,11 @@ List<Long> findByProjectId(Long projectId); - void setIssueDetail(IssueVo issueVo, Issue issue); + void setIssueDetail(IssueVo issueVo, Issue issue, User user); void sendIssueEmail(IssueForm issueForm); + + void sendIssueEmailPartners(EmailTemplateForm emailTemplateForm); void reservationIssue(); @@ -73,11 +98,7 @@ void findPartner(Map<String, Object> resJsonData, Map<String, Object> params); - //void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable); + void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData); - /*void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params); - - void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params); - - void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params);*/ + void setCountDownIssues(List<IssueVo> issueVos); } -- Gitblit v1.8.0