1.添加课表分享功能

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

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.CourseShare;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CourseShareDao extends BaseDAO<Integer, CourseShare> {
+
+    int batchInsert(@Param("courseShares") List<CourseShare> courseShares);
+
+    List<CourseShare> selectByCourseId(@Param("courseId") Integer courseId);
+
+    void deleteByCourseId(@Param("courseId") Integer courseId);
+
+    void deleteByIds(@Param("ids") List<Integer> ids);
+}

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

@@ -0,0 +1,31 @@
+package com.ym.mec.biz.dal.dto;
+
+
+import com.ym.mec.biz.dal.enums.ShareModeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author 袁亮
+ * @apiNote 课程分享模型
+ */
+@ApiModel(value = "课程分享模型")
+@Data
+@NoArgsConstructor
+public class CourseShareDto {
+
+    @NotNull(message = "课程不能为空")
+    @ApiModelProperty(value = "课程ID")
+    private Integer courseId;
+
+    @ApiModelProperty(value = "课程ID,OPEN:公开，PRIVATE：私有")
+    private ShareModeEnum shareMode;
+
+    @ApiModelProperty(value = "学生列表")
+    private List<Integer> userIds;
+}

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.JoinCourseType;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -68,6 +69,9 @@ public class CourseScheduleStudentPayment extends BaseEntity implements Comparab
 	@ApiModelProperty(value = "关联的云教练缴费项目编号",required = false)
 	private Long calenderId;
 
+	@ApiModelProperty(value = "加入课程类型")
+	private JoinCourseType joinCourseType;
+
 	public BigDecimal getExpectPriceBak() {
 		return expectPriceBak;
 	}
@@ -251,6 +255,14 @@ public class CourseScheduleStudentPayment extends BaseEntity implements Comparab
 		this.courseSchedule = courseSchedule;
 	}
 
+	public JoinCourseType getJoinCourseType() {
+		return joinCourseType;
+	}
+
+	public void setJoinCourseType(JoinCourseType joinCourseType) {
+		this.joinCourseType = joinCourseType;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,49 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ym.mec.biz.dal.enums.ShareModeEnum;
+import com.ym.mec.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author 袁亮
+ * @apiNote 课程分享实体模型
+ */
+@ApiModel(value = "课程分享DB模型")
+@TableName("course_share")
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CourseShare extends BaseEntity {
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "课程ID")
+    @TableField(value = "course_id_")
+    private Integer courseId;
+
+    @ApiModelProperty(value = "分享模式")
+    @TableField(value = "share_mode_")
+    private ShareModeEnum shareMode;
+
+    @ApiModelProperty(value = "学生用户ID")
+    @TableField(value = "user_id_")
+    private Integer userId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time_")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(value = "create_by_")
+    private Integer createBy;
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.ym.mec.common.enums.BaseEnum;
+import lombok.Getter;
+
+
+/**
+ * @author 袁亮
+ * @apiNote 课程共享方式：开放/私有
+ */
+@Getter
+public enum ShareModeEnum implements BaseEnum<String, ShareModeEnum> {
+    OPEN("OPEN"),
+    PRIVATE("PRIVATE");
+
+    @EnumValue
+    private final String code;
+
+    ShareModeEnum(String code) {
+        this.code = code;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.dto.CourseShareDto;
+import com.ym.mec.biz.dal.dto.StudentManageListDto;
+import com.ym.mec.biz.dal.entity.CourseShare;
+import com.ym.mec.common.service.BaseService;
+
+import java.util.List;
+
+public interface CourseShareService extends BaseService<Integer, CourseShare> {
+
+    List<CourseShare> create(Integer tenantId, CourseShareDto courseShareDto);
+
+    List<StudentManageListDto> queryCourseSharedStudent(Integer tenantId, Integer courseId);
+
+    List<StudentManageListDto> queryStudentList(Integer tenantId, Integer organId, Integer subjectId);
+
+    boolean createPaymentRecord(Integer tenantId, Long courseId, Integer userId);
+}

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

@@ -0,0 +1,184 @@
+package com.ym.mec.biz.service.impl;
+
+import com.google.common.collect.Lists;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
+import com.ym.mec.biz.dal.dao.CourseShareDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.StudentManageDao;
+import com.ym.mec.biz.dal.dto.CourseShareDto;
+import com.ym.mec.biz.dal.dto.StudentManageListDto;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment;
+import com.ym.mec.biz.dal.entity.CourseShare;
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.enums.JoinCourseType;
+import com.ym.mec.biz.dal.enums.ShareModeEnum;
+import com.ym.mec.biz.service.CourseShareService;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author 袁亮
+ * @apiNote 课程分享业务实现类
+ */
+@Service
+public class CourseShareServiceImpl extends BaseServiceImpl<Integer, CourseShare> implements CourseShareService {
+
+    /**
+     * 批量操作，分批数据最大限制
+     */
+    private static final int BATCH_OPE_MAX_SIZE = 500;
+
+    private static final String TENANT_ID = "tenantId";
+
+    @Autowired
+    private CourseShareDao courseShareDao;
+
+    @Autowired
+    private StudentManageDao studentManageDao;
+
+    @Autowired
+    private StudentDao studentDao;
+
+    @Autowired
+    private SysUserService userService;
+
+    @Autowired
+    private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
+
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
+
+    @Override
+    public BaseDAO<Integer, CourseShare> getDAO() {
+        return courseShareDao;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public List<CourseShare> create(Integer tenantId, CourseShareDto courseShareDto) {
+        List<CourseShare> courseShares = new ArrayList<>();
+        Integer userId = userService.getUserId();
+        if (ShareModeEnum.PRIVATE.equals(courseShareDto.getShareMode())) {
+            if (CollectionUtils.isEmpty(courseShareDto.getUserIds())) {
+                // 不分享，清理数据并返回
+                courseShareDao.deleteByCourseId(courseShareDto.getCourseId());
+                return new ArrayList<>();
+            }
+            List<Student> students = studentDao.findByStudentIds(courseShareDto.getUserIds());
+            courseShares = students.stream().map(next -> {
+                CourseShare courseShare = new CourseShare();
+                BeanUtils.copyProperties(courseShareDto, courseShare);
+                courseShare.setUserId(next.getUserId());
+                courseShare.setTenantId(tenantId);
+                courseShare.setCreateTime(new Date());
+                courseShare.setCreateBy(userId);
+                return courseShare;
+            }).collect(Collectors.toList());
+        } else {
+            CourseShare courseShare = new CourseShare();
+            BeanUtils.copyProperties(courseShareDto, courseShare);
+            courseShare.setTenantId(tenantId);
+            courseShare.setCreateTime(new Date());
+            courseShare.setCreateBy(userId);
+            courseShares.add(courseShare);
+        }
+
+        // 处理已经分享过的数据
+        List<CourseShare> existShares = courseShareDao.selectByCourseId(courseShareDto.getCourseId());
+        if (CollectionUtils.isNotEmpty(existShares) && (courseShareDto.getShareMode().equals(ShareModeEnum.PRIVATE))) {
+            // 私有分享，删除历史数据
+            List<Integer> sharedHistoryRecords = existShares.stream()
+                    .map(CourseShare::getId)
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(sharedHistoryRecords)) {
+                courseShareDao.deleteByIds(sharedHistoryRecords);
+            }
+        }
+        // 数据入库
+        List<List<CourseShare>> groupList = Lists.partition(courseShares, BATCH_OPE_MAX_SIZE);
+        for (List<CourseShare> shares : groupList) {
+            courseShareDao.batchInsert(shares);
+        }
+        return courseShareDao.selectByCourseId(courseShareDto.getCourseId());
+    }
+
+    @Override
+    public List<StudentManageListDto> queryCourseSharedStudent(Integer tenantId, Integer courseId) {
+        // 查询该课程已经分享的学生列表
+        Map<String, Object> courseParam = new HashMap<>(2);
+        courseParam.put("courseId", courseId);
+        courseParam.put(TENANT_ID, tenantId);
+        List<CourseShare> courseShareRecords = courseShareDao.findAll(courseParam);
+        if (CollectionUtils.isEmpty(courseShareRecords)) {
+            return new ArrayList<>();
+        }
+
+        // 查询学生列表
+        Map<String, Object> param = new HashMap<>(2);
+        param.put(TENANT_ID, tenantId);
+        param.put("userIds", courseShareRecords.stream().map(CourseShare::getUserId).toArray());
+        return studentManageDao.findStudentsByOrganId(param);
+    }
+
+    @Override
+    public List<StudentManageListDto> queryStudentList(Integer tenantId, Integer organId, Integer subjectId) {
+        Map<String, Object> param = new HashMap<>(2);
+        if (organId != null) {
+            param.put("organIds", new int[]{organId});
+        }
+        if (subjectId != null) {
+            param.put("subjectId", subjectId);
+        }
+        param.put(TENANT_ID, tenantId);
+        // 查询指定分部和声部对应的学生列表
+        return studentManageDao.findStudentsByOrganId(param);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean createPaymentRecord(Integer tenantId, Long courseId, Integer userId) {
+        // 查询是否已经进入直播间，进入即表示存在记录，不需要重复插入数据
+        int haveCourse = courseScheduleStudentPaymentDao.checkStudentHaveCourse(courseId, userId);
+        if (haveCourse == 0) {
+            List<CourseSchedule> schedules =
+                    courseScheduleDao.findByCourseScheduleIds(Collections.singletonList(courseId));
+            CourseSchedule schedule = schedules.get(0);
+            CourseScheduleStudentPayment payment = new CourseScheduleStudentPayment();
+            payment.setGroupType(schedule.getGroupType());
+            payment.setMusicGroupId(schedule.getMusicGroupId());
+            payment.setUserId(userId);
+            // 分享方式下，价格为0
+            BigDecimal sharePrice = new BigDecimal(0);
+            payment.setOriginalPrice(sharePrice);
+            payment.setExpectPrice(sharePrice);
+            payment.setActualPrice(sharePrice);
+            payment.setExpectPriceBak(sharePrice);
+            payment.setActualPriceBak(sharePrice);
+            payment.setCreateTime(new Date());
+            payment.setTenantId(tenantId);
+            payment.setClassGroupId(schedule.getClassGroupId());
+            payment.setJoinCourseType(JoinCourseType.SHARE);
+            courseScheduleStudentPaymentDao.insert(payment);
+        }
+        return true;
+    }
+
+}

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

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ym.mec.biz.dal.dao.CourseShareDao">
+    <resultMap type="com.ym.mec.biz.dal.entity.CourseShare" id="courseShare">
+        <result column="id_" property="id"/>
+        <result column="course_id_" property="courseId"/>
+        <result column="share_mode_" property="shareMode"/>
+        <result column="user_id_" property="userId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="create_by_" property="createBy"/>
+        <result column="tenant_id_" property="tenantId"/>
+    </resultMap>
+
+    <sql id="queryCondition">
+        <where>
+            tenant_id_ = #{tenantId}
+            <if test="courseId != null and courseId != ''">
+                AND course_id_= #{courseId}
+            </if>
+        </where>
+    </sql>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="courseShare">
+        SELECT *
+        FROM course_share
+        WHERE id_ = #{id}
+    </select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="courseShare">
+        SELECT *
+        FROM course_share
+        <include refid="queryCondition"/>
+        ORDER BY id_
+    </select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseShare" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        INSERT INTO course_share (id_, course_id_, share_mode_, user_id_, create_time_, create_by_, tenant_id_)
+        VALUES (#{id}, #{courseId}, #{shareMode}, #{userId}, NOW(), #{createBy}, #{tenantId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseShare">
+        UPDATE course_share
+        <set>
+            <if test="courseId != null">
+                course_id_ = #{courseId},
+            </if>
+            <if test="shareMode != null">
+                share_mode_ = #{shareMode},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+        </set>
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+        DELETE
+        FROM course_share
+        WHERE id_ = #{id}
+    </delete>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="courseShare" parameterType="map">
+        SELECT * FROM course_share where tenant_id_ = #{tenantId} ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*)
+        FROM course_share
+        where tenant_id_ = #{tenantId}
+    </select>
+
+    <select id="selectByCourseId" resultMap="courseShare">
+        select id_, course_id_, share_mode_, user_id_, create_time_, create_by_, tenant_id_
+        from course_share
+        where course_id_ = #{courseId}
+    </select>
+
+    <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        INSERT INTO course_share (id_, course_id_, share_mode_, user_id_, create_time_, create_by_, tenant_id_)
+        VALUES
+        <foreach collection="courseShares" item="item" separator=",">
+            (#{item.id},#{item.courseId},#{item.shareMode},
+            #{item.userId},NOW(),#{item.createBy},#{item.tenantId})
+        </foreach>
+    </insert>
+
+    <delete id="deleteByCourseId">
+        DELETE
+        FROM course_share
+        WHERE course_id_ = #{courseId}
+    </delete>
+
+    <delete id="deleteByIds">
+        DELETE FROM course_share WHERE id_ IN
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -177,6 +177,12 @@
                     #{organId}
                 </foreach>
             </if>
+            <if test="userIds != null and userIds.length>0">
+                AND s.user_id_ IN
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </if>
             <if test="isRecord != null">
                 <if test="isRecord == 0">
                     AND smcr.user_id_ IS NULL

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

@@ -0,0 +1,63 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.dal.dto.CourseShareDto;
+import com.ym.mec.biz.dal.dto.StudentManageListDto;
+import com.ym.mec.biz.dal.entity.CourseShare;
+import com.ym.mec.biz.service.CourseShareService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author 袁亮
+ * @version v1.0
+ * @apiNote 课程分享接口
+ */
+@Api(tags = "课程分享接口控制器")
+@RequestMapping("courseShare")
+@RestController
+public class CourseShareController extends BaseController {
+
+    @Autowired
+    private CourseShareService courseShareService;
+
+    @ApiOperation(value = "创建分享")
+    @PostMapping("/create")
+    @PreAuthorize("@pcs.hasPermissions('courseShare/create')")
+    public HttpResponseResult<List<CourseShare>> create(@RequestBody CourseShareDto courseShareDto) {
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(courseShareService.create(tenantId, courseShareDto));
+    }
+
+    @ApiOperation(value = "查询已经分享过的学生")
+    @GetMapping("/queryCourseSharedStudent")
+    @PreAuthorize("@pcs.hasPermissions('courseShare/queryCourseSharedStudent')")
+    public HttpResponseResult<List<StudentManageListDto>> queryCourseSharedStudent(
+            @RequestParam(value = "courseId") Integer courseId) {
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(courseShareService.queryCourseSharedStudent(tenantId,courseId));
+    }
+
+    @ApiOperation(value = "查询学生列表")
+    @GetMapping("/queryStudentList")
+    @PreAuthorize("@pcs.hasPermissions('courseShare/queryStudentList')")
+    public HttpResponseResult<List<StudentManageListDto>> queryStudentList(
+            @RequestParam(value = "organId", required = false) Integer organId,
+            @RequestParam(value = "subjectId", required = false) Integer subjectId) {
+        Integer tenantId = TenantContextHolder.getTenantId();
+        return succeed(courseShareService.queryStudentList(tenantId, organId, subjectId));
+    }
+}