Merge branch 'yonge' of http://git.dayaedu.com/yonge/mec into yonge

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;

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;

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -36,6 +36,7 @@ import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 
 @RequestMapping("classGroup")
@@ -53,7 +54,7 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "分页查询班级列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryPage')")
-    public Object queryPage(ClassGroupQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ClassGroup>> queryPage(ClassGroupQueryInfo queryInfo) {
     	queryInfo.setDelFlag(0);
         return succeed(classGroupService.queryPage(queryInfo));
     }
@@ -61,7 +62,7 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "创建班级")
     @PostMapping("/create")
     @PreAuthorize("@pcs.hasPermissions('classGroup/create')")
-    public Object create(@RequestBody ClassGroup classGroup) throws Exception {
+    public HttpResponseResult<Boolean> create(@RequestBody ClassGroup classGroup) throws Exception {
         return succeed(classGroupService.create(classGroup));
     }