yonge 5 年之前
父節點
當前提交
ed2b25ef39

+ 10 - 10
mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -18,36 +18,36 @@ public class BaseController {
 	
 	private final static Logger logger = LoggerFactory.getLogger(BaseController.class);
 
-	public static HttpResponseResult succeed(Object object) {
+	public static <T> HttpResponseResult<T> succeed(T object) {
 		return getResponseData(true, HttpStatus.OK, object, "");
 	}
 
-	public static HttpResponseResult succeed() {
+	public static <T> HttpResponseResult<T> succeed() {
 		return getResponseData(true, HttpStatus.OK, null, "");
 	}
 
-	public static HttpResponseResult succeedData(Object obj) {
+	public static <T> HttpResponseResult<T> succeedData(T obj) {
 		return getResponseData(true, HttpStatus.OK, obj, "操作成功");
 	}
 
-	public static HttpResponseResult warned(String message) {
+	public static HttpResponseResult<String> warned(String message) {
 		return failed(HttpStatus.MULTI_STATUS, message);
 	}
 
-	public static HttpResponseResult failed() {
+	public static HttpResponseResult<String> failed() {
 		return failed("");
 	}
 
-	public static HttpResponseResult failed(String msg) {
+	public static HttpResponseResult<String> failed(String msg) {
 		return failed(HttpStatus.INTERNAL_SERVER_ERROR, msg);
 	}
 
-	public static HttpResponseResult failed(HttpStatus statusCode, String msg) {
+	public static HttpResponseResult<String> failed(HttpStatus statusCode, String msg) {
 		return getResponseData(false, statusCode, null, msg);
 	}
 
-	private static HttpResponseResult getResponseData(boolean status, HttpStatus statusCode, Object data, String message) {
-		HttpResponseResult obj = new HttpResponseResult();
+	private static <T> HttpResponseResult<T> getResponseData(boolean status, HttpStatus statusCode, T data, String message) {
+		HttpResponseResult<T> obj = new HttpResponseResult<T>();
 		obj.setStatus(status);
 		obj.setCode(statusCode.value());
 		obj.setData(data);
@@ -63,7 +63,7 @@ public class BaseController {
 	 * @return
 	 */
 	@ExceptionHandler(Exception.class)
-	public HttpResponseResult handleException(Exception ex, HttpServletRequest request) {
+	public HttpResponseResult<String> handleException(Exception ex, HttpServletRequest request) {
 		Throwable e = ExceptionUtils.getRootCause(ex);
 		if (e == null) {
 			e = ex;

+ 0 - 2
mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java

@@ -7,8 +7,6 @@ import org.springframework.http.HttpStatus;
  */
 public class HttpResponseResult<T> {
 
-	public final static int TIME_OUT = -1;
-
 	private boolean status = true;
 	private String msg;
 	private T data;