Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-common/src/main/java/com/keao/edu/common/enums/SysUserType.java

@@ -1,34 +0,0 @@
-package com.keao.edu.common.enums;
-
-import org.apache.commons.lang3.StringUtils;
-
-public enum SysUserType implements BaseEnum<String, SysUserType> {
-
-	STUDENT("学生"), EDUCATION("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
-
-	private String desc;
-
-	private SysUserType(String desc) {
-	}
-
-	@Override
-	public String getCode() {
-		return name();
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public static SysUserType queryByName(String name) {
-		if (StringUtils.isBlank(name)) {
-			return null;
-		}
-		for (SysUserType sysUserType : SysUserType.values()) {
-			if (name.equals(sysUserType.getCode())) {
-				return sysUserType;
-			}
-		}
-		return null;
-	}
-}

edu-common/src/main/java/com/keao/edu/common/enums/UserGenderEnum.java

@@ -1,41 +0,0 @@
-package com.keao.edu.common.enums;
-
-import com.keao.edu.common.enums.BaseEnum;
-
-/** 
- * @author sunzl 
- * 2015年9月7日 下午1:57:10 
- * 会员性别枚举
- */
-public enum UserGenderEnum implements BaseEnum<Integer, UserGenderEnum> {
-
-	WOMAN(0, "女"), MAN(1, "男");
-
-	private int code;
-
-	private String description;
-
-	private UserGenderEnum(int code, String description) {
-		this.code = code;
-		this.description = description;
-	}
-
-	public static UserGenderEnum get(int code) {
-		for (UserGenderEnum info : UserGenderEnum.values()) {
-			if (info.getCode() == code) {
-				return info;
-			}
-		}
-		return null;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	@Override
-	public Integer getCode() {
-		return code;
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/enums/UserLockFlag.java

@@ -1,40 +0,0 @@
-package com.keao.edu.common.enums;
-
-public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
-
-	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
-
-	private int code;
-
-	UserLockFlag(int code, String remark) {
-		this.code = code;
-		this.remark = remark;
-	}
-
-	private String remark;
-
-	public Integer getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public static UserLockFlag codeOf(int code) {
-		for (UserLockFlag userStatus : UserLockFlag.values()) {
-			if (code == userStatus.getCode()) {
-				return userStatus;
-			}
-		}
-		return null;
-	}
-}

edu-common/src/main/java/com/keao/edu/common/enums/UserStatus.java

@@ -1,45 +0,0 @@
-package com.keao.edu.common.enums;
-
-/**
- * @author sunzl 
- * 2015年8月25日 下午4:19:00 
- * 会员状态枚举类
- */
-public enum UserStatus implements BaseEnum<Integer, UserStatus> {
-
-	NOACTIVATED(0, "未激活"), CANCELLED(-1, "注销"), NORMAL(1, "正常"), LOCKED(2, "锁定");
-
-	private int code;
-
-	private UserStatus(int code, String remark) {
-		this.code = code;
-		this.remark = remark;
-	}
-
-	private String remark;
-
-	public Integer getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public static UserStatus codeOf(int code) {
-		for (UserStatus userStatus : UserStatus.values()) {
-			if (code == userStatus.getCode()) {
-				return userStatus;
-			}
-		}
-		return null;
-	}
-}

edu-task/src/main/java/com/keao/edu/task/controller/TaskController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.task.dal.model.Task;
 import com.keao.edu.task.queryinfo.TaskQueryInfo;