From 1d5438a2c28153bc59defbc05bea3db722050e1e Mon Sep 17 00:00:00 2001
From: = <liujianjun@git.elinkit.com.cn>
Date: Fri, 12 Jun 2020 23:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=87=E7=AB=A0=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=92=8C=E5=86=85=E5=AE=B9=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/DraftContentFromDTO.java   | 10 +++++-----
 .../src/test/java/com/epmet/ArticleServiceTest.java    |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java
index 2c82e28b06..7df78525c0 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftContentFromDTO.java
@@ -18,7 +18,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
@@ -45,12 +47,14 @@ public class DraftContentFromDTO implements Serializable {
 	 * 文章标题
 	 */
 	@NotBlank(message = "请输入标题")
+	@Length(max = 50, message = "标题最长为50个字")
 	private String title;
 
 	/**
 	 * 内容列表
 	 */
 	@NotEmpty(message = "至少添加一个段落")
+	@Valid
 	private List<DraftContentDTO> contentList;
 
 	@Data
@@ -65,16 +69,12 @@ public class DraftContentFromDTO implements Serializable {
 		/**
 		 * 内容
 		 */
+		@Length(max = 1000, message = "每段文字最长为1000个字")
 		private String content;
 
 		/**
 		 * 内容类型 图片：img；文字：text
 		 */
 		private String contentType;
-
-		/**
-		 * 内容顺序 从1开始
-		 */
-		private Integer orderNum;
 	}
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java b/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java
index 9b184a2f7a..a0d19d9423 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java
@@ -38,7 +38,6 @@ public class ArticleServiceTest {
             contentDTO.setDraftContentId("");
             contentDTO.setContent("内容"+i);
             contentDTO.setContentType("text");
-            contentDTO.setOrderNum(1+i);
             list.add(contentDTO);
         }
             draftContentFromDTO.setContentList(list);