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

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

@@ -1,10 +1,12 @@
 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 = "乐团、vip课编号",required = true)
+    private String musicGroupId;
+
     @ApiModelProperty(value = "学生姓名",required = true)
     private String studentNames;
 
@@ -20,8 +22,73 @@ public class CourseListDto {
     @ApiModelProperty(value = "当前课次",required = true)
     private Integer currentClassTimes;
 
+    @ApiModelProperty(value = "教师姓名",required = true)
     private String teacherName;
 
+    @ApiModelProperty(value = "上课模式",required = true)
     private String teachMode;
 
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public String getStudentNames() {
+        return studentNames;
+    }
+
+    public void setStudentNames(String studentNames) {
+        this.studentNames = studentNames;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
+    public Integer getCurrentClassTimes() {
+        return currentClassTimes;
+    }
+
+    public void setCurrentClassTimes(Integer currentClassTimes) {
+        this.currentClassTimes = currentClassTimes;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachMode() {
+        return teachMode;
+    }
+
+    public void setTeachMode(String teachMode) {
+        this.teachMode = teachMode;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.im.fallback;
 
 import com.ym.im.ImFeignService;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.stereotype.Component;
 
@@ -10,4 +11,24 @@ public class ImFeignServiceFallback implements ImFeignService {
     public Object getUser(ImUserModel userModel) {
         return null;
     }
+
+    @Override
+    public Object groupCreate(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupJoin(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupQuit(ImGroupModel groupModel) {
+        return null;
+    }
+
+    @Override
+    public Object groupDismiss(ImGroupModel groupModel) {
+        return null;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("course")
+@Api(tags = "课程服务")
+@RestController
+public class CourseController extends BaseController {
+
+    @ApiOperation("获取学生所在乐团列表")
+    @GetMapping(value = "/queryUserMusicGroups")
+    public Object queryCoursePage(){
+        return succeed();
+    }
+}