Merge remote-tracking branch 'origin/master'

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

@@ -55,7 +55,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     List<BasicUserDto> findTeachersByStuId(Integer studentId);
 
     /**
-     * 获取用户所在乐团
+     * 获取学员所在乐团
      * @param userId
      * @return
      */
@@ -102,5 +102,5 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param musicGroupIds
      * @return
      */
-    List<MusicGroup> queryListByIds(@Param("musicGroupIds") Set<String> musicGroupIds);
+    List<MusicGroup> queryListByIds(@Param("musicGroupIds") String musicGroupIds);
 }

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

@@ -147,4 +147,12 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return
      */
     int countMusicGroupStudentApply(Map<String, Object> params);
+
+    /**
+     * 获取老师的群组基本信息
+     * @param teacherIds
+     * @param search
+     * @return
+     */
+    List<BasicUserDto> queryMusicGroupStudents(@Param("teacherIds") String teacherIds,@Param("search") String search);
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -34,6 +35,9 @@ public class ClassGroup4MixDto {
     @ApiModelProperty(value = "排课次数", required = true)
     private Integer courseTimes;
 
+    @ApiModelProperty(value = "课程类型", required = true)
+    private CourseSchedule.CourseScheduleType courseType;
+
     @ApiModelProperty(value = "排课方式", required = true)
     private List<CourseTimeDto> courseTimeDtoList;
 
@@ -116,4 +120,12 @@ public class ClassGroup4MixDto {
     public void setCourseTimeDtoList(List<CourseTimeDto> courseTimeDtoList) {
         this.courseTimeDtoList = courseTimeDtoList;
     }
+
+    public CourseSchedule.CourseScheduleType getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(CourseSchedule.CourseScheduleType courseType) {
+        this.courseType = courseType;
+    }
 }

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

@@ -29,7 +29,7 @@ public class CourseSchedule {
 		HIGH("HIGH", "小班课"), VIP("VIP", "vip课"),
 		DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"),
 		PRACTICE("PRACTICE", "练习课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"),
-		TRAINING("TRAINING", "集训课");
+		TRAINING("TRAINING", "集训课"),CLASSROOM("CLASSROOM", "课堂课");
 
 		private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MusicGroupStatusEnum.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
-
+	DRAFT("DRAFT","草稿"),AUDIT("AUDIT","审核中"),
 	APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"),
 	PREPARE("PREPARE", "筹备中"), PROGRESS("PROGRESS", "进行中"),
 	CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");

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

@@ -8,13 +8,13 @@ import com.ym.mec.common.page.QueryInfo;
  */
 public class VipGroupActivityQueryInfo extends QueryInfo {
 
-    private Long organId;
+    private Integer organId;
 
-    public Long getOrganId() {
+    public Integer getOrganId() {
         return organId;
     }
 
-    public void setOrganId(Long organId) {
+    public void setOrganId(Integer organId) {
         this.organId = organId;
     }
 }

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

@@ -291,5 +291,5 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> highClassGroupList(String musicGroupId);
 
 
-    List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId);
+    List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId);
 }

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

@@ -43,7 +43,6 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
     MusicGroupRegRespDto getMusicGroupRegInfo(String musicGroupId);
 
     /**
-     * 报名人数加一
      * @param musicGroupId
      * @param subjectId
      */

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

@@ -1466,7 +1466,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroupTeachersDto> classGroupAndTeacher(int classGroupId) {
+    public List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId) {
         List<ClassGroupTeachersDto> classGroups = classGroupDao.findClassGroupByMixClassGroupId(classGroupId);
         String classGroupIds = "";
         for (ClassGroupTeachersDto classGroupTeachersDto : classGroups) {

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

@@ -56,8 +56,10 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         classStudentMapper.setStatus(ClassGroupStudentStatusEnum.QUIT);
         update(classStudentMapper);
         StudentRegistration student = studentRegistrationService.findStudentByClassGroupIdAndUserId(userId, classGroupId);
-        student.setClassGroupId(null);
-        studentRegistrationService.update(student);
+        if(student != null) {
+            student.setClassGroupId(0);
+            studentRegistrationService.update(student);
+        }
 
         //2、班级人数调整
         classGroupService.updateClassStudentNum(classGroupId.longValue(), -1);

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

@@ -653,7 +653,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public List<MusicGroup> queryListByIds(Set<String> musicGroupIds) {
-        return musicGroupDao.queryListByIds(musicGroupIds);
+        return musicGroupDao.queryListByIds(StringUtils.join(musicGroupIds,","));
     }
 
     @Override
@@ -700,7 +700,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         teacherIds.add(musicGroup.getTeamTeacherId());
         teacherIds.add(musicGroup.getOperatorUserId());
         teacherIds.add(musicGroup.getDirectorUserId());
-        teacherIds.removeAll(null);
+        teacherIds.removeAll(Collections.singleton(null));
         for (Object teacherId:teacherIds) {
             groupMembers.add(new ImGroupMember(teacherId.toString()));
         }

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -111,6 +112,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) {
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
         int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();

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

@@ -21,7 +21,6 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode) {
-//		String verifyCode = (String) redisCache.get(loginVerifyCodeKey + mobile);
 		String verifyCode = sysMessageService.getSendedVerificationCode(MessageTypeEnum.SMS_VERIFY_CODE_LOGIN, mobile);
 		if(StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode,authCode)){
 			return true;
@@ -31,7 +30,6 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Override
 	public boolean sendValidCode(String mobile){
-		//保存发送记录
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
 		Integer userId = null;
 		if(sysUser != null){

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

@@ -19,6 +19,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -168,6 +169,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 			// 添加用户电子签章账户
 			contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
             //注册到融云
+            if(StringUtils.isEmpty(sysUser.getAvatar())){
+                sysUser.setAvatar("https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgHwgKc.jpg");
+            }
             ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
             sysUser.setImToken(register.getToken());
             teacherDao.updateUser(sysUser);

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

@@ -6,9 +6,7 @@ import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
-import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
@@ -44,6 +42,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private ClassGroupDao classGroupDao;
 	@Autowired
+	private MusicGroupDao musicGroupDao;
+	@Autowired
 	private DemoGroupDao demoGroupDao;
 	@Autowired
 	private OrganizationDao organizationDao;
@@ -56,7 +56,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
-	private ContractService contractService;
+	private SysConfigDao configDao;
 
 
 	@Override
@@ -91,8 +91,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
 		//添加用户电子签章账户
-		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+//		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		teacherDao.insert(teacher);
+		if(StringUtils.isEmpty(teacher.getAvatar())){
+			SysConfig head_url = configDao.findByParamName("user_default_head_url");
+			teacher.setAvatar(head_url.getParanValue());
+		}
 		ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
 		if(imResult != null){
 			teacher.setImToken(imResult.getToken());
@@ -160,17 +164,36 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				//获取当前班级老师总数
 				Integer num = numsMap.get(e.getId());
 				e.setCount(num == null?0:num + e.getCount());
-//				e.setId("cg" + e.getId());
 			});
-//			imGroupModels.addAll(imGroupModels1);
 		}
-
 		return imGroupModels;
 	}
 
 	@Override
 	public List<BasicUserDto> queryGroupStudents(Integer teacherId, String search) {
-		return teacherDao.queryGroupStudents(teacherId,search);
+		List<ImGroupModel> musicGroups =  musicGroupDao.queryTeacherGroups(teacherId,search);
+		List<BasicUserDto> teachers = new ArrayList<>();
+		if(musicGroups != null && musicGroups.size() > 0){
+			Set<String> musicGroupId = musicGroups.stream().map(ImGroupModel::getId).collect(Collectors.toSet());
+			List<MusicGroup> musicGroupList = musicGroupDao.queryListByIds(StringUtils.join(musicGroupId, ","));
+			Set<Integer> teacherIds = new HashSet<>();
+			if(musicGroupList != null && musicGroupList.size() > 0){
+				musicGroupList.forEach(e->{
+					teacherIds.add(e.getTeamTeacherId());
+					teacherIds.add(e.getEducationalTeacherId());
+					teacherIds.add(e.getOperatorUserId());
+					teacherIds.add(e.getDirectorUserId());
+				});
+			}
+			teacherIds.remove(teacherId);
+			teacherIds.removeAll(Collections.singleton(null));
+			if(teacherIds.size() > 0){
+				teachers = teacherDao.queryMusicGroupStudents(StringUtils.join(teacherIds,","), search);
+			}
+		}
+		List<BasicUserDto> userDtos = teacherDao.queryGroupStudents(teacherId, search);
+		teachers.addAll(userDtos);
+		return teachers;
 	}
 
     @Override

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

@@ -291,9 +291,6 @@
 	</select>
 
     <select id="queryListByIds" resultMap="MusicGroup" parameterType="list">
-		SELECT * FROM music_group WHERE id_ IN
-		<foreach item="item" index="index" collection="musicGroupIds" open="(" separator="," close=")">
-			#{item}
-		</foreach>
+		SELECT * FROM music_group WHERE FIND_IN_SET(id_,#{musicGroupIds})
 	</select>
 </mapper>

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

@@ -239,7 +239,8 @@
         SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum}
     </select>
     <select id="queryGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,s.name_ FROM class_group_teacher_mapper cgtm
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,s.name_ subject_name_
+        FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group_student_mapper cgsm ON cgtm.class_group_id_ = cgsm.class_group_id_
         LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
         LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
@@ -440,6 +441,18 @@
         <include refid="queryMusicGroupStudentApplySql"/>
     </select>
 
+    <select id="queryMusicGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,GROUP_CONCAT(s.name_) subject_name_
+        FROM teacher t
+        LEFT JOIN sys_user su ON t.id_ = su.id_
+        LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+        WHERE FIND_IN_SET(t.id_,#{teacherIds})
+        <if test="search != null">
+            AND su.username_ LIKE CONCAT('%',#{search},'%')
+        </if>
+        GROUP BY t.id_
+    </select>
+
     <sql id="queryCloses">
         <where>
             <if test="teacherId != null">

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

@@ -1,9 +1,5 @@
 package com.ym.controller;
 
-import com.ym.common.ApiException;
-import com.ym.common.BaseResponse;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.pojo.ReqUserData;
 import com.ym.service.UserService;
 import io.rong.models.user.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -96,7 +96,7 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryTeacherGroups(sysUser.getId(),search));
     }
 
-    @ApiOperation(value = "获取和当前教师相关的所有学员聊天列表")
+    @ApiOperation(value = "获取和当前教师通讯录列表")
     @GetMapping("/queryGroupStudents")
     public Object queryGroupStudents(String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -240,7 +240,7 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/classGroupAndTeacher")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupAndTeacher')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
-    public HttpResponseResult classGroupAndTeacher(int classGroupId) throws Exception {
+    public HttpResponseResult classGroupAndTeacher(Integer classGroupId) throws Exception {
         return succeed(classGroupService.classGroupAndTeacher(classGroupId));
     }
 

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

@@ -58,6 +58,11 @@ public class MusicGroupController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
     public Object queryPage(MusicGroupQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setOrganId(sysUser.getOrganId());
         return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
     }
 
@@ -84,6 +89,7 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openPay")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String")

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -40,6 +41,11 @@ public class TeacherController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('teacher/queryPage')")
     public Object queryPage(TeacherQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setOrganId(sysUser.getOrganId());
         return succeed(teacherService.queryPageDetail(queryInfo));
     }
 

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.biz.service.VipGroupActivityService;
@@ -27,6 +29,8 @@ public class VipGroupActivityController extends BaseController {
 
     @Autowired
     private VipGroupActivityService vipGroupActivityService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
@@ -40,6 +44,11 @@ public class VipGroupActivityController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/queryPage')")
     public Object queryPage(VipGroupActivityQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setOrganId(sysUser.getOrganId());
         return succeed(vipGroupActivityService.queryPage(queryInfo));
     }