联调bug修改

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

@@ -8,6 +8,7 @@ import com.qmth.paper.library.common.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -28,13 +29,13 @@ public class PaperArchives extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "学期id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("semester_id")
-    @NotBlank(message = "请选择档学期")
+    @NotNull(message = "请选择档学期")
     private Long semesterId;
 
     @ApiModelProperty(value = "档案管理部门Id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("manager_org_id")
-    @NotBlank(message = "请选择档案管理部门")
+    @NotNull(message = "请选择档案管理部门")
     private Long managerOrgId;
 
     /**
@@ -53,13 +54,13 @@ public class PaperArchives extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "档案类型id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("archives_type_id")
-    @NotBlank(message = "请选择档案类型")
+    @NotNull(message = "请选择档案类型")
     private Long archivesTypeId;
 
     @ApiModelProperty(value = "档案管理员")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("manager_id")
-    @NotBlank(message = "请选择档案管理员")
+    @NotNull(message = "请选择档案管理员")
     private Long managerId;
 
     @ApiModelProperty(value = "档案到期预警时间")

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

@@ -30,4 +30,6 @@ public interface PaperLibraryMapper extends BaseMapper<PaperLibrary> {
     List<PaperLibrary> selectBatchData(@Param("schoolId") Long schoolId, @Param("userId") Long userId);
 
     List<TaskStudentResult> listByStudentCode(@Param("schoolId") Long schoolId, @Param("studentCode") String studentCode);
+
+    IPage<TaskStudentResult> pageStudent(@Param("objectPage") Page<Object> objectPage, @Param("schoolId") Long schoolId, @Param("paperScanTaskId") Long paperScanTaskId, @Param("param") String param);
 }

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

@@ -84,5 +84,5 @@ public interface PaperLibraryCommonService {
 
     String saveLibraryFile(UploadFileEnum uploadFileEnum, MultipartFile... files);
 
-    String preViewPath(String path, String uploadType, Boolean isExpire);
+    String preViewPath(String path, String uploadType, String type, Boolean isExpire);
 }

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

@@ -32,4 +32,6 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
     List<TaskStudentResult> listByStudentCode(String studentCode);
 
     int countScanCount(Long paperScanTaskId);
+
+    IPage<TaskStudentResult> pageStudent(Long paperScanTaskId, String param, Integer pageNumber, Integer pageSize);
 }

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

@@ -99,7 +99,7 @@ public class ClientServiceImpl implements ClientService {
             }
 
             // 扫描任务是否被其它人扫描
-            if (paperScanTask.getScanUserId() != null) {
+            if (paperScanTask.getScanUserId() != null && !paperScanTask.getScanUserId().equals(userId)) {
                 throw ExceptionResultEnum.ERROR.exception("其它扫描员已开始扫描");
             }
 

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

@@ -47,7 +47,7 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
 
     @Override
     public boolean saveData(PaperArchives paperArchives) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long userId = Long.valueOf(ServletUtil.getRequestHeaderUserId().toString());
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
         // 新增
@@ -60,7 +60,7 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
             paperArchives.setSchoolId(schoolId);
             // 档案编号（时间戳）
             paperArchives.setArchivesCode(String.valueOf(System.currentTimeMillis()));
-            paperArchives.setCreateId(sysUser.getId());
+            paperArchives.setCreateId(userId);
             paperArchives.setCreateTime(System.currentTimeMillis());
             return this.save(paperArchives);
         } else {
@@ -76,7 +76,7 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
             oldPaperArchives.setManagerId(paperArchives.getManagerId());
             oldPaperArchives.setManagerOrgId(paperArchives.getManagerOrgId());
             oldPaperArchives.setWarningTime(paperArchives.getWarningTime());
-            paperArchives.setUpdateId(sysUser.getId());
+            paperArchives.setUpdateId(userId);
             paperArchives.setUpdateTime(System.currentTimeMillis());
             return this.updateById(paperArchives);
         }

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

@@ -9,7 +9,6 @@ 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 com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
@@ -33,7 +32,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
 
     @Override
     public boolean saveData(PaperArchivesType paperArchivesType) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long userId = Long.valueOf(ServletUtil.getRequestHeaderUserId().toString());
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
         PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(schoolId, paperArchivesType.getName());
@@ -45,7 +44,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
             }
             paperArchivesType.setId(SystemConstant.getDbUuid());
             paperArchivesType.setSchoolId(schoolId);
-            paperArchivesType.setCreateId(sysUser.getId());
+            paperArchivesType.setCreateId(userId);
             paperArchivesType.setCreateTime(System.currentTimeMillis());
             return this.save(paperArchivesType);
         }
@@ -57,7 +56,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
                 throw ExceptionResultEnum.ERROR.exception("类型名称已存在");
             }
             archivesType.setName(paperArchivesType.getName());
-            archivesType.setUpdateId(sysUser.getId());
+            archivesType.setUpdateId(userId);
             archivesType.setUpdateTime(System.currentTimeMillis());
             return this.updateById(archivesType);
         }

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

@@ -362,11 +362,13 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
         // 根目录
         List<JSONObject> objects = new ArrayList<>();
         try {
+            int idx = 1;
+            String uuid = SystemConstant.getUuid();
             for (MultipartFile file : files) {
                 JSONObject jsonObject = new JSONObject();
                 String fileName = file.getOriginalFilename();
                 String suffix = fileName.substring(fileName.lastIndexOf("."));
-                String newFileName = rootPath + File.separator + SystemConstant.getUuid() + suffix;
+                String newFileName = rootPath + File.separator + uuid + "-" + idx + suffix;
 
                 // 文件路径
                 String dirName = newFileName.replaceAll("\\\\", "/");
@@ -384,6 +386,7 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
                 }
                 jsonObject.put(SystemConstant.UPLOAD_TYPE, uploadFileEnum);
                 objects.add(jsonObject);
+                idx++;
             }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
@@ -397,13 +400,13 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
     }
 
     @Override
-    public String preViewPath(String path, String uploadType, Boolean isExpire) {
+    public String preViewPath(String path, String uploadType, String type, Boolean isExpire) {
         if (StringUtils.isBlank(path)) {
             return null;
         }
         String pathUrl;
         // 本地文件
-        if (Objects.equals(uploadType, SystemConstant.LOCAL)) {
+        if (Objects.equals(type, SystemConstant.LOCAL)) {
             String hostUrl = SystemConstant.getLocalFileHost(dictionaryConfig.fssLocalFileDomain().getServer());
             path = SystemConstant.getLocalFilePath(hostUrl, path);
             if (path.startsWith("/")) {
@@ -413,9 +416,9 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
             }
         } else {
             if (isExpire) {
-                pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
+                pathUrl = fileStoreUtil.getPrivateUrl(path, UploadFileEnum.valueOf(uploadType).getFssType());
             } else {
-                pathUrl = fileStoreUtil.getPrivateUrl(path, fileStoreUtil.getUploadEnumByPath(path).getFssType());
+                pathUrl = fileStoreUtil.getPrivateUrl(path, UploadFileEnum.valueOf(uploadType).getFssType());
             }
 
         }

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

@@ -18,7 +18,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.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.lock.LockService;
 import com.qmth.paper.library.common.lock.LockType;
@@ -112,7 +111,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
             }
             List<JSONObject> objectList = JSON.parseArray(fileUrl, JSONObject.class);
             for (JSONObject jsonObject : objectList) {
-                fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), false));
+                fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), jsonObject.getString(SystemConstant.TYPE), false));
             }
         }
         return fileUrls;
@@ -120,13 +119,13 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
 
     @Override
     public List<PaperLibraryResult> toBindPaper() {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long userId = Long.valueOf(ServletUtil.getRequestHeaderUserId().toString());
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
 
         // 查询下一个待绑定任务
-        List<PaperLibrary> waitPaperLibraryList = this.baseMapper.selectBatchData(schoolId, sysUser.getId());
+        List<PaperLibrary> waitPaperLibraryList = this.baseMapper.selectBatchData(schoolId, userId);
         if (waitPaperLibraryList.isEmpty()) {
-            waitPaperLibraryList = createBindData(sysUser.getId(), schoolId);
+            waitPaperLibraryList = createBindData(userId, schoolId);
         }
 
         List<PaperLibraryResult> paperLibraryResultList = new ArrayList<>();
@@ -141,7 +140,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
                 List<JSONObject> objectList = JSON.parseArray(fileUrl, JSONObject.class);
                 List<String> fileUrls = new ArrayList<>();
                 for (JSONObject jsonObject : objectList) {
-                    fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), false));
+                    fileUrls.add(paperLibraryCommonService.preViewPath(jsonObject.getString(SystemConstant.PATH), jsonObject.getString(SystemConstant.UPLOAD_TYPE), jsonObject.getString(SystemConstant.TYPE), false));
                 }
                 PaperScanTaskResult paperScanTaskResult = paperScanTaskService.getByPaperScanTaskId(paperLibrary.getPaperScanTaskId());
                 if (paperScanTaskResult != null) {
@@ -177,6 +176,12 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return this.count(queryWrapper);
     }
 
+    @Override
+    public IPage<TaskStudentResult> pageStudent(Long paperScanTaskId, String param, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return this.baseMapper.pageStudent(new Page<>(pageNumber, pageSize), schoolId, paperScanTaskId, param);
+    }
+
     private List<PaperLibrary> createBindData(Long userId, Long schoolId) {
         try {
             lockService.waitlock(LockType.BIND_PAPER_TASK, schoolId);

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

@@ -5,11 +5,6 @@
     <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.PaperLibrary">
         <result column="id" property="id"/>
         <result column="school_id" property="schoolId"/>
-        <result column="org_id" property="orgId"/>
-        <result column="name" property="name"/>
-        <result column="type" property="type"/>
-        <result column="size" property="size"/>
-        <result column="md5" property="md5"/>
         <result column="path" property="path"/>
         <result column="paper_scan_task_id" property="paperScanTaskId"/>
         <result column="paper_scan_task_detail_id" property="paperScanTaskDetailId"/>
@@ -22,7 +17,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        select id, school_id, org_id, `name`,`type`, `size`, `md5`, `path`, paper_scan_task_id,paper_scan_task_detail_id, sequence,create_id, create_time, update_id, update_time from paper_library
+        select id, school_id, `path`, paper_scan_task_id, paper_scan_task_detail_id, sequence,create_id, create_time, update_id, update_time from paper_library
     </sql>
 
     <select id="pageUnbindData" resultMap="BaseResultMap">
@@ -140,7 +135,30 @@
                 and pa.school_id = #{schoolId}
             </if>
             <if test="studentCode != null and studentCode != ''">
-                and bs.studentCode like  concat(#{studentCode}, '%')
+                and bs.student_code like  concat(#{studentCode}, '%')
+            </if>
+        </where>
+    </select>
+    <select id="pageStudent" resultType="com.qmth.paper.library.business.bean.result.TaskStudentResult">
+        SELECT
+            pstd.id paperScanTaskDetailId,
+            bs.student_name studentName,
+            bs.student_code studentCode,
+            bs.major_name majorName,
+            bs.clazz_name clazzName
+        FROM
+            paper_scan_task_detail pstd
+        LEFT JOIN
+            basic_student bs ON pstd.student_id = bs.id
+        <where>
+            <if test="schoolId != null">
+                and pstd.school_id = #{schoolId}
+            </if>
+            <if test="paperScanTaskId != null">
+                and pstd.paper_scan_task_id = #{paperScanTaskId}
+            </if>
+            <if test="param != null and param != ''">
+                and (bs.student_name like  concat(#{param}, '%') or bs.student_code like  concat(#{param}, '%'))
             </if>
         </where>
     </select>

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

@@ -88,6 +88,16 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.toBindPaper());
     }
 
+    @ApiOperation(value = "根据扫描任务ID查询学生")
+    @PostMapping("/page_student")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result pageStudent(@ApiParam(value = "扫描任务ID") @RequestParam Long paperScanTaskId,
+                              @ApiParam(value = "模糊查询（学号/姓名）") @RequestParam(required = false) String param,
+                              @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(paperLibraryService.pageStudent(paperScanTaskId, param, pageNumber, pageSize));
+    }
+
     @ApiOperation(value = "根据学号查询所有任务下考生信息")
     @PostMapping("/list_by_student_code")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})

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

@@ -14,12 +14,12 @@ db.host=localhost
 db.port=3306
 db.name=paper-library-v1.0.0
 db.username=root
-db.password=123456789
+db.password=root
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=2
+com.qmth.redis.db=3
 #com.qmth.redis.password=
 
 #mysql\u914D\u7F6E

sql/paper-library-1.0.0.sql

@@ -380,7 +380,7 @@ INSERT INTO `sys_privilege` VALUES (18, '删除接口', '/api/admin/paper/archiv
 INSERT INTO `sys_privilege` VALUES (19, '数据检查', 'library', 'MENU', 1, 4, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (20, '数据检查', 'LibraryManage', 'MENU', 19, 1, NULL, NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (21, '列表', 'List', 'LIST', 20, 1, 'AUTH', '23,24,25,26,29', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (22, '开始处理', 'Deal', 'BUTTON', 20, 2, 'AUTH', '27,28', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (22, '开始处理', 'Deal', 'BUTTON', 20, 2, 'AUTH', '27,28,34', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (23, '未处理接口', '/api/admin/paper/library/page_unbind', 'URL', 20, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (24, '未处理数量接口', '/api/admin/paper/library/count_unbind', 'URL', 20, 2, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (25, '已处理接口', '/api/admin/paper/library/page_bind', 'URL', 20, 3, 'AUTH', NULL, 1, 1, 1);
@@ -392,6 +392,7 @@ INSERT INTO `sys_privilege` VALUES (30, '查询条件', 'Condition', 'CONDITION'
 INSERT INTO `sys_privilege` VALUES (31, '查询条件', 'Condition', 'CONDITION', 20, 3, 'AUTH', '23,24,25,26', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (32, '查询', 'Select', 'BUTTON', 9, 1, 'AUTH', '15', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (33, '查询', 'Select', 'BUTTON', 20, 1, 'AUTH', '23,24,25,26', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (34, '根据扫描任务ID查询学生', '/api/admin/paper/library/page_student', 'URL', 20, 7, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (50, '查询条件-学期', '/api/admin/common/semester/query', 'URL', 149, 8, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (51, '查询条件-档案', '/api/admin/common/archives/query', 'URL', 149, 8, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (52, '查询条件-档案管理部门', '/api/admin/common/manager_org/query', 'URL', 149, 10, 'SYS', NULL, 1, 1, 1);
@@ -829,8 +830,8 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, NULL, 'sysadmin', 'sysadmin', NULL, 'MTIzNDU2', NULL, NULL, 1, 1, 1629353956868, NULL, NULL, NULL, NULL, 1629353956881, NULL);
-INSERT INTO `sys_user` VALUES (299492059637612544, 295137670185615360, 'admin', '学校管理员', '111111', 'MTIzNDU2', '19999999999', 295137670219169792, 1, 1, 1662345495740, NULL, 1, 1662345271337, NULL, 1662431297425, NULL);
+INSERT INTO `sys_user` VALUES (1, NULL, 'sysadmin', 'sysadmin', NULL, 'MTIzNDU2', NULL, NULL, 1, 1, 1629353956868, NULL, NULL, NULL, NULL, 1629353956881, NULL, NULL);
+INSERT INTO `sys_user` VALUES (299492059637612544, 295137670185615360, 'admin', '学校管理员', '111111', 'MTIzNDU2', '19999999999', 295137670219169792, 1, 1, 1662345495740, NULL, 1, 1662345271337, NULL, 1662431297425, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for sys_user_role