1.0.3,bug修改

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

@@ -18,18 +18,12 @@ import java.util.Set;
  */
 public interface PaperLibraryMapper extends BaseMapper<PaperLibrary> {
 
-    IPage<PaperLibraryResult> pageUnbindData(@Param("page") Page<PaperLibraryResult> page, @Param("paperScanTaskId") Long paperScanTaskId);
-
-    int countUnbindData(@Param("paperScanTaskId") Long paperScanTaskId);
-
     IPage<PaperLibraryResult> pageBindData(@Param("page") Page<PaperLibraryResult> page, @Param("semesterId") Long semesterId, @Param("paperArchivesId") Long paperArchivesId, @Param("courseCode") String courseCode, @Param("scanTaskName") String scanTaskName);
 
     int countBindData(@Param("paperScanTaskId") Long paperScanTaskId);
 
     IPage<PaperLibraryResult> pageAbnormalData(@Param("page") Page<PaperLibraryResult> page, @Param("semesterId") Long semesterId, @Param("paperArchivesId") Long paperArchivesId, @Param("courseCode") String courseCode, @Param("scanTaskName") String scanTaskName, @Param("listSubOrgIds") Set<Long> listSubOrgIds, @Param("isMatch") boolean isMatch, @Param("userId") Long userId);
 
-    int countAbnormalData(@Param("paperScanTaskId") Long paperScanTaskId);
-
     List<PaperLibrary> listUnBindData(@Param("paperScanTaskId") Long paperScanTaskId);
 
     List<PaperLibrary> selectBatchData(@Param("paperScanTaskId") Long paperScanTaskId, @Param("userId") Long userId);

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

@@ -19,16 +19,12 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
 
     IPage<PaperScanTaskResult> pageUnbindData(Long semesterId, Long paperArchivesId, String courseCode, String scanTaskName, Integer pageNumber, Integer pageSize);
 
-    int countUnbindData(Long paperScanTaskId);
-
     IPage<PaperLibraryResult> pageBindData(Long semesterId, Long paperArchivesId, String courseCode, String scanTaskName, Integer pageNumber, Integer pageSize);
 
     int countBindData(Long paperScanTaskId);
 
     IPage<PaperLibraryResult> pageAbnormalData(Long semesterId, Long paperArchivesId, String courseCode, String scanTaskName, Integer pageNumber, Integer pageSize);
 
-    int countAbnormalData(Long paperScanTaskId);
-
     boolean bind(Long paperLibraryId, Long paperScanTaskId, Long studentId);
 
     List<PaperLibraryResult> listStudentPicture(Long paperScanTaskDetailId);

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

@@ -19,7 +19,6 @@ 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.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.BasicStudent;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.enums.RecognitionTypeEnum;
@@ -86,11 +85,6 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return paperScanTaskService.pageUnbindData(new Page<>(pageNumber, pageSize), semesterId, paperArchivesId, courseCode, scanTaskName);
     }
 
-    @Override
-    public int countUnbindData(Long paperScanTaskId) {
-        return this.baseMapper.countUnbindData(paperScanTaskId);
-    }
-
     @Override
     public IPage<PaperLibraryResult> pageBindData(Long semesterId, Long paperArchivesId, String courseCode, String scanTaskName, Integer pageNumber, Integer pageSize) {
         return this.baseMapper.pageBindData(new Page<>(pageNumber, pageSize), semesterId, paperArchivesId, courseCode, scanTaskName);
@@ -109,11 +103,6 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return this.baseMapper.pageAbnormalData(new Page<>(pageNumber, pageSize), semesterId, paperArchivesId, courseCode, scanTaskName, listSubOrgIds, isMatch, userId);
     }
 
-    @Override
-    public int countAbnormalData(Long paperScanTaskId) {
-        return this.baseMapper.countAbnormalData(paperScanTaskId);
-    }
-
     @Transactional
     @Override
     public boolean bind(Long paperLibraryId, Long paperScanTaskId, Long studentId) {

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

@@ -24,24 +24,6 @@
         select id, school_id, `path`, paper_scan_task_id, paper_scan_task_detail_id, user_id, `sequence`, abnormal,create_id, create_time, update_id, update_time from paper_library
     </sql>
 
-    <select id="pageUnbindData" resultMap="BaseResultMap">
-        <include refid="Base_Column_List"></include>
-        <where>
-            paper_scan_task_detail_id is null and abnormal = false
-            <if test="paperScanTaskId != null">
-                and paper_scan_task_id = #{paperScanTaskId}
-            </if>
-        </where>
-    </select>
-    <select id="countUnbindData" resultType="java.lang.Integer">
-        select count(1) from paper_library
-        <where>
-            paper_scan_task_detail_id is null and abnormal = false
-            <if test="paperScanTaskId != null">
-                and paper_scan_task_id = #{paperScanTaskId}
-            </if>
-        </where>
-    </select>
     <select id="pageBindData" resultType="com.qmth.paper.library.business.bean.result.PaperLibraryResult">
         SELECT
             pstd.paper_scan_task_id paperScanTaskId,
@@ -56,7 +38,7 @@
         FROM
             paper_scan_task_detail pstd
                 LEFT JOIN
-            paper_scan_task pst ON pstd.school_id = pst.school_id
+            paper_scan_task pst
                 AND pstd.paper_scan_task_id = pst.id
                 LEFT JOIN
             paper_archives pa ON pst.paper_archives_id = pa.id
@@ -136,12 +118,6 @@
             </if>
         </where>
     </select>
-    <select id="countAbnormalData" resultType="java.lang.Integer">
-        select count(1) from paper_library
-        <where>
-            paper_scan_task_id = #{paperScanTaskId} and abnormal = true
-        </where>
-    </select>
     <select id="listUnBindData" resultMap="BaseResultMap">
         <include refid="Base_Column_List"></include>
         <where>

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

@@ -202,6 +202,6 @@
             </if>
             and (pst.check_user_id is null or (pst.check_user_id = #{userId} and (pst.scan_count - pst.bind_count - pst.abnormal_count) > 0))
         </where>
-        order by pst.check_user_id
+        order by pst.create_time
     </select>
 </mapper>

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

@@ -45,12 +45,6 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.pageUnbindData(semesterId, paperArchivesId, courseCode, scanTaskName, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "分页查询-未处理数量")
-    @PostMapping("/count_unbind")
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result countUnbind(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId) {
-        return ResultUtil.ok(paperLibraryService.countUnbindData(paperScanTaskId));
-    }
 
     @ApiOperation(value = "分页查询-已处理")
     @PostMapping("/page_bind")
@@ -76,13 +70,6 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.pageAbnormalData(semesterId, paperArchivesId, courseCode, scanTaskName, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "分页查询-异常数量")
-    @PostMapping("/count_abnormal")
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result countAbnormal(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId) {
-        return ResultUtil.ok(paperLibraryService.countAbnormalData(paperScanTaskId));
-    }
-
     @ApiOperation(value = "查询考生图片集合")
     @PostMapping("/list_student_picture")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})

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

@@ -8,7 +8,8 @@ server.tomcat.uri-encoding=UTF-8
 #--------database config--------------
 db.host=localhost
 db.port=3306
-db.name=paper-library-v1.0.2
+db.name=paper-library-1.0.3
+#db.name=b
 db.username=root
 db.password=12345678
 
@@ -25,8 +26,11 @@ sys.config.sessionActive=24h
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/
 
 #----------------fss config-----------------
-com.qmth.fss.config=file-temp
-com.qmth.fss.server=http://localhost:8001
+#com.qmth.fss.config=/Users/xiaofei/qmth/temporary/paperlibrary/file-temp
+#com.qmth.fss.server=http://192.168.10.140:8001
+
+com.qmth.fss.config=/Users/xiaofei/qmth/temporary/paperlibrary/file-temp
+com.qmth.fss.server=http://192.168.10.140:8001
 
 #-----------------qmth boot config--------------
 com.qmth.api.metrics-endpoint=/metrics-count

sql/1.0.3修改内容.txt

@@ -12,7 +12,7 @@ ADD COLUMN `teach_clazz_name` VARCHAR(100) NULL COMMENT '教学班' AFTER `stude
 ALTER TABLE `paper_scan_task_detail`
 ADD COLUMN `teacher_name` VARCHAR(45) NULL COMMENT '任课老师' AFTER `teach_clazz_name`;
 
-ALTER TABLE paper_scan_task`
+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');
@@ -32,7 +32,7 @@ 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`;
@@ -40,25 +40,14 @@ ALTER TABLE `paper_scan_task` ADD COLUMN `progress` DOUBLE NULL DEFAULT '0' COMM
 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 '绑定图片数量' ;
 
-
-
------------以上为1.0.2更新内容
------------以下为1.0.3更新内容
-
 CREATE TABLE `paper_archives_course` (
   `id` BIGINT(20) NOT NULL,
   `school_id` BIGINT(20) NULL COMMENT '学校ID',
@@ -84,4 +73,21 @@ 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);
+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/paper_library_db.sql

@@ -132,7 +132,7 @@ CREATE TABLE `basic_student`  (
   `update_id` bigint(20) DEFAULT NULL COMMENT '更新人id',
   `update_time` bigint(20) DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE INDEX `student_schoolId_code_orgId_idx`(`school_id`, `student_code`, `belong_org_id`) USING BTREE
+  UNIQUE INDEX `student_schoolId_code_orgId_idx`(`school_id`, `student_code`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '学校id' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -244,8 +244,6 @@ CREATE TABLE `paper_scan_task`  (
   `scan_task_name` varchar(64) NOT NULL COMMENT '扫描任务名称',
   `course_code` VARCHAR(45) NULL COMMENT '课程代码',
   `course_name` varchar(64) DEFAULT NULL COMMENT '课程名称',
-  `teacher_name` varchar(64) DEFAULT NULL COMMENT '任课教师',
-  `teach_clazz_name` varchar(64) DEFAULT NULL COMMENT '教学班名称',
   `scan_user_id` bigint(20) DEFAULT NULL COMMENT '扫描员id',
   `check_user_id` BIGINT(20) NULL COMMENT '数据校验员Id',
   `student_count` INT(11) DEFAULT 0 COMMENT '扫描量（份）',
@@ -258,7 +256,8 @@ CREATE TABLE `paper_scan_task`  (
   `create_time` bigint(20) DEFAULT NULL COMMENT '创建时间',
   `update_id` bigint(20) DEFAULT NULL COMMENT '更新人',
   `update_time` bigint(20) DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_paper_archives_id` (`paper_archives_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '扫描任务表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -275,7 +274,8 @@ CREATE TABLE `paper_scan_task_detail`  (
   `create_time` bigint(20) DEFAULT NULL COMMENT '创建时间',
   `update_id` bigint(20) DEFAULT NULL COMMENT '更新人',
   `update_time` bigint(20) DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `idx_paper_scan_task_id` (`paper_scan_task_id`,`student_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '扫描任务详情表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -285,7 +285,7 @@ DROP TABLE IF EXISTS `sys_org`;
 CREATE TABLE `sys_org`  (
   `id` bigint(20) NOT NULL COMMENT '主键',
   `school_id` bigint(20) NOT NULL COMMENT '学校id',
-  `type` varchar(50) DEFAULT NULL COMMENT '类型，SCHOOL：学校，COLLEGE：学院，FACULTY：院系，TEACHING_ROOM：教研室，PRINTING_HOUSE：印刷厂',
+  `type` varchar(50) DEFAULT NULL COMMENT '类型，SCHOOL：学校，COLLEGE：学院，FACULTY：院系，TEACHING_ROOM：教研室',
   `code` varchar(20) DEFAULT NULL COMMENT '机构代码',
   `name` varchar(100) NOT NULL COMMENT '机构名称',
   `parent_id` bigint(20) DEFAULT NULL COMMENT '上级机构id',
@@ -343,9 +343,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (21, '列表', 'List', 'LIST', 20, 1, 'AUTH', '23,24,25,26,29,40,41,43,410', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (22, '开始处理', 'Deal', 'LINK', 20, 2, 'AUTH', '27,28,34,35,42,414', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (23, '未处理接口', '/api/admin/paper/library/page_unbind', 'URL', 20, 1, 'AUTH', NULL, 1, 1, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (24, '未处理数量接口', '/api/admin/paper/library/count_unbind', 'URL', 20, 2, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (25, '已处理接口', '/api/admin/paper/library/page_bind', 'URL', 20, 3, 'AUTH', NULL, 1, 1, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (26, '已处理数量接口', '/api/admin/paper/library/count_bind', 'URL', 20, 4, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (27, '绑定接口', '/api/admin/paper/library/bind', 'URL', 20, 5, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (28, '开始处理接口', '/api/admin/paper/library/get_bind_data', 'URL', 20, 6, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (29, '查询考生图片集合接口', '/api/admin/paper/library/list_student_picture', 'URL', 20, 7, 'AUTH', NULL, 1, 1, 1);
@@ -360,7 +358,6 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (38, '批量下载', 'Download', 'BUTTON', 9, 6, 'AUTH', '39', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (39, '批量下载', '/api/admin/paper/archives/paper_download', 'URL', 9, 5, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (40, '异常分页接口', '/api/admin/paper/library/page_abnormal', 'URL', 20, 10, 'AUTH', NULL, 1, 1, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (41, '异常数量接口', '/api/admin/paper/library/count_abnormal', 'URL', 20, 11, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (42, '标记异常接口', '/api/admin/paper/library/abnormal', 'URL', 20, 12, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (43, '获取单条图片详情', '/api/admin/paper/library/get_paper_data', 'URL', 20, 13, 'AUTH', NULL, 1, 1, 1);
 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);
@@ -653,6 +650,8 @@ INSERT INTO `sys_role_privilege` VALUES (1583383507530137601, 2, 410, 1);
 INSERT INTO `sys_role_privilege` VALUES (1583383507534331905, 2, 27, 1);
 INSERT INTO `sys_role_privilege` VALUES (1583383507534331906, 2, 29, 1);
 INSERT INTO `sys_role_privilege` VALUES (1583383507538526210, 2, 30, 1);
+INSERT INTO `sys_role_privilege` VALUES (1583383507538526211, 2, 44, 1);
+INSERT INTO `sys_role_privilege` VALUES (1583383507538526211, 2, 45, 1);
 
 -- ----------------------------
 -- Table structure for sys_setting