新增基础类

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperArchives.java

@@ -0,0 +1,127 @@
+package com.qmth.paper.library.business.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.paper.library.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 档案管理表
+ * </p>
+ */
+@TableName("paper_archives")
+public class PaperArchives extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "学期id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("semester_id")
+    private Long semesterId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
+    /**
+     * 档案名称
+     */
+    @TableField("archives_name")
+    private String archivesName;
+
+    /**
+     * 档案编号
+     */
+    @TableField("archives_code")
+    private String archivesCode;
+
+    @ApiModelProperty(value = "档案类型id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("archives_type_id")
+    private Long archivesTypeId;
+
+    @ApiModelProperty(value = "档案管理员")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("manager_id")
+    private Long managerId;
+
+    @ApiModelProperty(value = "档案到期预警时间")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("warning_time")
+    private Long warningTime;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSemesterId() {
+        return semesterId;
+    }
+
+    public void setSemesterId(Long semesterId) {
+        this.semesterId = semesterId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getArchivesName() {
+        return archivesName;
+    }
+
+    public void setArchivesName(String archivesName) {
+        this.archivesName = archivesName;
+    }
+
+    public String getArchivesCode() {
+        return archivesCode;
+    }
+
+    public void setArchivesCode(String archivesCode) {
+        this.archivesCode = archivesCode;
+    }
+
+    public Long getArchivesTypeId() {
+        return archivesTypeId;
+    }
+
+    public void setArchivesTypeId(Long archivesTypeId) {
+        this.archivesTypeId = archivesTypeId;
+    }
+
+    public Long getManagerId() {
+        return managerId;
+    }
+
+    public void setManagerId(Long managerId) {
+        this.managerId = managerId;
+    }
+
+    public Long getWarningTime() {
+        return warningTime;
+    }
+
+    public void setWarningTime(Long warningTime) {
+        this.warningTime = warningTime;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperArchivesType.java

@@ -0,0 +1,49 @@
+package com.qmth.paper.library.business.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.paper.library.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 档案类型表
+ * </p>
+ */
+@TableName("paper_archives_type")
+public class PaperArchivesType extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+
+    /**
+     * 类型名称
+     */
+    @TableField("archivesType")
+    private String archives_type;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getArchives_type() {
+        return archives_type;
+    }
+
+    public void setArchives_type(String archives_type) {
+        this.archives_type = archives_type;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperLibrary.java

@@ -0,0 +1,145 @@
+package com.qmth.paper.library.business.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.paper.library.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 图片库
+ * </p>
+ */
+@TableName("paper_library")
+public class PaperLibrary extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
+    /**
+     * 文件名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 文件类型
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 单位（KB）
+     */
+    @TableField("size")
+    private Integer size;
+
+    /**
+     * 文件md5值
+     */
+    @TableField("md5")
+    private String md5;
+
+    /**
+     * 存储路径
+     */
+    @TableField("path")
+    private String path;
+
+
+    @ApiModelProperty(value = "扫描任务详情表id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("paper_scan_task_detail_id")
+    private Long paperScanTaskDetailId;
+
+    /**
+     * 图片序号
+     */
+    @TableField("sequence")
+    private Integer sequence;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public String getMd5() {
+        return md5;
+    }
+
+    public void setMd5(String md5) {
+        this.md5 = md5;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Long getPaperScanTaskDetailId() {
+        return paperScanTaskDetailId;
+    }
+
+    public void setPaperScanTaskDetailId(Long paperScanTaskDetailId) {
+        this.paperScanTaskDetailId = paperScanTaskDetailId;
+    }
+
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperScanTask.java

@@ -0,0 +1,117 @@
+package com.qmth.paper.library.business.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.paper.library.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 扫描任务表
+ * </p>
+ */
+@TableName("paper_scan_task")
+public class PaperScanTask extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "档案表id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("paper_archives_id")
+    private Long paperArchivesId;
+
+    /**
+     * 扫描任务名称
+     */
+    @TableField("scan_task_name")
+    private String scanTaskName;
+
+    /**
+     * 课程名称
+     */
+    @TableField("course_name")
+    private String courseName;
+
+    /**
+     * 任课教师
+     */
+    @TableField("teacher_name")
+    private String teacherName;
+
+    /**
+     * 教学班名称
+     */
+    @TableField("teach_clazz_name")
+    private String teachClazzName;
+
+
+    @ApiModelProperty(value = "扫描员id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("scan_user_id")
+    private Long scanUserId;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getPaperArchivesId() {
+        return paperArchivesId;
+    }
+
+    public void setPaperArchivesId(Long paperArchivesId) {
+        this.paperArchivesId = paperArchivesId;
+    }
+
+    public String getScanTaskName() {
+        return scanTaskName;
+    }
+
+    public void setScanTaskName(String scanTaskName) {
+        this.scanTaskName = scanTaskName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachClazzName() {
+        return teachClazzName;
+    }
+
+    public void setTeachClazzName(String teachClazzName) {
+        this.teachClazzName = teachClazzName;
+    }
+
+    public Long getScanUserId() {
+        return scanUserId;
+    }
+
+    public void setScanUserId(Long scanUserId) {
+        this.scanUserId = scanUserId;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperScanTaskDetail.java

@@ -0,0 +1,62 @@
+package com.qmth.paper.library.business.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.paper.library.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 扫描任务详情表
+ * </p>
+ */
+@TableName("paper_scan_task_detail")
+public class PaperScanTaskDetail extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "扫描任务id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("paper_scan_task_id")
+    private Long paperScanTaskId;
+
+
+    @ApiModelProperty(value = "学生id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("student_id")
+    private Long studentId;
+
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getPaperScanTaskId() {
+        return paperScanTaskId;
+    }
+
+    public void setPaperScanTaskId(Long paperScanTaskId) {
+        this.paperScanTaskId = paperScanTaskId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesMapper.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.entity.PaperArchives;
+
+/**
+ * <p>
+ * 档案管理表 Mapper 接口
+ * </p>
+ */
+public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesTypeMapper.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.entity.PaperArchivesType;
+
+/**
+ * <p>
+ * 档案类型表 Mapper 接口
+ * </p>
+ */
+public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperLibraryMapper.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.entity.PaperLibrary;
+
+/**
+ * <p>
+ * 图片库 Mapper 接口
+ * </p>
+ */
+public interface PaperLibraryMapper extends BaseMapper<PaperLibrary> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperScanTaskDetailMapper.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
+
+/**
+ * <p>
+ * 扫描任务详情表 Mapper 接口
+ * </p>
+ */
+public interface PaperScanTaskDetailMapper extends BaseMapper<PaperScanTaskDetail> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperScanTaskMapper.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.paper.library.business.entity.PaperScanTask;
+
+/**
+ * <p>
+ * 扫描任务表 Mapper 接口
+ * </p>
+ */
+public interface PaperScanTaskMapper extends BaseMapper<PaperScanTask> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesService.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.entity.PaperArchives;
+
+/**
+ * <p>
+ * 档案管理表 服务类
+ * </p>
+ */
+public interface PaperArchivesService extends IService<PaperArchives> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesTypeService.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.entity.PaperArchivesType;
+
+/**
+ * <p>
+ * 档案管理表 服务类
+ * </p>
+ */
+public interface PaperArchivesTypeService extends IService<PaperArchivesType> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PrintCommonService.java → paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperLibraryCommonService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @Author: wangliang
  * @Date: 2021/3/26
  */
-public interface PrintCommonService {
+public interface PaperLibraryCommonService {
 
     /**
      * 保存附件公用

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperLibraryService.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.entity.PaperLibrary;
+
+/**
+ * <p>
+ * 图片库 服务类
+ * </p>
+ */
+public interface PaperLibraryService extends IService<PaperLibrary> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperScanTaskDetailService.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
+
+/**
+ * <p>
+ * 扫描任务详情表 服务类
+ * </p>
+ */
+public interface PaperScanTaskDetailService extends IService<PaperScanTaskDetail> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperScanTaskService.java

@@ -0,0 +1,13 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.business.entity.PaperScanTask;
+
+/**
+ * <p>
+ * 扫描任务表 服务类
+ * </p>
+ */
+public interface PaperScanTaskService extends IService<PaperScanTask> {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.entity.PaperArchives;
+import com.qmth.paper.library.business.mapper.PaperArchivesMapper;
+import com.qmth.paper.library.business.service.PaperArchivesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 档案管理表 服务实现类
+ * </p>
+ */
+@Service
+public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, PaperArchives> implements PaperArchivesService {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesTypeServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.entity.PaperArchivesType;
+import com.qmth.paper.library.business.mapper.PaperArchivesTypeMapper;
+import com.qmth.paper.library.business.service.PaperArchivesTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 档案类型表 服务实现类
+ * </p>
+ */
+@Service
+public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeMapper, PaperArchivesType> implements PaperArchivesTypeService {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PrintCommonServiceImpl.java → paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryCommonServiceImpl.java

@@ -2,13 +2,11 @@ package com.qmth.paper.library.business.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.common.utils.BinaryUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.boot.tools.models.ByteArray;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.dto.MqDto;
 import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.config.DictionaryConfig;
@@ -27,7 +25,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -44,8 +41,8 @@ import java.util.*;
  * @Date: 2021/3/26
  */
 @Service
-public class PrintCommonServiceImpl implements PrintCommonService {
-    private final static Logger log = LoggerFactory.getLogger(PrintCommonServiceImpl.class);
+public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService {
+    private final static Logger log = LoggerFactory.getLogger(PaperLibraryCommonServiceImpl.class);
 
 //    @Resource
 //    OssUtil ossUtil;
@@ -298,8 +295,8 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         BasicAttachment basicAttachment = null;
         Map<String, Object> map = null;
         try {
-            PrintCommonService printCommonService = SpringContextHolder.getBean(PrintCommonService.class);
-            basicAttachment = printCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), UploadFileEnum.FILE);
+            PaperLibraryCommonService paperLibraryCommonService = SpringContextHolder.getBean(PaperLibraryCommonService.class);
+            basicAttachment = paperLibraryCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), UploadFileEnum.FILE);
             if (Objects.isNull(basicAttachment)) {
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             } else {

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.entity.PaperLibrary;
+import com.qmth.paper.library.business.mapper.PaperLibraryMapper;
+import com.qmth.paper.library.business.service.PaperLibraryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 图片库 服务实现类
+ * </p>
+ */
+@Service
+public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, PaperLibrary> implements PaperLibraryService {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskDetailServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
+import com.qmth.paper.library.business.mapper.PaperScanTaskDetailMapper;
+import com.qmth.paper.library.business.service.PaperScanTaskDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 扫描任务详情表 服务实现类
+ * </p>
+ */
+@Service
+public class PaperScanTaskDetailServiceImpl extends ServiceImpl<PaperScanTaskDetailMapper, PaperScanTaskDetail> implements PaperScanTaskDetailService {
+
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java

@@ -0,0 +1,17 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.paper.library.business.entity.PaperScanTask;
+import com.qmth.paper.library.business.mapper.PaperScanTaskMapper;
+import com.qmth.paper.library.business.service.PaperScanTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 扫描任务表 服务实现类
+ * </p>
+ */
+@Service
+public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, PaperScanTask> implements PaperScanTaskService {
+
+}

paper-library-business/src/main/resources/mapper/PaperArchivesMapper.xml

@@ -0,0 +1,4 @@
+<?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.paper.library.business.mapper.PaperArchivesMapper">
+</mapper>

paper-library-business/src/main/resources/mapper/PaperArchivesTypeMapper.xml

@@ -0,0 +1,4 @@
+<?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.paper.library.business.mapper.PaperArchivesTypeMapper">
+</mapper>

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -0,0 +1,4 @@
+<?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.paper.library.business.mapper.PaperLibraryMapper">
+</mapper>

paper-library-business/src/main/resources/mapper/PaperScanTaskDetailMapper.xml

@@ -0,0 +1,4 @@
+<?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.paper.library.business.mapper.PaperScanTaskDetailMapper">
+</mapper>

paper-library-business/src/main/resources/mapper/PaperScanTaskMapper.xml

@@ -0,0 +1,4 @@
+<?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.paper.library.business.mapper.PaperScanTaskMapper">
+</mapper>

paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrefixUrlDomain.java

@@ -17,94 +17,36 @@ public class PrefixUrlDomain implements Serializable {
 
     String basic;
 
-    String exam;
-
     String data;
 
-    String work;
-
-    String client;
-
-    String reportWuda;
-
-    String reportSchool;
-
-    String reportCourse;
-
-    String reportExamStudent;
-
-    String datasource;
-
-    String analyze;
-
-    String open;
+    String menu;
 
-    String notify;
+    String auth;
 
-    String sso;
+    String paper;
 
-    public String getSso() {
-        return sso;
-    }
-
-    public void setSso(String sso) {
-        this.sso = sso;
-    }
-
-    public String getNotify() {
-        return notify;
-    }
-
-    public void setNotify(String notify) {
-        this.notify = notify;
-    }
-
-    public String getOpen() {
-        return open;
-    }
-
-    public void setOpen(String open) {
-        this.open = open;
-    }
-
-    public String getDatasource() {
-        return datasource;
-    }
-
-    public void setDatasource(String datasource) {
-        this.datasource = datasource;
-    }
-
-    public String getAnalyze() {
-        return analyze;
-    }
-
-    public void setAnalyze(String analyze) {
-        this.analyze = analyze;
-    }
-
-    public String getReportExamStudent() {
-        return reportExamStudent;
+    public String getCommon() {
+        return common;
     }
 
-    public void setReportExamStudent(String reportExamStudent) {
-        this.reportExamStudent = reportExamStudent;
+    public void setCommon(String common) {
+        this.common = common;
     }
 
-    public String getReportCourse() {
-        return reportCourse;
+    public String getSys() {
+        return sys;
     }
 
-    public void setReportCourse(String reportCourse) {
-        this.reportCourse = reportCourse;
+    public void setSys(String sys) {
+        this.sys = sys;
     }
 
-    public String getReportWuda() {
-        return reportWuda;
+    public String getBasic() {
+        return basic;
     }
 
-    public void setReportWuda(String reportWuda) {
-        this.reportWuda = reportWuda;
+    public void setBasic(String basic) {
+        this.basic = basic;
     }
 
     public String getData() {
@@ -115,59 +57,27 @@ public class PrefixUrlDomain implements Serializable {
         this.data = data;
     }
 
-    public String getWork() {
-        return work;
-    }
-
-    public void setWork(String work) {
-        this.work = work;
-    }
-
-    public String getClient() {
-        return client;
-    }
-
-    public void setClient(String client) {
-        this.client = client;
-    }
-
-    public String getReportSchool() {
-        return reportSchool;
-    }
-
-    public void setReportSchool(String reportSchool) {
-        this.reportSchool = reportSchool;
-    }
-
-    public String getCommon() {
-        return common;
+    public String getMenu() {
+        return menu;
     }
 
-    public void setCommon(String common) {
-        this.common = common;
+    public void setMenu(String menu) {
+        this.menu = menu;
     }
 
-    public String getSys() {
-        return sys;
+    public String getAuth() {
+        return auth;
     }
 
-    public void setSys(String sys) {
-        this.sys = sys;
-    }
-
-    public String getBasic() {
-        return basic;
-    }
-
-    public void setBasic(String basic) {
-        this.basic = basic;
+    public void setAuth(String auth) {
+        this.auth = auth;
     }
 
-    public String getExam() {
-        return exam;
+    public String getPaper() {
+        return paper;
     }
 
-    public void setExam(String exam) {
-        this.exam = exam;
+    public void setPaper(String paper) {
+        this.paper = paper;
     }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/TeachcloudCommonService.java → paper-library-common/src/main/java/com/qmth/paper/library/common/service/LibraryCommonService.java

@@ -25,7 +25,7 @@ import java.util.Set;
  * @Author: wangliang
  * @Date: 2021/3/26
  */
-public interface TeachcloudCommonService {
+public interface LibraryCommonService {
 
     /**
      * 获取用户菜单

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/CommonCacheServiceImpl.java

@@ -11,8 +11,6 @@ import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.enums.PrivilegePropertyEnum;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.service.*;
-import com.qmth.paper.library.common.entity.*;
-import com.qmth.paper.library.common.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;
@@ -44,7 +42,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     BasicSchoolService basicSchoolService;
 
     @Resource
-    TeachcloudCommonService commonService;
+    LibraryCommonService commonService;
 
     @Resource
     SysOrgService sysOrgService;

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/TeachcloudCommonServiceImpl.java → paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/LibraryCommonServiceImpl.java

@@ -18,13 +18,8 @@ import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.enums.*;
 import com.qmth.paper.library.common.service.*;
 import com.qmth.paper.library.common.util.*;
-import com.qmth.paper.library.common.bean.result.*;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.*;
-import com.qmth.paper.library.common.enums.*;
-import com.qmth.paper.library.common.service.*;
-import com.qmth.paper.library.common.util.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,8 +43,8 @@ import java.util.stream.Collectors;
  * @Date: 2021/3/26
  */
 @Service
-public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
-    private final static Logger log = LoggerFactory.getLogger(TeachcloudCommonServiceImpl.class);
+public class LibraryCommonServiceImpl implements LibraryCommonService {
+    private final static Logger log = LoggerFactory.getLogger(LibraryCommonServiceImpl.class);
 
     @Resource
     CommonCacheService commonCacheService;
@@ -82,7 +77,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     private SysOrgService sysOrgService;
 
     @Resource
-    TeachcloudCommonService commonService;
+    LibraryCommonService commonService;
 
     @Resource
     BasicAttachmentService basicAttachmentService;

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysRoleServiceImpl.java

@@ -13,9 +13,7 @@ import com.qmth.paper.library.common.service.*;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
 import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.mapper.SysRoleMapper;
-import com.qmth.paper.library.common.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
@@ -52,7 +50,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     SysRoleService sysRoleService;
 
     @Resource
-    TeachcloudCommonService commonService;
+    LibraryCommonService commonService;
 
     @Resource
     SysPrivilegeService sysPrivilegeService;

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysUserServiceImpl.java

@@ -67,7 +67,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     CommonCacheService commonCacheService;
 
     @Resource
-    private TeachcloudCommonService commonService;
+    private LibraryCommonService commonService;
 
     @Resource
     SysUserMapper sysUserMapper;
@@ -85,7 +85,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     BasicSchoolService basicSchoolService;
 
     @Resource
-    TeachcloudCommonService teachcloudCommonService;
+    LibraryCommonService libraryCommonService;
 
     @Resource
     SysRoleGroupMemberService sysRoleGroupMemberService;
@@ -251,7 +251,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         if (schoolCode.equalsIgnoreCase(SystemConstant.ADMIN_CODE)) {
             userList.forEach(o -> {
-                AuthBean authBean = teachcloudCommonService.getUserAuth(o.getId());
+                AuthBean authBean = libraryCommonService.getUserAuth(o.getId());
                 if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().size() > 0) {
                     if (Objects.nonNull(authBean.getSchool())) {
                         throw ExceptionResultEnum.ERROR.exception("用户无法通过当前页面登录");
@@ -268,7 +268,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 校验验证码
         sysUserService.checkSmsCode(sysUser.getId(), sysUser.getMobileNumber(), dictionaryConfig.smsDomain().getSmsNormalCode());
 
-        return teachcloudCommonService.login(sysUser.getPassword(), sysUser, AppSourceEnum.SYSTEM);
+        return libraryCommonService.login(sysUser.getPassword(), sysUser, AppSourceEnum.SYSTEM);
     }
 
     @Transactional

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/TBTaskServiceImpl.java

@@ -18,7 +18,7 @@ import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
 import com.qmth.paper.library.common.mapper.TBTaskMapper;
 import com.qmth.paper.library.common.service.TBTaskService;
-import com.qmth.paper.library.common.service.TeachcloudCommonService;
+import com.qmth.paper.library.common.service.LibraryCommonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -41,7 +41,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
     private final static Logger log = LoggerFactory.getLogger(TBTaskServiceImpl.class);
 
     @Resource
-    private TeachcloudCommonService teachcloudCommonService;
+    private LibraryCommonService libraryCommonService;
 
     @Resource
     TBTaskMapper tbTaskMapper;
@@ -203,7 +203,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Set<Long> orgIds = null;
         if (TaskTypeEnum.CREATE_PDF.equals(type)) {
-            orgIds = teachcloudCommonService.listSubOrgIds(null);
+            orgIds = libraryCommonService.listSubOrgIds(null);
         }
         return tbTaskMapper.query(iPage, schoolId, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
     }

paper-library-task/src/main/java/com/qmth/paper/library/task/job/service/impl/JobServiceImpl.java

@@ -1,7 +1,7 @@
 package com.qmth.paper.library.task.job.service.impl;
 
 import com.qmth.boot.redis.uid.RedisMachineService;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.dto.MqDto;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.util.RedisUtil;
@@ -28,7 +28,7 @@ public class JobServiceImpl implements JobService {
     private final static Logger log = LoggerFactory.getLogger(JobServiceImpl.class);
 
     @Resource
-    PrintCommonService printCommonService;
+    PaperLibraryCommonService paperLibraryCommonService;
 
     @Resource
     RedisUtil redisUtil;
@@ -43,7 +43,7 @@ public class JobServiceImpl implements JobService {
      */
     @Override
     public void resetCreatePdfTask() throws IOException {
-        printCommonService.resetCreatePdfTask();
+        paperLibraryCommonService.resetCreatePdfTask();
     }
 
     @Override

paper-library-task/src/main/java/com/qmth/paper/library/task/start/StartRunning.java

@@ -1,6 +1,6 @@
 package com.qmth.paper.library.task.start;
 
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.task.enums.JobEnum;
 import com.qmth.paper.library.task.job.RedisMqSyncJob;
 import com.qmth.paper.library.task.job.ResendSmsJob;
@@ -35,7 +35,7 @@ public class StartRunning implements CommandLineRunner {
     JobService jobService;
 
     @Resource
-    PrintCommonService printCommonService;
+    PaperLibraryCommonService paperLibraryCommonService;
 
     @Override
     public void run(String... args) throws Exception {

paper-library/src/main/java/com/qmth/paper/library/PaperLibraryApplication.java

@@ -1,7 +1,7 @@
 package com.qmth.paper.library;
 
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
-import com.qmth.paper.library.auth.DistributedPrintAuthenticationService;
+import com.qmth.paper.library.auth.PaperLibraryAuthenticationService;
 import com.qmth.paper.library.common.base.CustomizedSqlInjector;
 import com.qmth.paper.library.common.threadPool.MyThreadPool;
 import org.mybatis.spring.annotation.MapperScan;
@@ -32,12 +32,12 @@ public class PaperLibraryApplication {
     }
 
     @Resource
-    private DistributedPrintAuthenticationService distributedPrintAuthenticationService;
+    private PaperLibraryAuthenticationService paperLibraryAuthenticationService;
 
     @Bean
     public CustomizeAuthorizationService customizeAuthorizationService() {
         return registration -> {
-            registration.setDefault(distributedPrintAuthenticationService);
+            registration.setDefault(paperLibraryAuthenticationService);
         };
     }
 

paper-library/src/main/java/com/qmth/paper/library/api/BasicStudentController.java

@@ -6,11 +6,9 @@ import com.qmth.paper.library.common.bean.params.BasicStudentParams;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.service.BasicStudentService;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
-import com.qmth.paper.library.common.entity.TBTask;
-import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
@@ -18,7 +16,6 @@ import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -44,7 +41,7 @@ public class BasicStudentController {
     @Resource
     private BasicStudentService basicStudentService;
     @Resource
-    private PrintCommonService printCommonService;
+    private PaperLibraryCommonService paperLibraryCommonService;
 
     @ApiOperation(value = "学生基本信息管理-查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)

paper-library/src/main/java/com/qmth/paper/library/api/MenuCustomController.java

@@ -60,7 +60,7 @@ public class MenuCustomController {
     SysUserRoleService sysUserRoleService;
 
     @Resource
-    TeachcloudCommonService commonService;
+    LibraryCommonService commonService;
 
     @Resource
     SysConfigService sysConfigService;

paper-library/src/main/java/com/qmth/paper/library/api/PaperArchivesController.java

@@ -0,0 +1,70 @@
+package com.qmth.paper.library.api;
+
+
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.business.entity.PaperArchives;
+import com.qmth.paper.library.business.service.PaperArchivesService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
+import com.qmth.paper.library.common.util.Result;
+import com.qmth.paper.library.common.util.ResultUtil;
+import com.qmth.paper.library.common.util.ServletUtil;
+import io.swagger.annotations.*;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+/**
+ * <p>
+ * 档案管理表 前端控制器
+ * </p>
+ */
+@Api(tags = "档案管理表controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/library")
+@Validated
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+public class PaperArchivesController {
+    @Resource
+    private PaperArchivesService paperArchivesService;
+
+    @ApiOperation(value = "分页查询")
+    @RequestMapping(value = "/page", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result page(@ApiParam(value = "档案所属学期") @RequestParam(required = false) Long semesterId,
+                       @ApiParam(value = "档案管理部门") @RequestParam(required = false) Long orgId,
+                       @ApiParam(value = "档案类型") @RequestParam(required = false) Long archivesTypeId,
+                       @ApiParam(value = "档案名称") @RequestParam(required = false) String archivesName,
+                       @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "新增")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "更新成功", response = EditResult.class)})
+    public Result save(@Valid @RequestBody PaperArchives paperArchives, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok();
+    }
+
+
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result delete(@ApiParam(value = "主键") @RequestParam(required = false) Long id) {
+        return ResultUtil.ok();
+    }
+
+}

paper-library/src/main/java/com/qmth/paper/library/api/SysController.java

@@ -10,7 +10,7 @@ import com.qmth.paper.library.business.bean.result.DictionaryResult;
 import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.enums.DictionaryEnum;
 import com.qmth.paper.library.business.enums.LoginTypeEnum;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.auth.AuthBean;
 import com.qmth.paper.library.common.bean.result.LoginResult;
 import com.qmth.paper.library.common.bean.result.UserLoginCheckResult;
@@ -61,7 +61,7 @@ public class SysController {
     CommonCacheService commonCacheService;
 
     @Resource
-    PrintCommonService printCommonService;
+    PaperLibraryCommonService paperLibraryCommonService;
 
     @Resource
     TBTaskService tbTaskService;
@@ -73,7 +73,7 @@ public class SysController {
     SysUserRoleService sysUserRoleService;
 
     @Resource
-    TeachcloudCommonService teachcloudCommonService;
+    LibraryCommonService libraryCommonService;
 
     @Resource
     BasicStudentService basicStudentService;
@@ -181,7 +181,7 @@ public class SysController {
 
         if (login.getSchoolCode().equalsIgnoreCase(SystemConstant.ADMIN_CODE)) {
             userList.forEach(o -> {
-                AuthBean authBean = teachcloudCommonService.getUserAuth(o.getId());
+                AuthBean authBean = libraryCommonService.getUserAuth(o.getId());
                 if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().size() > 0) {
                     if (Objects.nonNull(authBean.getSchool())) {
                         throw ExceptionResultEnum.ERROR.exception("用户无法通过当前页面登录");
@@ -190,7 +190,7 @@ public class SysController {
             });
         }
         SysUser sysUser = userList.get(0);
-        LoginResult loginResult = teachcloudCommonService.login(login.getPassword(), sysUser, AppSourceEnum.SYSTEM);
+        LoginResult loginResult = libraryCommonService.login(login.getPassword(), sysUser, AppSourceEnum.SYSTEM);
 
         return ResultUtil.ok(loginResult);
     }
@@ -205,7 +205,7 @@ public class SysController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     public Result logout() throws NoSuchAlgorithmException {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        teachcloudCommonService.removeUserInfo(sysUser.getId(), false);
+        libraryCommonService.removeUserInfo(sysUser.getId(), false);
         return ResultUtil.ok();
     }
 
@@ -369,7 +369,7 @@ public class SysController {
                              @ApiParam(value = "上传文件类型", required = true) @RequestParam UploadFileEnum type) {
         BasicAttachment basicAttachment = null;
         try {
-            basicAttachment = printCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), type);
+            basicAttachment = paperLibraryCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), type);
             if (Objects.isNull(basicAttachment)) {
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             }
@@ -384,7 +384,7 @@ public class SysController {
                 ResultUtil.error(e.getMessage());
             }
         }
-        return ResultUtil.ok(new EditResult(basicAttachment.getId(), teachcloudCommonService.filePreview(basicAttachment.getPath()), basicAttachment.getPages()));
+        return ResultUtil.ok(new EditResult(basicAttachment.getId(), libraryCommonService.filePreview(basicAttachment.getPath()), basicAttachment.getPages()));
     }
 
 
@@ -396,7 +396,7 @@ public class SysController {
             throw ExceptionResultEnum.ERROR.exception("没有附件");
         } else {
             BasicAttachment basicAttachment = basicAttachmentService.getById(Long.parseLong(id));
-            return ResultUtil.ok(new EditResult(teachcloudCommonService.filePreview(basicAttachment.getPath())));
+            return ResultUtil.ok(new EditResult(libraryCommonService.filePreview(basicAttachment.getPath())));
         }
     }
 
@@ -417,7 +417,7 @@ public class SysController {
     @RequestMapping(value = "/get_code", method = RequestMethod.POST)
     public Result getCode(@ApiParam(value = "编码类型", required = true) @RequestParam SystemCodeEnum type) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        String number = teachcloudCommonService.getSysIncrCode(type, sysUser);
+        String number = libraryCommonService.getSysIncrCode(type, sysUser);
         return ResultUtil.ok((Object) number);
     }
 

paper-library/src/main/java/com/qmth/paper/library/api/SysOrgController.java

@@ -2,7 +2,7 @@ package com.qmth.paper.library.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.result.EditResult;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.templete.execute.AsyncSysOrgImportService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysOrg;
@@ -41,7 +41,7 @@ public class SysOrgController {
     private SysOrgService sysOrgService;
 
     @Resource
-    private PrintCommonService printCommonService;
+    private PaperLibraryCommonService paperLibraryCommonService;
 
     @Resource
     private AsyncSysOrgImportService asyncSysOrgImportService;
@@ -82,7 +82,7 @@ public class SysOrgController {
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     public Result enable(@RequestBody SysOrg org) {
-        return ResultUtil.ok(printCommonService.enable(org));
+        return ResultUtil.ok(paperLibraryCommonService.enable(org));
     }
 
     /**
@@ -94,7 +94,7 @@ public class SysOrgController {
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
     public Result remove(@RequestBody SysOrg org) {
-        return ResultUtil.ok(printCommonService.sysOrgRemove(org.getId()));
+        return ResultUtil.ok(paperLibraryCommonService.sysOrgRemove(org.getId()));
     }
 
     /**
@@ -113,7 +113,7 @@ public class SysOrgController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     public Result sysOrgImportAsync(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Map<String, Object> map = printCommonService.saveTask(file, TaskTypeEnum.ORG_IMPORT);
+        Map<String, Object> map = paperLibraryCommonService.saveTask(file, TaskTypeEnum.ORG_IMPORT);
         map.put(SystemConstant.SYS_USER, sysUser);
 
         asyncSysOrgImportService.importTask(map);

paper-library/src/main/java/com/qmth/paper/library/api/SysUserController.java

@@ -3,7 +3,7 @@ package com.qmth.paper.library.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.paper.library.business.service.PrintCommonService;
+import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
@@ -46,7 +46,7 @@ public class SysUserController {
     @Autowired
     private SysUserService sysUserService;
     @Resource
-    private PrintCommonService printCommonService;
+    private PaperLibraryCommonService paperLibraryCommonService;
 
     /**
      * 用户列表查询

paper-library/src/main/java/com/qmth/paper/library/auth/DistributedPrintAuthenticationService.java → paper-library/src/main/java/com/qmth/paper/library/auth/PaperLibraryAuthenticationService.java

@@ -27,8 +27,8 @@ import java.util.Objects;
 import java.util.Set;
 
 @Component
-public class DistributedPrintAuthenticationService implements AuthorizationService {
-    private final static Logger log = LoggerFactory.getLogger(DistributedPrintAuthenticationService.class);
+public class PaperLibraryAuthenticationService implements AuthorizationService {
+    private final static Logger log = LoggerFactory.getLogger(PaperLibraryAuthenticationService.class);
 
     @Resource
     CommonCacheService commonCacheService;
@@ -44,7 +44,7 @@ public class DistributedPrintAuthenticationService implements AuthorizationServi
 
     @Override
     public AccessEntity findByIdentity(String identity, SignatureType signatureType, String path) {
-        return new DistributedPrintSession(identity, SignatureType.TOKEN);
+        return new PaperLibrarySession(identity, SignatureType.TOKEN);
     }
 
     @Override

paper-library/src/main/java/com/qmth/paper/library/auth/DistributedPrintSession.java → paper-library/src/main/java/com/qmth/paper/library/auth/PaperLibrarySession.java

@@ -9,13 +9,13 @@ import com.qmth.paper.library.common.util.RedisUtil;
 import java.util.Collection;
 import java.util.Objects;
 
-public class DistributedPrintSession implements AccessEntity {
+public class PaperLibrarySession implements AccessEntity {
 
     private String identity;
 
     private SignatureType signatureType;
 
-    public DistributedPrintSession(String identity, SignatureType signatureType) {
+    public PaperLibrarySession(String identity, SignatureType signatureType) {
         this.identity = identity;
         this.signatureType = signatureType;
     }

paper-library/src/main/resources/application-36dev.properties

@@ -91,6 +91,7 @@ prefix.url.basic=admin/basic
 prefix.url.data=admin/data
 prefix.url.menu=admin/menu
 prefix.url.auth=admin/auth
+prefix.url.paper=admin/paper
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

paper-library/src/main/resources/application-dev.properties

@@ -73,6 +73,7 @@ prefix.url.basic=admin/basic
 prefix.url.data=admin/data
 prefix.url.menu=admin/menu
 prefix.url.auth=admin/auth
+prefix.url.paper=admin/paper
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

paper-library/src/main/resources/application-offline.properties

@@ -91,6 +91,7 @@ prefix.url.basic=admin/basic
 prefix.url.data=admin/data
 prefix.url.menu=admin/menu
 prefix.url.auth=admin/auth
+prefix.url.paper=admin/paper
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

paper-library/src/main/resources/application-test.properties

@@ -91,6 +91,7 @@ prefix.url.basic=admin/basic
 prefix.url.data=admin/data
 prefix.url.menu=admin/menu
 prefix.url.auth=admin/auth
+prefix.url.paper=admin/paper
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss