Antiloveg лет назад: 8
Родитель
Сommit
19abf4d7d1

+ 142 - 0
src/main/java/com/goafanti/activity/bo/InputActivity.java

@@ -1,5 +1,147 @@
 package com.goafanti.activity.bo;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
 public class InputActivity {
+	@Max(value = 999999999999999999L, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Long	id;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	name;
+
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	address;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	host;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	undertake;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	asist;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	type;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	form;
+
+	@Size(min = 0, max = 1000, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	imgUrls;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	result;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	titleUrl;
+
+	/**
+	 * 描述
+	 */
+	private String	desc;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getHost() {
+		return host;
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
+	public String getUndertake() {
+		return undertake;
+	}
+
+	public void setUndertake(String undertake) {
+		this.undertake = undertake;
+	}
+
+	public String getAsist() {
+		return asist;
+	}
+
+	public void setAsist(String asist) {
+		this.asist = asist;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public Integer getForm() {
+		return form;
+	}
+
+	public void setForm(Integer form) {
+		this.form = form;
+	}
+
+	public String getImgUrls() {
+		return imgUrls;
+	}
+
+	public void setImgUrls(String imgUrls) {
+		this.imgUrls = imgUrls;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	public String getTitleUrl() {
+		return titleUrl;
+	}
+
+	public void setTitleUrl(String titleUrl) {
+		this.titleUrl = titleUrl;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
 
 }

+ 14 - 0
src/main/java/com/goafanti/admin/controller/AdminActivityApiController.java

@@ -11,7 +11,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.activity.bo.InputActivity;
 import com.goafanti.activity.service.ActivityService;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.enums.ActivityFields;
 import com.goafanti.common.utils.StringUtils;
 
 /**
@@ -49,6 +51,18 @@ public class AdminActivityApiController extends BaseApiController {
 	public Result add(@Valid InputActivity ia, BindingResult bindingResult, String startTimeFormattedDate,
 			String endTimeFormattedDate, String enrollDeadlineFormattedDate){
 		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					ActivityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
+		if (StringUtils.isBlank(ia.getName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "标题"));
+			return res;
+		}
+		
+		//if(StringUtils.)
 		return res;
 	}
 }

+ 58 - 0
src/main/java/com/goafanti/common/enums/ActivityFields.java

@@ -0,0 +1,58 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ActivityFields {
+	ID("id", "活动圈活动ID"),
+	NAME("name", "标题"),
+	ADDRESS("address", "活动地址"),
+	HOST("host", "主办单位"),
+	UNDERTAKE("undertake", "承办单位"),
+	ASIST("asist", "协办单位"),
+	TYPE("type", "活动类型"),
+	FORM("form", "活动形式"),
+	IMGURLS("imgUrls", "活动图片地址"),
+	RESULT("result", "活动结果描述"),
+	TITLEURL("titleUrl", "题图地址"),
+	OTHER("", "未知参数");
+
+	private ActivityFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<String, ActivityFields> status = new HashMap<String, ActivityFields>();
+
+	static {
+		for (ActivityFields value : ActivityFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static ActivityFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+
+	private String	code;
+	private String	desc;
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

+ 1 - 18
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>新闻详情</title>
-	<link th:href="${staticHost+'/portal/news/newsDetail.css'}" rel="stylesheet">
-</head>
-<body>
-	<div id="root"></div>
-	
-	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${staticHost+'/portal/news/newsDetail.css'}"></script>
-	</div>
-</body>
-=======
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
@@ -94,5 +77,5 @@
 	</div>
 </body>
 
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+
 </html>