测试bug修改

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

@@ -18,4 +18,6 @@ public interface ClientService {
     boolean bindUser(Long paperScanTaskId, Long userId);
 
     boolean pictureUpload(Long paperScanTaskId, MultipartFile frontFile, String frontMd5, MultipartFile versoFile, String versoMd5);
+
+    boolean enable(Long paperScanTaskId, Boolean enable);
 }

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

@@ -111,5 +111,5 @@ public interface PaperScanTaskService extends IService<PaperScanTask> {
 
     PaperScanTaskResult getByPaperScanTaskId(Long paperScanTaskId);
 
-    void enable(Long paperScanTaskId, Boolean enable);
+    boolean enable(Long paperScanTaskId, Boolean enable);
 }

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

@@ -169,4 +169,9 @@ public class ClientServiceImpl implements ClientService {
             throw ExceptionResultEnum.ERROR.exception("上传图片失败：" + e.getMessage());
         }
     }
+
+    @Override
+    public boolean enable(Long paperScanTaskId, Boolean enable) {
+        return paperScanTaskService.enable(paperScanTaskId, enable);
+    }
 }

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

@@ -259,6 +259,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
             throw ExceptionResultEnum.ERROR.exception("扫描任务不存在");
         }
         paperScanTask.setScanUserId(null);
+        paperScanTask.setEnable(true);
         paperScanTask.updateInfo(requestUser.getId());
         this.updateById(paperScanTask);
     }
@@ -328,12 +329,12 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     }
 
     @Override
-    public void enable(Long paperScanTaskId, Boolean enable) {
+    public boolean enable(Long paperScanTaskId, Boolean enable) {
         PaperScanTask paperScanTask = this.getById(paperScanTaskId);
         if (paperScanTask == null) {
             throw ExceptionResultEnum.ERROR.exception("任务数据异常");
         }
         paperScanTask.setEnable(enable);
-        this.updateById(paperScanTask);
+        return this.updateById(paperScanTask);
     }
 }

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

@@ -80,7 +80,7 @@
                 AND pstd.paper_scan_task_id = #{paperScanTaskId}
             </if>
         </where>
-        ORDER BY scanCount desc
+        ORDER BY bs.student_code
     </select>
 
     <select id="findBindDetailByScanTaskId"

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

@@ -125,6 +125,8 @@ public interface LibraryCommonService {
      */
     public String filePreview(String path);
 
+    String preViewPath(String path, String uploadType, String type, Boolean isExpire);
+
     /**
      * 文件预览
      *

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

@@ -455,6 +455,31 @@ public class LibraryCommonServiceImpl implements LibraryCommonService {
         return url;
     }
 
+    public String preViewPath(String path, String uploadType, String type, Boolean isExpire) {
+        if (StringUtils.isBlank(path)) {
+            return null;
+        }
+        String pathUrl;
+        // 本地文件
+        if (Objects.equals(type, SystemConstant.LOCAL)) {
+            String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
+            path = SystemConstant.getLocalFilePath(hostUrl, path);
+            if (path.startsWith("/")) {
+                pathUrl = hostUrl + path;
+            } else {
+                pathUrl = hostUrl + File.separator + path;
+            }
+        } else {
+            if (isExpire) {
+                pathUrl = fileStoreUtil.getPrivateUrl(path, UploadFileEnum.valueOf(uploadType).getFssType());
+            } else {
+                pathUrl = fileStoreUtil.getPrivateUrl(path, UploadFileEnum.valueOf(uploadType).getFssType());
+            }
+
+        }
+        return pathUrl;
+    }
+
     /**
      * 文件预览
      *

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

@@ -1,5 +1,7 @@
 package com.qmth.paper.library.common.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
@@ -47,7 +49,6 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
 
     /**
      * 保存任务
-     *
      */
     @Override
     public Map<String, Object> saveTask(TaskTypeEnum taskTypeEnum, String remark, SysUser sysUser) {
@@ -83,7 +84,25 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = libraryCommonService.listSubOrgIds(null);
-        return tbTaskMapper.query(iPage, schoolId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
+        IPage<TaskListResult> taskListResultIPage = tbTaskMapper.query(iPage, schoolId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
+        for (TaskListResult record : taskListResultIPage.getRecords()) {
+            String importFilePath = record.getImportFilePath();
+            if (StringUtils.isNotBlank(importFilePath)) {
+                JSONObject jsonObject = JSON.parseObject(importFilePath, JSONObject.class);
+                record.setImportFilePath(libraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), jsonObject.getString(SystemConstant.TYPE), false));
+            }
+            String txtFilePath = record.getTxtFilePath();
+            if (StringUtils.isNotBlank(txtFilePath)) {
+                JSONObject jsonObject = JSON.parseObject(txtFilePath, JSONObject.class);
+                record.setTxtFilePath(libraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), jsonObject.getString(SystemConstant.TYPE), false));
+            }
+            String exportFilePath = record.getExportFilePath();
+            if (StringUtils.isNotBlank(exportFilePath)) {
+                JSONObject jsonObject = JSON.parseObject(exportFilePath, JSONObject.class);
+                record.setExportFilePath(libraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), jsonObject.getString(SystemConstant.TYPE), false));
+            }
+        }
+        return taskListResultIPage;
     }
 
     /**

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

@@ -6,6 +6,7 @@ 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.params.ClientLoginParam;
+import com.qmth.paper.library.business.bean.result.EditResult;
 import com.qmth.paper.library.business.service.ClientService;
 import com.qmth.paper.library.common.bean.result.LoginResult;
 import com.qmth.paper.library.common.contant.SystemConstant;
@@ -121,4 +122,12 @@ public class ClientController {
         return ResultUtil.ok(clientService.pictureUpload(paperScanTaskId, frontFile, frontMd5, versoFile, versoMd5));
     }
 
+    @ApiOperation(value = "任务结束/开启")
+    @PostMapping("/task/enable")
+    @ApiResponses({@ApiResponse(code = 200, message = "成功", response = EditResult.class)})
+    public Result enable(@ApiParam(value = "扫描任务id", required = true) @RequestParam Long paperScanTaskId,
+                         @ApiParam(value = "enable", required = true) @RequestParam Boolean enable) {
+        return ResultUtil.ok(clientService.enable(paperScanTaskId, enable));
+    }
+
 }

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

@@ -151,12 +151,4 @@ public class PaperScanTaskController {
         return ResultUtil.ok();
     }
 
-    @ApiOperation(value = "扫描任务管理-结束/开启")
-    @PostMapping("/enable")
-    @ApiResponses({@ApiResponse(code = 200, message = "成功", response = EditResult.class)})
-    public Result enable(@ApiParam(value = "扫描任务id", required = true) @RequestParam Long paperScanTaskId,
-                                     @ApiParam(value = "数据检察员id", required = true) @RequestParam Boolean enable) {
-        paperScanTaskService.enable(paperScanTaskId, enable);
-        return ResultUtil.ok();
-    }
 }

sql/paper-library-1.0.0.sql

@@ -369,7 +369,7 @@ INSERT INTO `sys_privilege` VALUES (5, '用户管理', 'UserManage', 'MENU', 2,
 INSERT INTO `sys_privilege` VALUES (6, '角色管理', 'RoleManage', 'MENU', 2, 3, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (7, '权限管理', 'MenuManage', 'MENU', 129, 6, NULL, NULL, 0, 1, 1);
 INSERT INTO `sys_privilege` VALUES (8, '档案管理', 'archives', 'MENU', 1, 2, NULL, NULL, 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (9, '档案管理', 'ArchivesManage', 'MENU', 8, 1, NULL, '27,34,37,410', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (9, '档案管理', 'ArchivesManage', 'MENU', 8, 1, NULL, '27,34,35,37,410', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (10, '列表', 'List', 'LIST', 9, 1, 'AUTH', '15', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (11, '新增', 'Add', 'BUTTON', 9, 2, 'AUTH', '16', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (12, '编辑', 'Edit', 'LINK', 9, 3, 'AUTH', '16', 1, 0, 1);
@@ -461,11 +461,12 @@ INSERT INTO `sys_privilege` VALUES (184, '查询用户可绑定角色', '/api/ad
 INSERT INTO `sys_privilege` VALUES (185, '删除', 'Delete', 'LINK', 5, 6, 'AUTH', '186', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (186, '删除', '/api/admin/sys/user/remove', 'URL', 5, 8, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (195, '获取服务器时间', '/api/admin/common/get_system_time', 'URL', 129, 2, 'NO_AUTH', NULL, 1, 1, 1);
-INSERT INTO `sys_privilege` VALUES (200, '客户端', 'client', 'MENU', NULL, 1, NULL, '51,54,55,202,203,204', 1, 0, 0);
+INSERT INTO `sys_privilege` VALUES (200, '客户端', 'client', 'MENU', NULL, 1, NULL, '202,203,204,205', 1, 0, 0);
 INSERT INTO `sys_privilege` VALUES (201, '客户端登录', '/api/admin/client/user/login', 'URL', NULL, 1, 'NO_AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (202, '任务查询', '/api/admin/client/task/page', 'URL', 200, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (203, '开始扫描', '/api/admin/client/bind/user', 'URL', 200, 2, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (204, '上传图片', '/api/admin/client/picture/upload', 'URL', 200, 3, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (205, '开启/关闭', '/api/admin/client/task/enable', 'URL', 200, 4, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (217, '查询', 'Select', 'BUTTON', 5, 1, 'AUTH', '77', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (218, '新增用户', 'Add', 'BUTTON', 5, 2, 'AUTH', '78', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (219, '编辑', 'Edit', 'LINK', 5, 1, 'AUTH', '78', 1, 0, 1);
@@ -505,8 +506,6 @@ INSERT INTO `sys_privilege` VALUES (260, '绑定进度详情', 'ProgressDetail',
 INSERT INTO `sys_privilege` VALUES (262, '批量删除', 'DeleteBatch', 'BUTTON', 244, 9, 'AUTH', '247', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (263, '导入扫描任务', 'Import', 'BUTTON', 244, 10, 'AUTH', '248', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (264, '查询条件', 'Condition', 'CONDITION', 244, 11, 'AUTH', '246', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (265, '结束/开启', 'Enable', 'LINK', 244, 12, 'AUTH', '266', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (266, '结束/开启', '/api/admin/paper/scan_task/enable', 'URL', 244, 10, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (358, '学生管理', 'StudentManage', 'MENU', 2, 6, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (362, '查询', '/api/admin/basic/student/query', 'URL', 358, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (363, '增/编辑', '/api/admin/basic/student/save', 'URL', 358, 2, 'AUTH', NULL, 1, 1, 1);