From 35471adf225f7eae4ba91f80d91c69a4637bc902 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 Oct 2022 14:12:34 +0800 Subject: [PATCH] =?UTF-8?q?pc=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=80=89=E4=BA=86=E8=BD=AC?= =?UTF-8?q?=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcEventAddEditFormDTO.java | 9 +++- .../epmet/dto/form/IcEventToIssueFormDTO.java | 20 +++++--- .../epmet/controller/IcEventController.java | 3 ++ .../service/impl/IcEventServiceImpl.java | 48 ++++++++++++++++--- 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java index 07d9a8bcf9..31010e536f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventAddEditFormDTO.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -83,7 +84,7 @@ public class IcEventAddEditFormDTO implements Serializable { */ private String longitude; /** - * 处理方式[0:已回复 1:已转项目 2:已转需求] + * 0:已回复 1:已转项目 2:已转需求3:转议题 */ private String operationType; /** @@ -117,4 +118,10 @@ public class IcEventAddEditFormDTO implements Serializable { private String app; private String client; + /** + * 新增事件直接转议题 + */ + @Valid + private IcEventToIssueFormDTO issueInfo; + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java index 2bfbce4810..e5b99e66d7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventToIssueFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.Valid; import javax.validation.constraints.NotBlank; @@ -24,13 +25,15 @@ public class IcEventToIssueFormDTO implements Serializable { public interface AddUserShowGroup extends CustomerClientShowGroup { } + public interface AddEventAndShiftIssue extends CustomerClientShowGroup { + } /** * 转议题默认传3即可；0:已回复 1:已转项目 2:已转需求3:转议题 */ - @NotBlank(message = "处理方式不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + @NotBlank(message = "处理方式不能为空", groups = AddUserInternalGroup.class) private String operationType; - @NotBlank(message = "事件id不能为空", groups = IcEventToIssueFormDTO.AddUserInternalGroup.class) + @NotBlank(message = "事件id不能为空", groups = AddUserInternalGroup.class) private String icEventId; // /** @@ -42,17 +45,20 @@ public class IcEventToIssueFormDTO implements Serializable { * 项目所选分类集合，不可为空 */ @Valid - @NotEmpty(message = "事件分类不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + @NotEmpty(message = "事件分类不能为空", groups = AddUserShowGroup.class) private List categoryList; - @NotBlank(message = "议题标题不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + @NotBlank(message = "议题标题不能为空", groups = {AddUserShowGroup.class, AddEventAndShiftIssue.class}) + @Length(message = "议题标题最多输入120字",max = 120,groups = {AddUserShowGroup.class, AddEventAndShiftIssue.class}) private String issueTitle; - @NotBlank(message = "处理建议不能为空", groups = IcEventToIssueFormDTO.AddUserShowGroup.class) + + @Length(message = "处理建议最多输入1000字",max = 1000,groups = {AddUserShowGroup.class, AddEventAndShiftIssue.class}) + @NotBlank(message = "处理建议不能为空", groups = {AddUserShowGroup.class, AddEventAndShiftIssue.class}) private String suggestion; - @NotBlank(message = "customerId不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + @NotBlank(message = "customerId不能为空", groups = {AddUserInternalGroup.class}) private String customerId; - @NotBlank(message = "currentUserId不能为空", groups = {IcEventToIssueFormDTO.AddUserInternalGroup.class}) + @NotBlank(message = "currentUserId不能为空", groups = {AddUserInternalGroup.class}) private String currentUserId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index f905215a44..d26aec98e5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -103,6 +103,9 @@ public class IcEventController { formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); formDTO.setClient(tokenDto.getClient()); + if("3".equals(formDTO.getOperationType())){ + ValidatorUtils.validateEntity(formDTO.getIssueInfo(),IcEventToIssueFormDTO.AddEventAndShiftIssue.class); + } icEventService.save(formDTO); return new Result(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 189811df46..b2b100fbe9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -183,6 +183,10 @@ public class IcEventServiceImpl extends BaseServiceImpl issueRes=govIssueOpenFeignClient.publishIssue(issueFormDTO); + if (!issueRes.success() || null == issueRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "事件转议题异常,返参：" + JSON.toJSONString(issueRes), "事件转议题异常"); + } + formDTO.setOperationId(issueRes.getData().getIssueId()); + } //3.新增事件数据、附件数据、分类数据、回复数据、操作记录数据 //3-1.事件数据保存 @@ -283,7 +315,7 @@ public class IcEventServiceImpl extends BaseServiceImpl