1.0.4,优化

README.md

@@ -26,4 +26,10 @@ mysql5.7or8.0
 docker
 
 附件：
-本地或oss存储
+本地或oss存储
+
+
+## 修改日志
+#### 1.0.4版本
+* 修改档案编号生成规则，由时间戳改为按学校下生成6位（D+5位序号从1开始）
+* 增加任务编号，生成规则为按学校下生成8位（D+7位序号从1开始）

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

@@ -30,6 +30,12 @@ public class PaperScanTask extends BaseEntity implements Serializable {
     @TableField("paper_archives_id")
     private Long paperArchivesId;
 
+    /**
+     * 扫描任务编号
+     */
+    @TableField("scan_task_code")
+    private String scanTaskCode;
+
     /**
      * 扫描任务名称
      */
@@ -111,6 +117,14 @@ public class PaperScanTask extends BaseEntity implements Serializable {
         this.paperArchivesId = paperArchivesId;
     }
 
+    public String getScanTaskCode() {
+        return scanTaskCode;
+    }
+
+    public void setScanTaskCode(String scanTaskCode) {
+        this.scanTaskCode = scanTaskCode;
+    }
+
     public String getScanTaskName() {
         return scanTaskName;
     }

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

@@ -32,5 +32,9 @@ public interface BusinessCacheService {
 
     int getSequence(Long paperScanTaskId);
 
-    void setSequence();
+    void initCacheData();
+
+    int getPaperArchivesCodeSequence(Long schoolId);
+
+    int getScanTaskCodeSequence(Long schoolId);
 }

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

@@ -44,4 +44,10 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
     Boolean abnormal(Long paperLibraryId);
 
     Integer maxSequence(Long paperScanTaskId);
+
+    String getPaperArchivesCode(Long schoolId);
+
+    String getScanTaskCode(Long schoolId);
+
+    List<PaperLibrary> listHistory();
 }

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

@@ -2,10 +2,13 @@ package com.qmth.paper.library.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.paper.library.business.entity.PaperArchives;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.service.BusinessCacheService;
+import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.service.PaperLibraryService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.common.bean.dto.SchoolDto;
 import com.qmth.paper.library.common.bean.dto.syssetting.SettingObject;
 import com.qmth.paper.library.common.bean.dto.syssetting.SimpleObject;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -18,6 +21,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -28,16 +32,24 @@ import java.util.Map;
 public class BusinessCacheServiceImpl implements BusinessCacheService {
 
     Map<Long, Integer> scanTaskSequenceMap = new HashMap<>();
+    Map<Long, Integer> paperArchivesCodeMap = new HashMap<>();
+    Map<Long, Integer> scanTaskCodeMap = new HashMap<>();
 
     @Resource
     PaperScanTaskService paperScanTaskService;
 
+    @Resource
+    PaperArchivesService paperArchivesService;
+
     @Resource
     PaperLibraryService paperLibraryService;
 
     @Resource
     SysUserService sysUserService;
 
+    @Resource
+    BasicSchoolService basicSchoolService;
+
     @Resource
     LockService lockService;
 
@@ -79,7 +91,7 @@ public class BusinessCacheServiceImpl implements BusinessCacheService {
     }
 
     @Override
-    public void setSequence() {
+    public void initCacheData() {
         QueryWrapper<PaperScanTask> queryWrapper = new QueryWrapper<>();
         List<PaperScanTask> paperScanTaskList = paperScanTaskService.list(queryWrapper);
         for (PaperScanTask paperScanTask : paperScanTaskList) {
@@ -87,5 +99,73 @@ public class BusinessCacheServiceImpl implements BusinessCacheService {
             int value = sequence == null ? 0 : sequence.intValue();
             scanTaskSequenceMap.put(paperScanTask.getId(), value);
         }
+
+        List<SchoolDto> basicSchoolList = basicSchoolService.listSchool();
+        for (SchoolDto schoolDto : basicSchoolList) {
+            Long schoolId = Long.valueOf(schoolDto.getId());
+            // 档案编号序号
+            QueryWrapper<PaperArchives> archivesQueryWrapper = new QueryWrapper<>();
+            archivesQueryWrapper.lambda().eq(PaperArchives::getSchoolId, schoolId)
+                    .likeRight(PaperArchives::getArchivesCode, SystemConstant.PAPER_ARCHIVES_CODE_PREFIX)
+                    .orderByDesc(PaperArchives::getArchivesCode);
+            List<PaperArchives> paperArchivesList = paperArchivesService.list(archivesQueryWrapper);
+            if (!CollectionUtils.isEmpty(paperArchivesList)) {
+                String paperArchivesCode = paperArchivesList.get(0).getArchivesCode();
+                String codeTemp = paperArchivesCode.substring(SystemConstant.PAPER_ARCHIVES_CODE_PREFIX.length());
+                int codeInt = Integer.parseInt(codeTemp);
+                paperArchivesCodeMap.put(schoolId, codeInt);
+            }
+
+            // 扫描任务编号序号
+            QueryWrapper<PaperScanTask> scanTaskQueryWrapper = new QueryWrapper<>();
+            scanTaskQueryWrapper.lambda().eq(PaperScanTask::getSchoolId, schoolId)
+                    .likeRight(PaperScanTask::getScanTaskCode, SystemConstant.SCAN_TASK_CODE_PREFIX)
+                    .orderByDesc(PaperScanTask::getScanTaskCode);
+            List<PaperScanTask> scanTaskList = paperScanTaskService.list(scanTaskQueryWrapper);
+            if (!CollectionUtils.isEmpty(scanTaskList)) {
+                String scanTaskCode = scanTaskList.get(0).getScanTaskCode();
+                String codeTemp = scanTaskCode.substring(SystemConstant.SCAN_TASK_CODE_PREFIX.length());
+                int codeInt = Integer.parseInt(codeTemp);
+                scanTaskCodeMap.put(schoolId, codeInt);
+            }
+        }
+    }
+
+    @Override
+    public int getPaperArchivesCodeSequence(Long schoolId) {
+        try {
+            lockService.waitlock(LockType.PAPER_ARCHIVES_SEQUENCE, schoolId);
+            if (!paperArchivesCodeMap.containsKey(schoolId)) {
+                paperArchivesCodeMap.put(schoolId, 1);
+                return 1;
+            }
+            Integer integer = paperArchivesCodeMap.get(schoolId);
+            int value = integer + 1;
+            paperArchivesCodeMap.put(schoolId, value);
+            return value;
+        } catch (Exception e) {
+            throw ExceptionResultEnum.ERROR.exception("获取档案编号自增数失败：" + e.getMessage());
+        } finally {
+            lockService.unlock(LockType.PAPER_ARCHIVES_SEQUENCE, schoolId);
+        }
+    }
+
+    @Override
+    public int getScanTaskCodeSequence(Long schoolId) {
+        try {
+            lockService.waitlock(LockType.SCAN_TASK_SEQUENCE, schoolId);
+            if (!scanTaskCodeMap.containsKey(schoolId)) {
+                scanTaskCodeMap.put(schoolId, 1);
+                return 1;
+            }
+            Integer integer = scanTaskCodeMap.get(schoolId);
+            int value = integer + 1;
+            scanTaskCodeMap.put(schoolId, value);
+            return value;
+        } catch (Exception e) {
+            throw ExceptionResultEnum.ERROR.exception("获取扫描任务编号自增数失败：" + e.getMessage());
+        } finally {
+            lockService.unlock(LockType.SCAN_TASK_SEQUENCE, schoolId);
+        }
     }
 }

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

@@ -12,10 +12,7 @@ import com.qmth.paper.library.business.bean.result.PaperArchivesResult;
 import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.*;
 import com.qmth.paper.library.business.mapper.PaperArchivesMapper;
-import com.qmth.paper.library.business.service.PaperArchivesCourseService;
-import com.qmth.paper.library.business.service.PaperArchivesService;
-import com.qmth.paper.library.business.service.PaperLibraryService;
-import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.business.service.*;
 import com.qmth.paper.library.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.paper.library.common.bean.params.DownLoadPaperParams;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -59,6 +56,9 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
     @Resource
     LibraryCommonService libraryCommonService;
 
+    @Resource
+    BusinessCacheService businessCacheService;
+
     @Override
     public IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -80,8 +80,8 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
             }
             paperArchives.setId(SystemConstant.getDbUuid());
             paperArchives.setSchoolId(schoolId);
-            // 档案编号（时间戳）
-            paperArchives.setArchivesCode(String.valueOf(System.currentTimeMillis()));
+            // 档案编号
+            paperArchives.setArchivesCode(paperLibraryService.getPaperArchivesCode(schoolId));
             paperArchives.setCreateId(userId);
             paperArchives.setCreateTime(System.currentTimeMillis());
             return this.save(paperArchives);

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

@@ -14,10 +14,7 @@ import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
 import com.qmth.paper.library.business.mapper.PaperLibraryMapper;
-import com.qmth.paper.library.business.service.PaperLibraryCommonService;
-import com.qmth.paper.library.business.service.PaperLibraryService;
-import com.qmth.paper.library.business.service.PaperScanTaskDetailService;
-import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.business.service.*;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
@@ -37,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.awt.print.Paper;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -56,9 +54,6 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
     @Resource
     PaperScanTaskService paperScanTaskService;
 
-    @Resource
-    PaperLibraryService paperLibraryService;
-
     @Resource
     PaperScanTaskDetailService paperScanTaskDetailService;
 
@@ -66,10 +61,10 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
     PaperLibraryCommonService paperLibraryCommonService;
 
     @Resource
-    SysUserService sysUserService;
+    BusinessCacheService businessCacheService;
 
     @Resource
-    BasicStudentService basicStudentService;
+    SysUserService sysUserService;
 
     @Resource
     OcrUtil ocrUtil;
@@ -118,6 +113,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         if (paperScanTaskDetail == null) {
             paperScanTaskDetail = new PaperScanTaskDetail();
             paperScanTaskDetail.insertInfo(sysUser.getId());
+            paperScanTaskDetail.setUpdateTime(System.currentTimeMillis());
             paperScanTaskDetail.setSchoolId(schoolId);
             paperScanTaskDetail.setPaperScanTaskId(paperScanTaskId);
             paperScanTaskDetail.setStudentId(studentId);
@@ -129,6 +125,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         UpdateWrapper<PaperLibrary> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(PaperLibrary::getPaperScanTaskDetailId, paperScanTaskDetail.getId())
                 .set(PaperLibrary::getAbnormal, false)
+                .set(PaperLibrary::getUpdateTime, System.currentTimeMillis())
                 .eq(PaperLibrary::getId, paperLibraryId);
         this.update(updateWrapper);
 
@@ -235,7 +232,6 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
     @Override
     public List<PaperLibraryResult> toBindPaper(Long paperScanTaskId) {
         Long userId = Long.valueOf(ServletUtil.getRequestHeaderUserId().toString());
-        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
 
         // 查询下一个待绑定任务
         List<PaperLibrary> waitPaperLibraryList = this.baseMapper.selectBatchData(paperScanTaskId, userId);
@@ -388,7 +384,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
                 throw ExceptionResultEnum.ERROR.exception("不支持的识别方式");
             }
         } catch (Exception e) {
-            throw ExceptionResultEnum.ERROR.exception("识别异常："+ e.getMessage());
+            throw ExceptionResultEnum.ERROR.exception("识别异常：" + e.getMessage());
         } finally {
             try {
                 FileUtils.forceDelete(file);
@@ -457,4 +453,25 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return new ArrayList<>();
     }
 
+    @Override
+    public String getPaperArchivesCode(Long schoolId) {
+        return SystemConstant.PAPER_ARCHIVES_CODE_PREFIX + String.format("%05d", businessCacheService.getPaperArchivesCodeSequence(schoolId));
+    }
+
+    @Override
+    public String getScanTaskCode(Long schoolId) {
+        return SystemConstant.SCAN_TASK_CODE_PREFIX + String.format("%07d", businessCacheService.getScanTaskCodeSequence(schoolId));
+    }
+
+    @Override
+    public List<PaperLibrary> listHistory() {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        QueryWrapper<PaperLibrary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(PaperLibrary::getSchoolId, sysUser.getSchoolId())
+                .eq(PaperLibrary::getUserId, sysUser.getId())
+                .orderByDesc(PaperLibrary::getUpdateTime)
+                .last("limit 5");
+        return this.list(queryWrapper);
+    }
+
 }

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

@@ -124,6 +124,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
             paperScanTask.setId(paperScanTaskId);
         } else {
             // 没扫描任务id - 新增
+            paperScanTask.setScanTaskCode(paperLibraryService.getScanTaskCode(schoolId));
             paperScanTask.insertInfo(requestUserId);
         }
         this.saveOrUpdate(paperScanTask);

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

@@ -363,7 +363,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
             List<PaperArchivesDetailResult> archivesDetailResults = paperArchivesService.listDetail(downLoadPaperParams);
             String rootPath = fileStoreUtil.buildPath(UploadFileEnum.DOWNLOAD, true);
-            String dirName = SystemConstant.getUuid() + SystemConstant.ZIP_PREFIX;
+            String dirName = SystemConstant.getUuid() + SystemConstant.ZIP_SUFFIX;
             zipFile = new File(rootPath + dirName);
             if (!zipFile.getParentFile().exists()) {
                 zipFile.getParentFile().mkdirs();

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

@@ -65,7 +65,7 @@
                 and pa.archives_type_id = #{archivesTypeId}
             </if>
             <if test="archivesName != null and archivesName != ''">
-                and pa.archives_name like concat('%',#{archivesName},'%')
+                and (pa.archives_name like concat(#{archivesName},'%') or pa.archives_code like concat(#{archivesName},'%'))
             </if>
             <if test="managerOrgId == null and orgIds != null and orgIds.size > 0">
                 AND pa.manager_org_id IN

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

@@ -41,7 +41,7 @@
                 AND pst.course_code = #{courseCode}
             </if>
             <if test="scanTaskName != null and scanTaskName != ''">
-                AND pst.scan_task_name like concat(#{scanTaskName},'%')
+                AND (pst.scan_task_name like concat(#{scanTaskName},'%') or pst.scan_task_code like concat(#{scanTaskName},'%'))
             </if>
             <if test="scanUser != null and scanUser != ''">
                 AND su.login_name like concat(#{scanUser},'%')

paper-library-common/src/main/java/com/qmth/paper/library/common/contant/SystemConstant.java

@@ -65,7 +65,10 @@ public class SystemConstant {
     public static final String ID = "id";
     public static final String FILE = "file";
     public static final String SIZE = "size";
-    public static final String ZIP_PREFIX = ".zip";
+    public static final String ZIP_SUFFIX = ".zip";
+    public static final String PAPER_ARCHIVES_CODE_PREFIX = "A";
+    public static final String SCAN_TASK_CODE_PREFIX = "T";
+
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final int PAGE_SIZE_MIN = 10;
     public static final int PAGE_SIZE_MAX = 500;

paper-library-common/src/main/java/com/qmth/paper/library/common/lock/LockType.java

@@ -1,7 +1,12 @@
 package com.qmth.paper.library.common.lock;
 
 public enum LockType {
-    BIND_SCAN_USER("绑定扫描员"), BIND_PAPER_TASK("绑定图片任务"), GET_SEQUENCE("获取自增数");
+    BIND_SCAN_USER("绑定扫描员"),
+    BIND_PAPER_TASK("绑定图片任务"),
+    GET_SEQUENCE("获取图片自增数"),
+    PAPER_ARCHIVES_SEQUENCE("获取档案编号自增数"),
+    SCAN_TASK_SEQUENCE("获取任务编号自增数"),
+    ;
 
     private String name;
 

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

@@ -139,4 +139,11 @@ public class PaperLibraryController {
                       @ApiParam(value = "识别方式") @RequestParam RecognitionTypeEnum type) {
         return ResultUtil.ok(paperLibraryService.recognition(paperLibraryId, index, x, y, width, height, rotate, type), null);
     }
+
+    @ApiOperation(value = "查询历史记录（最近处理的5张图片）")
+    @PostMapping("/list_history")
+    @ApiResponses({@ApiResponse(code = 200, message = "识别成功", response = Result.class)})
+    public Result recognition() {
+        return ResultUtil.ok(paperLibraryService.listHistory());
+    }
 }

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

@@ -32,7 +32,7 @@ public class StartRunning implements CommandLineRunner {
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
         authInfoService.appInfoInit();
-        businessCacheService.setSequence();
+        businessCacheService.initCacheData();
         log.info("服务器启动时执行 end");
     }
 }

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

@@ -8,8 +8,8 @@ server.tomcat.uri-encoding=UTF-8
 #--------database config--------------
 db.host=localhost
 db.port=3306
-db.name=paper-library-1.0.3
-#db.name=b
+#db.name=paper-library-1.0.4
+db.name=jhtu
 db.username=root
 db.password=12345678
 

sql/1.0.3修改内容.txt

@@ -1,93 +0,0 @@
-1.修改接口（采集端图片上传）：/api/admin/client/picture/upload?studentCode=    增加studentCode参数
-2.增加接口（刷新缓存）：/api/admin/common/flush_cache?type=        type值为：学校系统设置：SYS_SETTING   超管全局系统设置：SYS_SETTING_GLOBAL
-3.增加接口（导入考生）：/api/admin/paper/scan_task/import_student?paperScanTaskId=&file=
-4.修改接口(识别)：/api/admin/paper/library/ocr 改名为/api/admin/paper/library/recognition?type=    并增加type参数（识别类型）。值：OCR或者BAR_CODE
-5.增加接口（查询已开启的识别方式）：/api/admin/sys/setting/recognition_mode      权限绑在开始处理按钮
-
-
-
-ALTER TABLE paper_scan_task_detail`
-ADD COLUMN `teach_clazz_name` VARCHAR(100) NULL COMMENT '教学班' AFTER `student_id`;
-
-ALTER TABLE `paper_scan_task_detail`
-ADD COLUMN `teacher_name` VARCHAR(45) NULL COMMENT '任课老师' AFTER `teach_clazz_name`;
-
-ALTER TABLE `paper_scan_task`
-ADD COLUMN `course_code` VARCHAR(45) NULL COMMENT '课程代码' AFTER `scan_task_name`;
-
-UPDATE `sys_privilege` SET `name` = '识别', `url` = '/api/admin/paper/library/recognition' WHERE (`id` = '35');
-
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('265', '导入考生', 'Import', 'LINK', '244', '12', 'AUTH', '266', '1', '0', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('266', '导入考生', '/api/admin/paper/scan_task/import_student', 'URL', '244', '10', 'AUTH',  '1', '0', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('635', '刷新缓存', '/api/admin/common/flush_cache', 'URL', '149', '20', 'SYS', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`) VALUES ('414', '查询识别方式', '/api/admin/sys/setting/recognition_mode', 'URL', '409', '3', 'AUTH', '1', '1');
-UPDATE `sys_privilege` SET `related` = '27,28,34,35,42,414' WHERE (`id` = '22');
-
-
-
-
-
-
-
-
-
-
--------以下需要更新到江汉大学服务器
-
-ALTER TABLE `paper_scan_task` ADD COLUMN `check_user_id` BIGINT(20) NULL COMMENT '数据校验员Id' AFTER `scan_user_id`;
-ALTER TABLE `paper_scan_task` ADD COLUMN `bind_count` INT NULL DEFAULT '0' COMMENT '已绑定数量' AFTER `scan_count`;
-ALTER TABLE `paper_scan_task` ADD COLUMN `progress` DOUBLE NULL DEFAULT '0' COMMENT '绑定进度' AFTER `bind_count`;
-UPDATE `sys_privilege` SET `type` = 'LINK' WHERE (`id` = '22');
-
-
-ALTER TABLE `paper_scan_task`
-ADD COLUMN `abnormal_count` INT NULL DEFAULT '0' COMMENT '异常数量' AFTER `bind_count`;
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('267', '新增', 'Add', 'BUTTON', '244', '13', 'AUTH', '245', '1', '0', '1');
-UPDATE `sys_privilege` SET `name` = '新增' WHERE (`id` = '245');
-
-ALTER TABLE `paper_scan_task_detail`
-CHANGE COLUMN `is_bind` `bind_count` INT NULL DEFAULT '0' COMMENT '绑定图片数量' ;
-
-CREATE TABLE `paper_archives_course` (
-  `id` BIGINT(20) NOT NULL,
-  `school_id` BIGINT(20) NULL COMMENT '学校ID',
-  `paper_archives_id` BIGINT(20) NULL COMMENT '档案ID',
-  `course_code` VARCHAR(45) NULL COMMENT '课程代码',
-  `course_name` VARCHAR(100) NULL COMMENT '课程名称',
-  `teacher_name` VARCHAR(100) NULL COMMENT '任课老师',
-  `teach_clazz_name` VARCHAR(45) NULL COMMENT '教学班',
-  `create_id` BIGINT(20) NULL,
-  `create_time` BIGINT(20) NULL,
-  `update_id` BIGINT(20) NULL,
-  `update_time` BIGINT(20) NULL,
-  PRIMARY KEY (`id`));
-
-
-UPDATE `sys_privilege` SET `id` = '44', `name` = '导入课程信息', `parent_id` = '9', `related` = '45' WHERE (`id` = '265');
-UPDATE `sys_privilege` SET `id` = '45', `name` = '导入课程信息', `parent_id` = '9' WHERE (`id` = '266');
-
-ALTER TABLE `paper_scan_task_detail`
-DROP COLUMN `teacher_name`,
-DROP COLUMN `teach_clazz_name`;
-
-
-DELETE from sys_privilege where id in (44,45);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (44, '导入课程信息', 'Import', 'LINK', 9, 12, 'AUTH', 45, 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (45, '导入课程信息', '/api/admin/paper/archives/import', 'URL', 9, 10, 'AUTH', NULL, 1, 1, 1);
-
-ALTER TABLE `paper_scan_task`
-DROP COLUMN `teach_clazz_name`,
-DROP COLUMN `teacher_name`;
-
-
-DELETE FROM `sys_privilege` WHERE (`id` = '24');
-DELETE FROM `sys_privilege` WHERE (`id` = '41');
-DELETE FROM `sys_privilege` WHERE (`id` = '26');
-
-
-ALTER TABLE `paper_scan_task_detail`
-ADD UNIQUE INDEX `idx_paper_scan_task_id` (`paper_scan_task_id` ASC, `student_id` ASC) VISIBLE;
-
-
-ALTER TABLE `paper_scan_task`
-ADD INDEX `idx_paper_archives_id` (`paper_archives_id` ASC) VISIBLE;

sql/1.0.4脚本修改.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `paper_scan_task` ADD COLUMN `scan_task_code` VARCHAR(8) NULL COMMENT '任务编号' AFTER `paper_archives_id`;
+
+ALTER TABLE `paper_archives` CHANGE COLUMN `archives_code` `archives_code` VARCHAR(15) NULL DEFAULT NULL COMMENT '档案编号' ;