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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -93,7 +93,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "authCode", value = "验证码", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "newPassword", value = "新密码", required = true, dataType = "String")})
-	public Object updatePassword(String mobile,String authCode,String password,String newPassword) {
+	public Object updatePassword(String mobile,String authCode,String newPassword) {
 		if(StringUtils.isEmpty(mobile) || StringUtils.isEmpty(authCode) || StringUtils.isEmpty(newPassword)){
 			return failed("参数校验异常");
 		}
@@ -102,7 +102,7 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if(smsCodeService.verifyValidCode(mobile, authCode)){
-			sysUserService.updatePassword(mobile,newPassword);
+			sysUserService.updatePassword(mobile,new BCryptPasswordEncoder().encode(newPassword));
 			return succeed();
 		}else {
 			return failed("验证码错误");

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DemoGroupClassGroupMapperDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface DemoGroupClassGroupMapperDao extends BaseDAO<Long, DemoGroupClassGroupMapper> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DemoGroupCoursesPlanDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface DemoGroupCoursesPlanDao extends BaseDAO<Long, DemoGroupCoursesPlan> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DemoGroupDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.DemoGroup;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -29,7 +29,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param userId
      * @return
      */
-    int countUserMusicGroups(Integer userId);
+    Integer countUserMusicGroups(Integer userId);
 
     /**
      * 根据课程类型获取剩余课时
@@ -37,5 +37,5 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param type
      * @return
      */
-    int countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
+    Integer countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysAreaDao.java

@@ -18,4 +18,11 @@ public interface SysAreaDao extends BaseDAO<Integer, SysArea> {
      * @return
      */
     List<SysArea> findRootList(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
+
+    /**
+     * 根据子级区域获取父级节点
+     * @param id
+     * @return
+     */
+    SysArea getParentArea(Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ConditionDto.java

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class ConditionDto {
+
+    @ApiModelProperty(value = "条件ID",required = false)
+    private Long id;
+
+    @ApiModelProperty(value = "条件名称",required = false)
+    private String name;
+
+    public ConditionDto(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class CourseListDto {
+
+    @ApiModelProperty(value = "学生姓名",required = true)
+    private String studentNames;
+
+    @ApiModelProperty(value = "乐团、vip课名称",required = true)
+    private String musicGroupName;
+
+    @ApiModelProperty(value = "授课地址",required = true)
+    private String address;
+
+    @ApiModelProperty(value = "总课次",required = true)
+    private Integer totalClassTimes;
+
+    @ApiModelProperty(value = "当前课次",required = true)
+    private Integer currentClassTimes;
+
+    private String teacherName;
+
+    private String teachMode;
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroup.java

@@ -0,0 +1,92 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(demo_group):
+ */
+public class DemoGroup {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private String name;
+	
+	/** 单节课时 */
+	private Integer singleClassMinutes;
+	
+	/** 所属分部列表 */
+	private String organIdList;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/** 老师编号 */
+	private Integer userId;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setSingleClassMinutes(Integer singleClassMinutes){
+		this.singleClassMinutes = singleClassMinutes;
+	}
+	
+	public Integer getSingleClassMinutes(){
+		return this.singleClassMinutes;
+	}
+			
+	public void setOrganIdList(String organIdList){
+		this.organIdList = organIdList;
+	}
+	
+	public String getOrganIdList(){
+		return this.organIdList;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroupClassGroupMapper.java

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(demo_group_class_group_mapper):
+ */
+public class DemoGroupClassGroupMapper {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Long demoGroupId;
+	
+	/**  */
+	private Integer classGroupId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setDemoGroupId(Long demoGroupId){
+		this.demoGroupId = demoGroupId;
+	}
+	
+	public Long getDemoGroupId(){
+		return this.demoGroupId;
+	}
+			
+	public void setClassGroupId(Integer classGroupId){
+		this.classGroupId = classGroupId;
+	}
+	
+	public Integer getClassGroupId(){
+		return this.classGroupId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroupCoursesPlan.java

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(demo_group_courses_plan):
+ */
+public class DemoGroupCoursesPlan {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Long demoGroupId;
+	
+	/**  */
+	private java.util.Date coursesStartTime;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setDemoGroupId(Long demoGroupId){
+		this.demoGroupId = demoGroupId;
+	}
+	
+	public Long getDemoGroupId(){
+		return this.demoGroupId;
+	}
+			
+	public void setCoursesStartTime(java.util.Date coursesStartTime){
+		this.coursesStartTime = coursesStartTime;
+	}
+	
+	public java.util.Date getCoursesStartTime(){
+		return this.coursesStartTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), TRIAL("trial", "试听课");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("demo", "试听课");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentVipGroupQueryInfo.java

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+public class StudentVipGroupQueryInfo extends QueryInfo {
+
+    private Long subjectId;
+
+    private Long classType;
+
+    public Long getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Long subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Long getClassType() {
+        return classType;
+    }
+
+    public void setClassType(Long classType) {
+        this.classType = classType;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupClassGroupMapperService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper;
+import com.ym.mec.common.service.BaseService;
+
+public interface DemoGroupClassGroupMapperService extends BaseService<Long, DemoGroupClassGroupMapper> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupCoursesPlanService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan;
+import com.ym.mec.common.service.BaseService;
+
+public interface DemoGroupCoursesPlanService extends BaseService<Long, DemoGroupCoursesPlan> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.DemoGroup;
+import com.ym.mec.common.service.BaseService;
+
+public interface DemoGroupService extends BaseService<Long, DemoGroup> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/SysAreaService.java

@@ -22,4 +22,11 @@ public interface SysAreaService extends BaseService<Integer, SysArea> {
      * @return
      */
     List<SysArea> queryChild(TreeDto treeDto);
+
+    /**
+     * 根据子级区域获取父级节点
+     * @param id
+     * @return
+     */
+    SysArea getParentArea(Integer id);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
 import com.ym.mec.biz.dal.entity.VipGroup;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -23,7 +24,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @Date: 2019/9/23
      * 获取可购买vip课列表
      */
-    PageInfo findStudentVipGroupList(QueryInfo queryInfo);
+    PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo);
 
     /**
      * @Author: Joburgess

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DemoGroupClassGroupMapperServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.DemoGroupClassGroupMapperDao;
+import com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper;
+import com.ym.mec.biz.service.DemoGroupClassGroupMapperService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class DemoGroupClassGroupMapperServiceImpl extends BaseServiceImpl<Long, DemoGroupClassGroupMapper>  implements DemoGroupClassGroupMapperService {
+	
+	@Autowired
+	private DemoGroupClassGroupMapperDao demoGroupClassGroupMapperDao;
+
+	@Override
+	public BaseDAO<Long, DemoGroupClassGroupMapper> getDAO() {
+		return demoGroupClassGroupMapperDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DemoGroupCoursesPlanServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.DemoGroupCoursesPlanDao;
+import com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan;
+import com.ym.mec.biz.service.DemoGroupCoursesPlanService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class DemoGroupCoursesPlanServiceImpl extends BaseServiceImpl<Long, DemoGroupCoursesPlan>  implements DemoGroupCoursesPlanService {
+	
+	@Autowired
+	private DemoGroupCoursesPlanDao demoGroupCoursesPlanDao;
+
+	@Override
+	public BaseDAO<Long, DemoGroupCoursesPlan> getDAO() {
+		return demoGroupCoursesPlanDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DemoGroupServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.DemoGroupDao;
+import com.ym.mec.biz.dal.entity.DemoGroup;
+import com.ym.mec.biz.service.DemoGroupService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  implements DemoGroupService {
+	
+	@Autowired
+	private DemoGroupDao demoGroupDao;
+
+	@Override
+	public BaseDAO<Long, DemoGroup> getDAO() {
+		return demoGroupDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysAreaServiceImpl.java

@@ -39,6 +39,11 @@ public class SysAreaServiceImpl extends BaseServiceImpl<Integer, SysArea> implem
 		return sysAreaDao.findRootList(treeDto.getParentId(),treeDto.getDelFlag());
 	}
 
+	@Override
+	public SysArea getParentArea(Integer id) {
+		return sysAreaDao.getParentArea(id);
+	}
+
 	private SysArea getTree(SysArea area){
 		//得到根节点对象
 		//获取子节点list

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.VipGroupService;
@@ -70,7 +71,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
-	public PageInfo findStudentVipGroupList(QueryInfo queryInfo) {
+	public PageInfo findStudentVipGroupList(StudentVipGroupQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);

mec-biz/src/main/resources/config/mybatis/DemoGroupClassGroupMapperMapper.xml

@@ -0,0 +1,68 @@
+<?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.ym.mec.biz.dal.dao.DemoGroupClassGroupMapperDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper" id="DemoGroupClassGroupMapper">
+		<result column="id_" property="id" />
+		<result column="demo_group_id_" property="demoGroupId" />
+		<result column="class_group_id_" property="classGroupId" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="DemoGroupClassGroupMapper" >
+		SELECT * FROM demo_group_class_group_mapper WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="DemoGroupClassGroupMapper">
+		SELECT * FROM demo_group_class_group_mapper ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO demo_group_class_group_mapper (id_,demo_group_id_,class_group_id_,create_time_) VALUES(#{id},#{demoGroupId},#{classGroupId},#{createTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.DemoGroupClassGroupMapper">
+		UPDATE demo_group_class_group_mapper <set>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="classGroupId != null">
+class_group_id_ = #{classGroupId},
+</if>
+<if test="demoGroupId != null">
+demo_group_id_ = #{demoGroupId},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM demo_group_class_group_mapper WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="DemoGroupClassGroupMapper" parameterType="map">
+		SELECT * FROM demo_group_class_group_mapper ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM demo_group_class_group_mapper
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/DemoGroupCoursesPlanMapper.xml

@@ -0,0 +1,68 @@
+<?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.ym.mec.biz.dal.dao.DemoGroupCoursesPlanDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan" id="DemoGroupCoursesPlan">
+		<result column="id_" property="id" />
+		<result column="demo_group_id_" property="demoGroupId" />
+		<result column="courses_start_time_" property="coursesStartTime" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="DemoGroupCoursesPlan" >
+		SELECT * FROM demo_group_courses_plan WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="DemoGroupCoursesPlan">
+		SELECT * FROM demo_group_courses_plan ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO demo_group_courses_plan (id_,demo_group_id_,courses_start_time_,create_time_) VALUES(#{id},#{demoGroupId},#{coursesStartTime},#{createTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.DemoGroupCoursesPlan">
+		UPDATE demo_group_courses_plan <set>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="demoGroupId != null">
+demo_group_id_ = #{demoGroupId},
+</if>
+<if test="coursesStartTime != null">
+courses_start_time_ = #{coursesStartTime},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM demo_group_courses_plan WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="DemoGroupCoursesPlan" parameterType="map">
+		SELECT * FROM demo_group_courses_plan ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM demo_group_courses_plan
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -0,0 +1,80 @@
+<?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.ym.mec.biz.dal.dao.DemoGroupDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.DemoGroup" id="DemoGroup">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="single_class_minutes_" property="singleClassMinutes" />
+		<result column="organ_id_list_" property="organIdList" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="user_id_" property="userId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="DemoGroup" >
+		SELECT * FROM demo_group WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="DemoGroup">
+		SELECT * FROM demo_group ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.DemoGroup" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO demo_group (id_,name_,single_class_minutes_,organ_id_list_,create_time_,update_time_,user_id_) VALUES(#{id},#{name},#{singleClassMinutes},#{organIdList},#{createTime},#{updateTime},#{userId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.DemoGroup">
+		UPDATE demo_group <set>
+<if test="userId != null">
+user_id_ = #{userId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="singleClassMinutes != null">
+single_class_minutes_ = #{singleClassMinutes},
+</if>
+<if test="organIdList != null">
+organ_id_list_ = #{organIdList},
+</if>
+<if test="name != null">
+name_ = #{name},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM demo_group WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="DemoGroup" parameterType="map">
+		SELECT * FROM demo_group ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM demo_group
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -96,7 +96,7 @@
     </update>
 
     <update id="updateUserLockStatus">
-		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,9,0) WHERE id_=#{userID}
+		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,1,0) WHERE id_=#{userID}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -130,6 +130,7 @@
 
     <sql id="queryCondition">
         <where>
+            su.user_type_='SYSTEM'
             <if test="organId != null">
                 and su.organ_id_ = #{organId}
             </if>

mec-biz/src/main/resources/config/mybatis/SysAreaMapper.xml

@@ -80,4 +80,7 @@
         SELECT * FROM sys_area WHERE parent_organ_id_ = #{parentId}
         AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+    <select id="getParentArea" resultMap="SysArea">
+        SELECT * FROM sys_area WHERE id_ = (SELECT parent_organ_id_ FROM sys_area WHERE id_ = #{id})
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -145,7 +145,16 @@
 		SELECT COUNT(*) FROM vip_group
 	</select>
 
-
+    <sql id="studentVipGroupQueryCondition">
+        <where>
+            <if test="subjectId!=null">
+                FIND_IN_SET(#{subjectId},cg.subject_id_list_)
+            </if>
+            <if test="classType!=null">
+                AND cg.teach_mode_=#{classType}
+            </if>
+        </where>
+    </sql>
 
     <select id="findVipGroups" resultMap="studentVipGroup">
        SELECT
@@ -166,6 +175,7 @@
             LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
             LEFT JOIN class_group_teacher_mapper cgtm ON vgcgm.class_group_id_=cgtm.class_group_id_
             LEFT JOIN sys_user su ON cgtm.user_id_=su.id_
+            <include refid="studentVipGroupQueryCondition"/>
         ORDER BY vg.id_ DESC
         <include refid="global.limit"/>
     </select>
@@ -174,6 +184,9 @@
             count(*)
         FROM
             vip_group vg
+        LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_=vgcgm.vip_group_id_
+        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+        <include refid="studentVipGroupQueryCondition"/>
     </select>
     <select id="getVipGroupBaseInfo" resultMap="vipGroupManageDetailDto">
         SELECT

mec-client-api/src/main/java/com/ym/im/ImFeignService.java

@@ -2,6 +2,7 @@ package com.ym.im;
 
 import com.ym.im.fallback.ImFeignServiceFallback;
 import com.ym.mec.common.config.FeignConfiguration;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,6 +11,43 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(name = "im-server", configuration = FeignConfiguration.class, fallback = ImFeignServiceFallback.class)
 public interface ImFeignService {
 
+    /**
+     * 用户注册
+     * @param userModel
+     * @return
+     */
     @PostMapping(value = "user/register")
     Object getUser(@RequestBody ImUserModel userModel);
+
+    /**
+     * 创建群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/create")
+    Object groupCreate(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 加入群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/join")
+    Object groupJoin(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 退出群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/quit")
+    Object groupQuit(@RequestBody ImGroupModel groupModel);
+
+    /**
+     * 解散群组
+     * @param groupModel
+     * @return
+     */
+    @PostMapping(value = "group/dismiss")
+    Object groupDismiss(@RequestBody ImGroupModel groupModel);
 }

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupMember.java

@@ -0,0 +1,41 @@
+package com.ym.mec.common.entity;
+
+public class ImGroupMember {
+    public String id;
+    public String groupId;
+    public Integer munite;
+
+    public ImGroupMember() {
+    }
+
+    public ImGroupMember(String id, String groupId, Integer munite) {
+        this.id = id;
+        this.groupId = groupId;
+        this.munite = munite;
+    }
+
+    public ImGroupMember setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getGroupId() {
+        return this.groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getMunite() {
+        return this.munite;
+    }
+
+    public void setMunite(Integer munite) {
+        this.munite = munite;
+    }
+}

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -0,0 +1,69 @@
+package com.ym.mec.common.entity;
+
+public class ImGroupModel {
+    private String id;
+    private ImGroupMember[] members;
+    private String name;
+    private Integer minute;
+    private Integer status;
+
+    public ImGroupModel() {
+    }
+
+    public ImGroupModel(String id, ImGroupMember[] members, String name, Integer minute) {
+        this.id = id;
+        this.members = members;
+        this.name = name;
+        this.minute = minute;
+    }
+
+    public ImGroupModel(String id, Integer status) {
+        this.id = id;
+        this.status = status;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public ImGroupModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public ImGroupMember[] getMembers() {
+        return this.members;
+    }
+
+    public ImGroupModel setMembers(ImGroupMember[] members) {
+        this.members = members;
+        return this;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public ImGroupModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getMinute() {
+        return this.minute;
+    }
+
+    public ImGroupModel setMinute(Integer minute) {
+        this.minute = minute;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return this.status;
+    }
+
+    public ImGroupModel setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+}

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -83,6 +83,7 @@ public class RoomServiceImpl implements RoomService {
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
+        roomId = "DAYA" + roomId;
 //        String userId = getUser().getUserId().toString();
         String userId = sysUserFeignService.queryUserInfo().getId().toString();
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -4,6 +4,8 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +27,11 @@ public class MusicGroupController extends BaseController {
     @GetMapping(value = "/queryUserMusicGroups")
     public Object queryUserMusicGroups(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
+        AuthUser user = SecurityUtils.getUser();
         if(sysUser == null){
             return failed("请重新登录");
         }
-        return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
+        return succeed(musicGroupService.queryUserMusicGroups(1));
     }
 
     @ApiOperation("获取学生个人中心乐团信息")
@@ -38,6 +41,6 @@ public class MusicGroupController extends BaseController {
         if(sysUser == null){
             return failed("请重新登录");
         }
-        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
+        return succeed(musicGroupService.queryPersonalMusicGroups(1));
     }
 }

mec-student/src/main/java/com/ym/mec/student/controller/StudentVipGroupController.java

@@ -1,6 +1,9 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.dto.ConditionDto;
 import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
+import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
+import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -9,6 +12,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/23
@@ -21,11 +29,28 @@ public class StudentVipGroupController extends BaseController {
 
     @Autowired
     private VipGroupService vipGroupService;
+    @Autowired
+    private SubjectService subjectService;
+
+    @ApiOperation("获取vip课列表筛选条件")
+    @GetMapping(value = "/findQueryCondition")
+    public Object findQueryCondition(){
+        Map<String,Object> result=new HashMap<>();
+        result.put("subjects",subjectService.findAll(null));
+        List<ConditionDto> conditionDtos=new ArrayList<>();
+        conditionDtos.add(new ConditionDto(0L,"线下"));
+        conditionDtos.add(new ConditionDto(1L,"线上"));
+        result.put("pageInfo",conditionDtos);
+        return succeed(result);
+    }
 
     @ApiOperation("获取vip课列表")
     @GetMapping(value = "/queryVipGroups")
-    public Object queryVipGroups(QueryInfo queryInfo){
-        return succeed(vipGroupService.findStudentVipGroupList(queryInfo));
+    public Object queryVipGroups(StudentVipGroupQueryInfo queryInfo){
+        Map<String,Object> result=new HashMap<>();
+        result.put("recommendVipGroups",new ArrayList<>());
+        result.put("pageInfo",vipGroupService.findStudentVipGroupList(queryInfo));
+        return succeed(result);
     }
 
     @ApiOperation("获取学生端vip课显示详情")

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/vendors/AliyunOssStoragePlugin.java

@@ -21,13 +21,13 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 	@Value("${storage.oss.endpoint:oss-cn-beijing.aliyuncs.com}")
 	private String endpoint;
 
-	@Value("${storage.oss.accessKeyId:LTAIwZW9XqrfsZ4r}")
+	@Value("${storage.oss.accessKeyId:LTAI4Fdhxwfo7FsBDZKK8Wfv}")
 	private String accessKeyId;
 
-	@Value("${storage.oss.accessKeySecret:5uDsNZmHMxcnxav8w9byII4zcPpu5G}")
+	@Value("${storage.oss.accessKeySecret:ERRma4P9VWbD98n93gspnZXmoq7rn5}")
 	private String accessKeySecret;
 
-	@Value("${storage.oss.bucketName:yooma-test}")
+	@Value("${storage.oss.bucketName:daya-online}")
 	private String bucketName;
 
 	private OSSClient ossClient;

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

@@ -3,8 +3,10 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -52,12 +54,12 @@ public class SysAreaController extends BaseController {
     public Object update(SysArea area){
         area.setUpdateTime(new Date());
         return succeed(sysAreaService.update(area));
-    }
+    }*/
 
-    @ApiOperation(value = "根据区域编号查询区域详情")
-    @GetMapping("/get/{id}")
+    @ApiOperation(value = "根据子级区域获取父级节点")
+    @GetMapping("/getParentArea/{id}")
     @ApiParam(value = "区域编号", required = true)
-    public Object get( @PathVariable("id") Integer id){
-        return succeed(sysAreaService.get(id));
-    }*/
+    public Object getParentArea( @PathVariable("id") Integer id){
+        return succeed(sysAreaService.getParentArea(id));
+    }
 }