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

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 
 import java.util.Date;
@@ -36,6 +37,16 @@ public class CourseGroupTeacherCardDto {
 
     private String studentNames;
 
+    private GroupStatusEnum groupStatus;
+
+    public GroupStatusEnum getGroupStatus() {
+        return groupStatus;
+    }
+
+    public void setGroupStatus(GroupStatusEnum groupStatus) {
+        this.groupStatus = groupStatus;
+    }
+
     public Integer getClassGroupId() {
         return classGroupId;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.GroupStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.page.QueryInfo;
 
@@ -12,6 +13,15 @@ public class GroupCourseScheduleQueryInfo extends QueryInfo {
     private Integer teacherId;
     private String groupId;
     private GroupType groupType;
+    private GroupStatusEnum groupStatus;
+
+    public GroupStatusEnum getGroupStatus() {
+        return groupStatus;
+    }
+
+    public void setGroupStatus(GroupStatusEnum groupStatus) {
+        this.groupStatus = groupStatus;
+    }
 
     public Integer getTeacherId() {
         return teacherId;

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

@@ -4,9 +4,9 @@ import com.ym.mec.biz.dal.dto.CourseGroupCreateDto;
 import com.ym.mec.biz.dal.dto.GroupHeadInfoDto;
 import com.ym.mec.biz.dal.entity.CoursesGroup;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.page.GroupCourseScheduleQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.Map;
@@ -29,7 +29,7 @@ public interface CoursesGroupService extends BaseService<Long, CoursesGroup> {
      * @param teacherId: 教师编号
      * @return java.util.List<com.ym.mec.biz.dal.dto.CourseGroupTeacherCardDto>
      */
-    PageInfo findTeacherCourseGroups(Integer teacherId, QueryInfo queryInfo);
+    PageInfo findTeacherCourseGroups(Integer teacherId, GroupCourseScheduleQueryInfo queryInfo);
 
     /**
      * @describe 获取课程对应班级头部信息

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

@@ -172,6 +172,10 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      */
     String TEACHER_BASE_URL = "teacher_base_url";
 
+    String COURSE_BEFORE_BUFFER_TIME = "course_before_buffer_time";
+
+    String COURSE_AFTER_BUFFER_TIME = "course_after_buffer_time";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -746,10 +746,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         }
         Date now = new Date();
         SysConfig studentAttendanceAfterTimeConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_BEFOR_COURSE_START_TIME_RANGE_VIP);
+		SysConfig courseBeforeBufferTime = sysConfigService.findByParamName(SysConfigService.COURSE_BEFORE_BUFFER_TIME);
+		SysConfig courseAfterBufferTime = sysConfigService.findByParamName(SysConfigService.COURSE_AFTER_BUFFER_TIME);
         Map<String, Object> result = new HashMap<>(3);
         result.put("vipAppealDaysRange", sysConfigDao.findConfigValue(SysConfigService.VIP_APPEAL_DAYS_RANGE));
         result.put("advanceLeaveHours", Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_LEAVE_HOURS)));
         result.put("joinRoomBeforeTime",studentAttendanceAfterTimeConfig.getParanValue(Integer.class));
+		result.put("courseBeforeBufferTime", courseBeforeBufferTime.getParanValue(Integer.class));
+		result.put("courseAfterBufferTime", courseAfterBufferTime.getParanValue(Integer.class));
 //		List<Integer> quitClassGroupIds=classGroupStudentMapperDao.findClassGroupIdByUserAndCourseDateAndStatus(user.getId(),classDate, ClassGroupStudentStatusEnum.QUIT.getCode());
         List<CourseScheduleDto> studentCourseSchedulesWithDate = courseScheduleDao.getStudentCourseSchedulesWithDate(classDate, user.getId().longValue(), null);
         List<Long> courseScheduleIds = studentCourseSchedulesWithDate.stream()

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dao.*;
 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.GroupCourseScheduleQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.controller.BaseController;
@@ -15,7 +16,6 @@ import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
@@ -221,7 +221,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
     }
 
     @Override
-    public PageInfo findTeacherCourseGroups(Integer teacherId, QueryInfo queryInfo) {
+    public PageInfo findTeacherCourseGroups(Integer teacherId, GroupCourseScheduleQueryInfo queryInfo) {
         if(Objects.isNull(teacherId)){
             throw new BizException("请指定老师");
         }
@@ -261,11 +261,14 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 groupCard.setName(teacherCourseGroup.getName());
                 groupCard.setSingleClassMinutes(teacherCourseGroup.getSingleClassMinutes());
                 groupCard.setSubjectId(teacherCourseGroup.getSubjectId());
+                groupCard.setGroupStatus(teacherCourseGroup.getStatus());
                 groupCard.setSubjectName(idSubjectMap.get(teacherCourseGroup.getSubjectId()).getName());
                 GroupCourseTimesDto groupCourseTimesInfo = groupCourseTimesInfoMap.get(String.valueOf(teacherCourseGroup.getId()));
                 GroupValidDateDto groupValidDate = groupValidateMap.get(String.valueOf(teacherCourseGroup.getId()));
-                groupCard.setCoursesStartDate(groupValidDate.getStartDate());
-                groupCard.setCoursesEndDate(groupValidDate.getEndDate());
+                if(Objects.nonNull(groupValidDate)){
+                    groupCard.setCoursesStartDate(groupValidDate.getStartDate());
+                    groupCard.setCoursesEndDate(groupValidDate.getEndDate());
+                }
                 groupCard.setClassGroupId(groupCourseTimesInfo.getClassGroupId());
                 groupCard.setTotalCourseTimes(groupCourseTimesInfo.getTotalCourseTimes());
                 groupCard.setSurplusClassTimes(groupCourseTimesInfo.getSurplusClassTimes());

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

@@ -141,23 +141,30 @@
 	</select>
 
     <select id="findTeacherCourseGroups" resultMap="CoursesGroup">
-		SELECT * FROM courses_group WHERE teacher_id_=#{teacherId} AND status_ IN ('APPLYING', 'NORMAL') ORDER BY id_ DESC
+		SELECT * FROM courses_group WHERE teacher_id_=#{teacherId}
+		<if test="groupStatus!=null">
+			AND status_ = #{groupStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+		</if>
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
     </select>
 
 	<select id="countTeacherGroups" resultType="int">
-		SELECT COUNT(id_) FROM courses_group WHERE teacher_id_=#{teacherId} AND status_ IN ('APPLYING', 'NORMAL')
-    </select>
+		SELECT COUNT(id_) FROM courses_group WHERE teacher_id_=#{teacherId}
+		<if test="groupStatus!=null">
+			AND status_ = #{groupStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+		</if>
+	</select>
 
     <select id="queryTeacherCourseGroups" resultMap="CoursesGroup">
 		SELECT * FROM courses_group
-		WHERE teacher_id_=#{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH')
+		WHERE teacher_id_=#{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH','CANCEL')
 		ORDER BY id_ DESC
 		<include refid="global.limit"/>
     </select>
     <select id="countTeacherCourseGroups" resultType="int">
 		SELECT COUNT(0) FROM courses_group
-		WHERE teacher_id_ = #{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH')
+		WHERE teacher_id_ = #{userId} AND status_ IN ('NOT_START', 'NORMAL', 'FINISH','CANCEL')
     </select>
     <select id="findFreezeMinutes" resultType="java.util.Map">
 		SELECT COUNT(DISTINCT cs.id_) * cg.single_class_minutes_ 'value',cg.id_ 'key' FROM courses_group cg

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

@@ -99,7 +99,8 @@ public class RoomServiceImpl implements RoomService {
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 
-        String userId = sysUserFeignService.queryUserInfo().getId().toString();
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        String userId = sysUser.getId().toString();
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
         try {
@@ -112,7 +113,7 @@ public class RoomServiceImpl implements RoomService {
                 }
             }else {
                 studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
-                if(teacher.getOrganId() == lesseeOrganId){
+                if(sysUser.getOrganId() == lesseeOrganId){
                     roomId = "I" + roomId;
                 }else {
                     roomId = "S" + roomId;

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseGroupController.java

@@ -12,7 +12,6 @@ import com.ym.mec.biz.service.GroupClassService;
 import com.ym.mec.biz.service.GroupCourseScheduleService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +59,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation(value = "获取课程组列表")
     @GetMapping("/findTeacherCourseGroups")
-    public HttpResponseResult findTeacherCourseGroups(QueryInfo queryInfo){
+    public HttpResponseResult findTeacherCourseGroups(GroupCourseScheduleQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){
             return failed(HttpStatus.FORBIDDEN,"请登录");

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -1,31 +1,12 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.biz.dal.dto.TeacherRemarkCommitDto;
-
-import com.ym.mec.common.page.QueryInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleDto;
+import com.ym.mec.biz.dal.dto.TeacherRemarkCommitDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
@@ -41,8 +22,19 @@ import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+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.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @Author Joburgess
@@ -93,6 +85,8 @@ public class TeacherCourseScheduleController extends BaseController {
         }
         SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE);
         SysConfig sysConfigVip = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE_VIP);
+        SysConfig courseBeforeBufferTime = sysConfigService.findByParamName(SysConfigService.COURSE_BEFORE_BUFFER_TIME);
+        SysConfig courseAfterBufferTime = sysConfigService.findByParamName(SysConfigService.COURSE_AFTER_BUFFER_TIME);
         SysConfig studentAttendanceAfterTimeConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_BEFOR_COURSE_START_TIME_RANGE_VIP);
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherCourseSchedulesWithDate(user.getId(),date,type);
         Map<String,Object> result = new HashMap<>();
@@ -101,6 +95,8 @@ public class TeacherCourseScheduleController extends BaseController {
         result.put("enableStudentAttendanceTimeRange",sysConfig.getParanValue(Integer.class));
         result.put("enableStudentAttendanceTimeRangeVip",sysConfigVip.getParanValue(Integer.class));
         result.put("joinRoomBeforeTime",studentAttendanceAfterTimeConfig.getParanValue(Integer.class));
+        result.put("courseBeforeBufferTime", courseBeforeBufferTime.getParanValue(Integer.class));
+        result.put("courseAfterBufferTime", courseAfterBufferTime.getParanValue(Integer.class));
         return succeed(result);
     }