Merge branch 'dev_v3.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v3.2.0

distributed-print-business/src/main/resources/db/1、init-table.sql

@@ -1384,21 +1384,6 @@ CREATE TABLE `sys_role` (
                             UNIQUE KEY `role_schoolId_name_idx` (`school_id`,`name`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色表';
 
--- ----------------------------
--- Table structure for sys_role_course
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role_course`;
-CREATE TABLE `sys_role_course` (
-                                   `id` bigint NOT NULL COMMENT '主键',
-                                   `role_id` bigint NOT NULL COMMENT '角色id',
-                                   `course_id` bigint NOT NULL COMMENT '课程id',
-                                   `create_id` bigint DEFAULT NULL COMMENT '创建人',
-                                   `create_time` bigint DEFAULT NULL COMMENT '创建时间',
-                                   `update_id` bigint DEFAULT NULL COMMENT '更新人',
-                                   `update_time` bigint DEFAULT NULL COMMENT '更新时间',
-                                   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色关联课程';
-
 -- ----------------------------
 -- Table structure for sys_role_group_member
 -- ----------------------------

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRoleCourse.java

@@ -1,47 +0,0 @@
-package com.qmth.teachcloud.common.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色关联课程
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("sys_role_course")
-public class SysRoleCourse extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("role_id")
-    private Long roleId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("course_id")
-    private Long courseId;
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysRoleCourseMapper.java

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.common.entity.SysRoleCourse;
-
-/**
- * <p>
- * 角色关联课程 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface SysRoleCourseMapper extends BaseMapper<SysRoleCourse> {
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysRoleCourseService.java

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysRoleCourse;
-
-/**
- * <p>
- * 角色关联课程 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface SysRoleCourseService extends IService<SysRoleCourse> {
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleCourseServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qmth.teachcloud.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.common.entity.SysRoleCourse;
-import com.qmth.teachcloud.common.mapper.SysRoleCourseMapper;
-import com.qmth.teachcloud.common.service.SysRoleCourseService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色关联课程 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class SysRoleCourseServiceImpl extends ServiceImpl<SysRoleCourseMapper, SysRoleCourse> implements SysRoleCourseService {
-
-}

teachcloud-common/src/main/resources/mapper/SysRoleCourseMapper.xml

@@ -1,18 +0,0 @@
-<?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.qmth.teachcloud.common.mapper.SysRoleCourseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.SysRoleCourse">
-    <result column="id" property="id" />
-        <result column="role_id" property="roleId" />
-        <result column="course_id" property="courseId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        role_id, course_id
-    </sql>
-
-</mapper>