Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -4,20 +4,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseScheduleStatistics;
 import org.apache.ibatis.annotations.Param;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.CourseListDto;
-import com.ym.mec.biz.dal.dto.HighClassGroupDto;
-import com.ym.mec.biz.dal.dto.Mapper;
-import com.ym.mec.biz.dal.dto.MusicGroupClassGroupDto;
-import com.ym.mec.biz.dal.dto.MusicGroupCourseScheduleDto;
-import com.ym.mec.biz.dal.dto.StudentPayInfoDto;
-import com.ym.mec.biz.dal.dto.SuperClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherClassGroupDto;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
@@ -874,4 +864,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     int teachingPointRemind(@Param("cooperationOrganId") Integer cooperationOrganId);
 
     void updateTeachingPointById(@Param("param") ClassGroup classGroup);
+
+    List<BaseMapDto> queryClassGroup(@Param("coopId") Integer coopId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/StudentPlusMapper.java

@@ -2,8 +2,6 @@ package com.ym.mec.biz.dal.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ym.mec.biz.dal.entity.Student;
-import com.ym.mec.biz.dal.entity.StudentNew;
 import com.ym.mec.biz.dal.wrapper.StudentWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -603,4 +603,13 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classIds 班级id列表
      */
     List<ClassGroup> queryByIds(List<Integer> classIds);
+
+    /**
+    * @description: 根据合作单位获取班级列表
+     * @param coopId
+    * @return java.util.List<com.ym.mec.biz.dal.dto.BaseMapDto>
+    * @author zx
+    * @date 2023/5/9 14:09
+    */
+    List<BaseMapDto> queryClassGroup(Integer coopId);
 }

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

@@ -3452,6 +3452,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    public List<BaseMapDto> queryClassGroup(Integer coopId) {
+        return classGroupDao.queryClassGroup(coopId);
+    }
+
+    @Override
     public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseScheduleDetail(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
         PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();

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

@@ -1665,6 +1665,13 @@
         and mg.del_flag_ = 0
         and (cg.teaching_point_ is null or cg.teaching_point_ = '')
     </select>
+    <select id="queryClassGroup" resultType="com.ym.mec.biz.dal.dto.BaseMapDto">
+        SELECT cg.id_ 'key',cg.name_ 'value'
+        from  class_group cg
+        left join music_group mg on mg.id_ = cg.music_group_id_
+        where mg.cooperation_organ_id_ = #{coopId}
+        and cg.del_flag_ = 0 and mg.del_flag_ = 0
+    </select>
 
     <update id="updateTeachingPointById">
         update class_group set teaching_point_ = #{param.teachingPoint} where id_ = #{param.id}

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -7,6 +7,8 @@ import com.ym.mec.biz.dal.enums.ETencentTRTCCallbackCommand;
 import com.ym.pojo.*;
 import com.ym.service.MessageService;
 import com.ym.service.RoomService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
@@ -250,10 +252,14 @@ public class RoomController{
         return new BaseResponse<>(result);
     }
 
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roomId", value = "房间id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "userId", value = "用户Id", dataType = "String"),
+    })
     @RequestMapping(value = "/members", method = RequestMethod.GET)
-    public Object getMembers(@RequestParam String roomId)
+    public Object getMembers(@RequestParam String roomId, @RequestParam String userId)
             throws Exception {
-        List<RoomResult.MemberResult> whiteboards = roomService.getMembers(roomId);
+        List<RoomResult.MemberResult> whiteboards = roomService.getMembers(roomId, userId);
         return new BaseResponse<>(whiteboards);
     }
 

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

@@ -364,8 +364,8 @@ public class RoomServiceImpl implements RoomService {
         }
 
         List<RoomMember> roomMemberList = roomMemberDao.findByRid(roomId);
-        if (roomMemberList != null && roomMemberList.size() > 0) {
-            Set<String> userIds = roomMemberList.stream().map(e -> e.getUid()).collect(Collectors.toSet());
+        if (CollectionUtils.isNotEmpty(roomMemberList)) {
+            Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, courseId.toString()));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, courseId.toString()));
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
@@ -1758,16 +1758,36 @@ public class RoomServiceImpl implements RoomService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<RoomResult.MemberResult> getMembers(String roomId) throws Exception {
+    public List<RoomResult.MemberResult> getMembers(String roomId, String userId) throws Exception {
+
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
         List<RoomMember> roomMemberList = roomMemberDao.findByRid(roomId);
-        if (roomMemberList != null && roomMemberList.size() > 0) {
+
+        // 参数过滤
+        if (StringUtils.isNotBlank(userId)) {
+            roomMemberList = roomMemberList.stream().filter(x -> x.getUid().equals(userId)).collect(Collectors.toList());
+        }
+
+        // 网络课用户信息
+        if (CollectionUtils.isNotEmpty(roomMemberList)) {
             List<CourseScheduleStudentMusicScore> scheduleStudentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(null, Long.parseLong(roomId.substring(1)), null, null, null);
             RoomResult roomResult = new RoomResult();
-            Set<String> userIds = roomMemberList.stream().map(e -> e.getUid()).collect(Collectors.toSet());
+            Set<String> userIds = roomMemberList.stream().map(RoomMember::getUid).collect(Collectors.toSet());
             Map<Integer, String> midiMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryMidiByUserIdsAndCourseId(userIds, roomId.substring(1)));
             Map<Integer, String> examSongMap = MapUtil.convertMybatisMap(courseScheduleStudentPaymentDao.queryExamSongByUserIdsAndCourseId(userIds, roomId.substring(1)));
             roomResult.setMembers(roomMemberList, midiMap, examSongMap, scheduleStudentMusicScores);
+
+            // 全员静音开启状态
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
+            if (Optional.ofNullable(courseSchedule.getMuteAll()).orElse(false)) {
+                for (RoomResult.MemberResult item : roomResult.getMembers()) {
+                    // 重置学生用户当前静音状态
+                    if (RoleStudent.getValue() == item.getRole()) {
+                        item.setMicrophone(false);
+                    }
+                }
+            }
+
             return roomResult.getMembers();
         }
         return null;

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -45,7 +45,7 @@ public interface RoomService {
     Boolean rejectControlDevice(String roomId, String ticket) throws Exception;
 
 
-    List<RoomResult.MemberResult> getMembers(String roomId) throws  Exception;
+    List<RoomResult.MemberResult> getMembers(String roomId, String userId) throws  Exception;
 
     Boolean applySpeech(String roomId) throws  Exception;
 

mec-web/src/main/java/com/ym/mec/web/controller/school/CoursePatrolEvaluationController.java

@@ -1,17 +1,16 @@
 package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
+
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
-import com.ym.mec.biz.dal.entity.CoursePatrolEvaluation;
 import com.ym.mec.biz.dal.wrapper.CoursePatrolEvaluationWrapper;
 import com.ym.mec.biz.service.CoursePatrolEvaluationService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,14 +42,14 @@ public class CoursePatrolEvaluationController extends BaseController {
 
     @ApiOperation(value = "学校端-查询巡堂统计分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
     @PostMapping("/pageStat")
-    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query,@RequestHeader Integer coopId) {
+    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query, @RequestHeader Integer coopId) {
         if (coopId == null) {
             return succeed();
         }
         query.setCooperationOrganId(coopId);
 
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat> page = coursePatrolEvaluationService.pageStat(QueryInfo.getPage(query), query);
-        return succeed(QueryInfo.pageInfo(page));
+        return succeed(PageUtil.pageInfo(page));
     }
 
 
@@ -62,7 +61,7 @@ public class CoursePatrolEvaluationController extends BaseController {
         query.setPatrolFlag(true);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
 
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     @ApiOperation(value = "学校端-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
@@ -74,7 +73,7 @@ public class CoursePatrolEvaluationController extends BaseController {
         query.setCooperationOrganId(coopId);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "学校端-添加巡堂信息", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluation")

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityController.java

@@ -1,16 +1,15 @@
 package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
-import com.ym.mec.biz.dal.entity.SchoolActivity;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
 import com.ym.mec.biz.service.SchoolActivityService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +38,7 @@ public class SchoolActivityController extends BaseController {
     
     @ApiOperation(value = "查询分页", notes = "学校活动- 传入 SchoolActivityWrapper.SchoolActivityQuery") 
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query,@RequestHeader Integer coopId) {
+    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query, @RequestHeader Integer coopId) {
 
         if (coopId == null) {
             return succeed();
@@ -47,7 +46,7 @@ public class SchoolActivityController extends BaseController {
         query.setCooperationOrganId(coopId);
         IPage<SchoolActivityWrapper.SchoolActivity> pages = schoolActivityService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
 
 

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityDetailController.java

@@ -2,13 +2,14 @@ package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.entity.SchoolActivityDetail;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityDetailWrapper;
 import com.ym.mec.biz.service.SchoolActivityDetailService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +42,7 @@ public class SchoolActivityDetailController extends BaseController {
         
         IPage<SchoolActivityDetail> pages = schoolActivityDetailService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "活动详情- 传入 SchoolActivityDetailWrapper.SchoolActivityDetail")

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityDetailUserController.java

@@ -2,13 +2,14 @@ package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.entity.SchoolActivityDetailUser;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityDetailUserWrapper;
 import com.ym.mec.biz.service.SchoolActivityDetailUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +42,7 @@ public class SchoolActivityDetailUserController extends BaseController {
         
         IPage<SchoolActivityDetailUser> pages = schoolActivityDetailUserService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "活动详情人员- 传入 SchoolActivityDetailUserWrapper.SchoolActivityDetailUser")

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolClassGroupController.java

@@ -0,0 +1,42 @@
+package com.ym.mec.web.controller.school;
+
+import com.ym.mec.biz.dal.dto.BaseMapDto;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.school.dto.ClassesForDayDto;
+import com.ym.mec.biz.dal.school.dto.CourseStudentDto;
+import com.ym.mec.biz.dal.school.dto.DailySummaryOfClassesForTheCurrentSemesterDto;
+import com.ym.mec.biz.dal.school.dto.SummaryOfCurrentSemesterCoursesDto;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.snaker.engine.model.BaseModel;
+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;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("schoolClassGroup")
+@Api(tags = "学校端班级服务")
+public class SchoolClassGroupController extends BaseController {
+
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation(value = "获取合作单位所有班级列表")
+    @GetMapping("/queryClassGroup")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "coopId", dataType = "Integer", required = true, value = "合作单位"),
+    })
+    public HttpResponseResult<List<BaseMapDto>> queryClassGroup(Integer coopId) {
+        return succeed(classGroupService.queryClassGroup(coopId));
+    }
+}