推送

.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,14 @@
+GET http://127.0.0.1:8005/teacher/findTeacherByTenantId
+Authorization: bearer 7e4145d6-111d-429b-893a-4546df0f58ed
+tenantId: 1
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-06T170540.200.json
+
+###
+
 GET http://127.0.0.1:9002/classGroup/findTeacherClassStudents?classGroupId=191
 Authorization: bearer 7957b8d7-63d0-43e1-9c06-8a36b2cc85a4
 Connection: Keep-Alive
@@ -798,18 +809,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:8005/classGroup/teachingPointCourse
-Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
-Content-Type: application/json
-coopId: 7
-Content-Length: 68
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"startTime":"2023-05-22","endTime":"2023-05-28","page":1,"rows":20}
-
-<> 2023-06-01T155146.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ImLiveBroadcastRoomVo.java

@@ -143,6 +143,17 @@ public class ImLiveBroadcastRoomVo implements Serializable {
     @ApiModelProperty("剩余时长")
     private int surplusTime;
 
+    @ApiModelProperty("声部ID")
+    private Integer subjectId;
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
     public EUseScene getUseScene() {
         return useScene;
     }

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

@@ -16,11 +16,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.dto.VipGroupClassGroupMapper;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.mapper.LiveGroupPlusMapper;
+import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
 import com.ym.mec.biz.dal.wrapper.LiveGroupWrapper;
 import com.ym.mec.biz.service.*;
 import org.apache.commons.collections.MapUtils;
@@ -41,33 +43,6 @@ import org.springframework.util.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.GroupDao;
-import com.ym.mec.biz.dal.dao.OrganizationDao;
-import com.ym.mec.biz.dal.dao.StudentApplyRefundsDao;
-import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
-import com.ym.mec.biz.dal.dao.StudentPauseInfoDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDetailDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountLogDao;
-import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dao.TeacherDefaultVipGroupSalaryDao;
-import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
-import com.ym.mec.biz.dal.dao.VipGroupDao;
-import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao;
-import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
-import com.ym.mec.biz.dal.dao.VipGroupStudentCoursePriceDao;
 import com.ym.mec.biz.dal.entity.StudentApplyRefunds.StudentApplyRefundsStatus;
 import com.ym.mec.biz.dal.page.ActivityUserQueryInfo;
 import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
@@ -223,6 +198,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Autowired
     private SubjectService subjectService;
 
+    @Autowired
+    private SysMessageConfigDao sysMessageConfigDao;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(VipGroup.class);
 
     @Override
@@ -437,6 +415,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             classGroupTeacherSalaryDao.update(classGroupTeacherSalary);
         }
 
+        vipGroup.getVipGroupApplyBaseInfo().setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
         //课程信息调整
         List<CourseSchedule> courseSchedules = vipGroup.getCourseSchedules();
         ClassGroup finalClassGroup = classGroup;
@@ -576,6 +555,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         className.append(StringUtils.join(studentNames, ","));
         vipGroupApplyBaseInfoDto.setName(className.toString());
+
+        vipGroupApplyBaseInfoDto.setName(vipGroup.getLiveBroadcastRoom().getRoomTitle());
         vipGroupDao.insert(vipGroupApplyBaseInfoDto);
 
         Map<String, BigDecimal> costInfo = Maps.newHashMap();
@@ -4954,6 +4935,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             return;
         }
 
+
+        SysMessageConfig sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START.getCode());
+        String teacherUrl = sysMessageConfig.getUrl();
+        sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.JIGUANG_LIVE_COURSE_START_STUDENT.getCode());
+        String studentUrl = sysMessageConfig.getUrl();
+        sysMessageConfig = sysMessageConfigDao.queryByType(MessageTypeEnum.IM_LIVE_COURSE_START_GROUP.getCode());
+        String imUrl = sysMessageConfig.getUrl();
+
+
         for (CourseSchedule courseSchedule : courseSchedules) {
 
             // 获取班级名
@@ -4969,7 +4959,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 userMap.put(actualTeacherId, actualTeacherId.toString());
 
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_LIVE_COURSE_START,
-                        userMap, null, 0, null, "TEACHER", classGroup.getName());
+                        userMap, null, 0,teacherUrl , "TEACHER", classGroup.getName());
             }
 
             // 通知学生
@@ -4981,12 +4971,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 });
 
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_LIVE_COURSE_START_STUDENT,
-                        userMap, null, 0, null, "STUDENT", classGroup.getName());
+                        userMap, null, 0, studentUrl, "STUDENT", classGroup.getName());
             }
+            ImLiveBroadcastRoomVo imLiveBroadcastRoomVo = imLiveBroadcastRoomService.queryRoomInfo(courseSchedule.getLiveRoomId());
 
-            // im消息 TODO
-            sysMessageService.batchSendImGroupMessage(MessageTypeEnum.IM_LIVE_COURSE_START_GROUP, courseSchedule.getActualTeacherId().toString(), "extra",
-                    new String[]{classGroup.getId().toString()},null);
+            // im消息
+            imUrl = MessageFormatter.arrayFormat(imUrl,courseSchedule.getId(), imLiveBroadcastRoomVo.getSubjectId());
+            sysMessageService.batchSendImGroupMessage(MessageTypeEnum.IM_LIVE_COURSE_START_GROUP, courseSchedule.getActualTeacherId().toString(), imUrl,
+                    new String[]{classGroup.getId().toString()},null, classGroup.getName());
 
         }
 

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

@@ -67,7 +67,8 @@
         a.service_provider_ as serviceProvider,
         a.view_mode_ AS viewMode,
         a.shopping_title_ AS shoppingTitle,
-        a.use_scene_ as useScene
+        a.use_scene_ as useScene,
+        a.subject_id_ as subjectId
         from im_live_broadcast_room as a
         left join tenant_info AS t on a.tenant_id_ = t.id_
         left join sys_user AS b on a.speaker_id_ = b.id_

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

@@ -1,10 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.CourseHomework;
-import com.ym.mec.biz.dal.entity.StudentCourseHomework;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -18,6 +15,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 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.tenant.TenantContextHolder;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -138,6 +136,16 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.findTeacherByOrganId(organId,subjectIds,jobNature));
     }
 
+
+    @ApiOperation(value = "获取机构教师")
+    @GetMapping("/findTeacherByTenantId")
+    @PreAuthorize("@pcs.hasPermissions('teacher/findTeacherByTenantId')")
+    public HttpResponseResult<List<Teacher>> findTeacherByTenantId(String subjectIds, String jobNature) {
+        List<Organization> allOrgans = organizationService.findAllOrgans(TenantContextHolder.getTenantId());
+        String organIds = allOrgans.stream().map(o -> o.getId().toString()).collect(Collectors.joining(","));
+        return succeed(teacherService.findTeacherByOrganId(organIds,subjectIds,jobNature));
+    }
+
     @ApiOperation(value = "分页获取教师名称编号列表")
     @GetMapping("/queryNameList")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryNameList', 'system', 'education')")