update

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.dto.CourseListDto;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
@@ -91,4 +92,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") int musicGroupId);
+
+    /**
+     * 获取学生所购买课程列表
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(int userId);
 }

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

@@ -20,6 +20,10 @@ public class Organization {
 	/** 机构名称 */
 	@ApiModelProperty(value = "机构名称",required = false)
 	private String name;
+
+	/** 机构名称 */
+	@ApiModelProperty(value = "区域名称",required = false)
+	private String areaName;
 	
 	/** 区域编码 */
 	@ApiModelProperty(value = "区域编码",required = false)
@@ -50,6 +54,14 @@ public class Organization {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
+	public String getAreaName() {
+		return areaName;
+	}
+
+	public void setAreaName(String areaName) {
+		this.areaName = areaName;
+	}
+
 	public List<Organization> getOrganizations() {
 		return organizations;
 	}

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

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.page.PageInfo;
@@ -103,4 +100,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
 
+    /**
+     * 获取学生所购买课程列表
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(int userId);
 }

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

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
@@ -264,4 +261,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupAndTeachersList;
     }
+
+    @Override
+    public List<CourseListDto> queryCoursePage(int userId) {
+        return classGroupDao.queryCoursePage(userId);
+    }
 }

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

@@ -255,4 +255,35 @@
     <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND del_flag_ = 0;
     </select>
+
+    <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
+        <result column="id_" property="musicGroupName"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_list_" property="teachMode"/>
+        <result column="name_" property="totalClassTimes"/>
+        <result column="student_num_" property="currentClassTimes"/>
+        <result column="create_time_" property="studentNames"/>
+        <result column="update_time_" property="teacherName"/>
+        <result column="type_" property="address"/>
+    </resultMap>
+    <select id="queryCoursePage" resultMap="CourseListDto">
+        SELECT * FROM (
+            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_
+            FROM student_registration sr
+            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+            WHERE sr.user_id_ = #{userId} AND cg.type_ != 'VIP'
+            UNION ALL
+            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_
+            FROM class_group_student_mapper cgsm
+            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+            WHERE cgsm.user_id_ = #{userId} AND cg.type_ = 'VIP') a
+            ORDER BY a.create_time_ DESC
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.Organization" id="Organization">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
+        <result column="area_name_" property="areaName"/>
         <result column="area_id_" property="areaId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -76,14 +77,14 @@
     <sql id="queryPageSql">
         <where>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
     </sql>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Organization" parameterType="map">
-        SELECT * FROM organization
+        SELECT o.*,sa.name_ area_name_ FROM organization o LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
         <include refid="queryPageSql"/>
          ORDER BY id_
         <include refid="global.limit"/>
@@ -91,12 +92,15 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM organization <include refid="queryPageSql"/>
+		SELECT COUNT(o.id_) FROM organization o <include refid="queryPageSql"/>
 	</select>
 
     <select id="findByParentId" resultMap="Organization">
-        SELECT * FROM organization <include refid="queryPageSql"/>
+        SELECT o.*,sa.name_ area_name_ FROM organization o
+        LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
+        <include refid="queryPageSql"/>
     </select>
+
     <select id="findByOrganIds" resultType="java.lang.String">
         SELECT name_ FROM organization IN (#{organIds}) WHERE del_flag_ = 0
     </select>

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

@@ -1,8 +1,12 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.service.ClassGroupService;
 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;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,9 +16,16 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class CourseController extends BaseController {
 
-    @ApiOperation("获取学生所在乐团列表")
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation("获取学生所购买课程列表")
     @GetMapping(value = "/queryUserMusicGroups")
     public Object queryCoursePage(){
-        return succeed();
+        AuthUser user = SecurityUtils.getUser();
+//        if(user == null){
+//            return failed("请登录");
+//        }
+        return succeed(classGroupService.queryCoursePage(1));
     }
 }

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

@@ -30,7 +30,7 @@ public class UploadFileController extends BaseController {
 	@Autowired
 	private UploadFileService uploadFileService;
 
-	@PostMapping(value = "uploadFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "uploadFile")
 	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) {
 		try {
 			if (file != null && StringUtils.isNotBlank(file.getOriginalFilename())) {

mec-web/src/main/resources/application.yml

@@ -7,6 +7,10 @@ eureka:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
 
 spring:
+  servlet:
+    multipart:
+      max-file-size: 10485760
+      max-request-size: 10485760
   application:
     name: web-server