Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -1,7 +1,12 @@
 package com.ym.mec.auth.api.entity;
 
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.auth.api.enums.SysUserType;
+import com.ym.mec.common.enums.UserGenderEnum;
+
 /**
  * 对应数据库表(sys_user):
  */
@@ -26,7 +31,7 @@ public class SysUser {
 	private String avatar;
 
 	/** 部门ID */
-	private Integer deptId;
+	private Integer organId;
 
 	/** 创建时间 */
 	private java.util.Date createTime;
@@ -47,7 +52,15 @@ public class SysUser {
 	private String qqOpenid;
 
 	/** 用户类型 */
-	private String userType;
+	private SysUserType userType;
+
+	private UserGenderEnum gender;
+
+	private String nation;
+
+	private Date birthdate;
+
+	private String email;
 
 	public Integer getId() {
 		return id;
@@ -97,12 +110,12 @@ public class SysUser {
 		return this.avatar;
 	}
 
-	public void setDeptId(Integer deptId) {
-		this.deptId = deptId;
+	public Integer getOrganId() {
+		return organId;
 	}
 
-	public Integer getDeptId() {
-		return this.deptId;
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
 	}
 
 	public void setCreateTime(java.util.Date createTime) {
@@ -153,14 +166,46 @@ public class SysUser {
 		return this.qqOpenid;
 	}
 
-	public String getUserType() {
+	public SysUserType getUserType() {
 		return userType;
 	}
 
-	public void setUserType(String userType) {
+	public void setUserType(SysUserType userType) {
 		this.userType = userType;
 	}
 
+	public UserGenderEnum getGender() {
+		return gender;
+	}
+
+	public void setGender(UserGenderEnum gender) {
+		this.gender = gender;
+	}
+
+	public String getNation() {
+		return nation;
+	}
+
+	public void setNation(String nation) {
+		this.nation = nation;
+	}
+
+	public Date getBirthdate() {
+		return birthdate;
+	}
+
+	public void setBirthdate(Date birthdate) {
+		this.birthdate = birthdate;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -56,19 +56,19 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		List<GrantedAuthority> authorities = null;
 
-		String userType = userInfo.getSysUser().getUserType();
+		SysUserType userType = userInfo.getSysUser().getUserType();
 
-		if (StringUtils.endsWithIgnoreCase(userType, SysUserType.SYSTEM.getCode())) {
+		if (userType == SysUserType.SYSTEM) {
 			authorities = AuthorityUtils.createAuthorityList(userInfo.getPermissions());
 		} else {
 			authorities = new ArrayList<GrantedAuthority>();
-			authorities.add(new SimpleGrantedAuthority(userType.toLowerCase()));
+			authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType.name())));
 		}
 
 		SysUser sysUser = userInfo.getSysUser();
 
-		return new AuthUser(sysUser.getId(), username, BCRYPT + sysUser.getPassword(), StringUtils.equals(sysUser.getLockFlag(), "0"), true, true, true,
-				authorities);
+		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), StringUtils.equals(sysUser.getLockFlag(), "0"),
+				true, true, true, authorities);
 	}
 
 }

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

@@ -13,14 +13,18 @@
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>
         <result column="avatar_" property="avatar"/>
-        <result column="dept_id_" property="deptId"/>
+        <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
-        <result column="user_type_" property="userType"/>
+        <result column="user_type_" property="userType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="nation_" property="nation"/>
+        <result column="birthdate_" property="birthdate"/>
+        <result column="email_" property="email"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -34,6 +38,9 @@
         <if test="userType != null">
             and user_type_ = #{userType}
         </if>
+        <if test="organId != null">
+            and organ_id_ = #{organId}
+        </if>
     </sql>
 
     <!-- 根据主键查询一条记录 -->
@@ -55,8 +62,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (id_,username_,password_,salt_,phone_,avatar_,dept_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_)
-        VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{deptId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType})
+        (id_,username_,password_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
+        VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{organId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -76,7 +83,7 @@
                 email_ = #{email},
             </if>
             <if test="gender != null">
-                gender_ = #{gender},
+                gender_ = #{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="password != null">
                 password_ = #{password},
@@ -88,7 +95,7 @@
                 username_ = #{username},
             </if>
             <if test="userType != null">
-                user_type_ = #{userType},
+                user_type_ = #{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
@@ -108,6 +115,9 @@
             <if test="nation != null">
                 nation_ = #{nation},
             </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-web/src/main/java/com/ym/mec/web/dal/enums/UserGenderEnum.java → mec-common/common-core/src/main/java/com/ym/mec/common/enums/UserGenderEnum.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.enums;
+package com.ym.mec.common.enums;
 
 import com.ym.mec.common.enums.BaseEnum;
 

mec-common/common-core/src/main/java/com/ym/mec/common/security/AuthUser.java

@@ -12,12 +12,21 @@ public class AuthUser extends User {
 	 */
 	private static final long serialVersionUID = 5532676374055148988L;
 
+	/**
+	 * 用户编号
+	 */
 	private Integer userId;
 
-	public AuthUser(Integer userId, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired,
-			boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+	/**
+	 * 所在组织的编号
+	 */
+	private Integer organId;
+
+	public AuthUser(Integer userId, Integer organId, String username, String password, boolean enabled, boolean accountNonExpired,
+			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
+		this.organId = organId;
 	}
 
 	public Integer getUserId() {
@@ -28,4 +37,12 @@ public class AuthUser extends User {
 		this.userId = userId;
 	}
 
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/ClassGroupDao.java

@@ -2,8 +2,17 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.ClassGroup;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
-	
+
+    /**
+     * 查询老师乐团课课程
+     * @param teacherId
+     * @return
+     */
+    List<ClassGroup> findClassGroup4Teacher(@Param("teacherId") int teacherId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/StudentApplyDetailUtilEntity.java

@@ -1,9 +1,10 @@
 package com.ym.mec.web.dal.utilEntity;
 
-import com.ym.mec.web.dal.enums.UserGenderEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.common.enums.UserGenderEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 public class StudentApplyDetailUtilEntity {
 
     @ApiModelProperty(value = "学生姓名",required = false)

mec-web/src/main/java/com/ym/mec/web/service/ClassGroupService.java

@@ -3,6 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.ClassGroup;
 
+import java.util.List;
+
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
+    /**
+     * 查询老师乐团课课程
+     * @param teacherId
+     * @return
+     */
+    List<ClassGroup> findClassGroup4Teacher(int teacherId);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/ClassGroupServiceImpl.java

@@ -9,6 +9,8 @@ import com.ym.mec.web.dal.dao.ClassGroupDao;
 import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.service.ClassGroupService;
 
+import java.util.List;
+
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>  implements ClassGroupService {
 	
@@ -19,5 +21,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	public BaseDAO<Integer, ClassGroup> getDAO() {
 		return classGroupDao;
 	}
-	
+
+	@Override
+    public List<ClassGroup> findClassGroup4Teacher(int teacherId) {
+        return classGroupDao.findClassGroup4Teacher(teacherId);
+    }
 }

mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -22,8 +22,8 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="ClassGroup">
-		SELECT * FROM class_group WHERE id_ = #{id} 
-	</select>
+        SELECT * FROM class_group WHERE id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="ClassGroup">
@@ -80,8 +80,8 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM class_group WHERE id_ = #{id} 
-	</delete>
+        DELETE FROM class_group WHERE id_ = #{id}
+    </delete>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ClassGroup" parameterType="map">
@@ -93,4 +93,17 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM class_group
 	</select>
+    <select id="findClassGroup4Teacher" resultMap="ClassGroup">
+        SELECT
+        c.*,
+        m.*
+        FROM
+        class_group c,
+        music_group m
+        WHERE
+        c.main_teacher_id_ = #{teacherId}
+        OR
+        c.assistant_teacher_id_ = #{teacherId}
+
+    </select>
 </mapper>