update

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -182,7 +182,6 @@
     <select id="findUserBySalt" resultMap="SysUser">
         SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND salt_ = 'replace' AND user_type_ LIKE CONCAT('%',#{userType},'%') LIMIT 1
     </select>
-    </select>
     <select id="queryByPhoneAndClient" resultMap="SysUser">
         select * from sys_user where (phone_ = #{phone} OR username_ = #{phone}) AND user_type_ LIKE CONCAT('%',#{client},'%') LIMIT 1 FOR UPDATE
     </select>

edu-common/src/main/java/com/keao/edu/common/entity/LoginEntity.java

@@ -0,0 +1,43 @@
+package com.keao.edu.common.entity;
+
+public class LoginEntity {
+    private String smsCode;
+
+    private String clientId;
+
+    private String clientSecret;
+
+    private String phone;
+
+    public String getSmsCode() {
+        return smsCode;
+    }
+
+    public void setSmsCode(String smsCode) {
+        this.smsCode = smsCode;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}

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

@@ -0,0 +1,34 @@
+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/UserLockFlag.java

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,45 @@
+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-common/src/main/resources/config/mybatis/SysRoleDeptMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.auth.dal.dao.SysRoleDeptDao">
+	
+	<resultMap type="com.keao.edu.auth.api.entity.SysRoleDept" id="SysRoleDept">
+		<result column="id_" property="id" />
+		<result column="role_id_" property="roleId" />
+		<result column="dept_id_" property="deptId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysRoleDept" >
+		SELECT * FROM sys_role_dept WHERE id_ = #{id}
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysRoleDept">
+		SELECT * FROM sys_role_dept ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.auth.api.entity.SysRoleDept" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO sys_role_dept (id_,role_id_,dept_id_) VALUES(#{id},#{roleId},#{deptId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.auth.api.entity.SysRoleDept">
+		UPDATE sys_role_dept
+		 <set>
+			 <if test="roleId != null">
+				 role_id_ = #{roleId},
+			 </if>
+			 <if test="deptId != null">
+				 dept_id_ = #{deptId},
+			 </if>
+		 </set>
+		 WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM sys_role_dept WHERE id_ = #{id}
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysRoleDept" parameterType="map">
+		SELECT * FROM sys_role_dept ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM sys_role_dept
+	</select>
+</mapper>