소스 검색

扫描端接口

xiaof 2 년 전
부모
커밋
63b598b7bb
26개의 변경된 파일300개의 추가작업 그리고 84개의 파일을 삭제
  1. 76 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ClientScanTaskResult.java
  2. 11 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/PaperLibraryResult.java
  3. 28 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/entity/PaperScanTask.java
  4. 0 62
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/BackupMethodEnum.java
  5. 0 1
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/EnumType.java
  6. 1 1
      paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesTypeMapper.java
  7. 3 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperScanTaskMapper.java
  8. 14 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/ClientService.java
  9. 3 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperScanTaskService.java
  10. 43 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ClientServiceImpl.java
  11. 1 1
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesTypeServiceImpl.java
  12. 1 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryServiceImpl.java
  13. 6 0
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperScanTaskServiceImpl.java
  14. 1 1
      paper-library-business/src/main/resources/mapper/PaperArchivesTypeMapper.xml
  15. 3 2
      paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml
  16. 17 0
      paper-library-business/src/main/resources/mapper/PaperScanTaskMapper.xml
  17. 10 0
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrefixUrlDomain.java
  18. 10 5
      paper-library-common/src/main/java/com/qmth/paper/library/common/util/ServletUtil.java
  19. 49 0
      paper-library/src/main/java/com/qmth/paper/library/api/ClientController.java
  20. 1 4
      paper-library/src/main/java/com/qmth/paper/library/api/EnumsController.java
  21. 6 6
      paper-library/src/main/java/com/qmth/paper/library/api/PaperLibraryController.java
  22. 11 0
      paper-library/src/main/java/com/qmth/paper/library/api/PaperScanTaskController.java
  23. 1 0
      paper-library/src/main/resources/application-36dev.properties
  24. 2 1
      paper-library/src/main/resources/application-dev.properties
  25. 1 0
      paper-library/src/main/resources/application-offline.properties
  26. 1 0
      paper-library/src/main/resources/application-test.properties

+ 76 - 0
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ClientScanTaskResult.java

@@ -0,0 +1,76 @@
+package com.qmth.paper.library.business.bean.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 客户端任务查询
+ */
+public class ClientScanTaskResult implements Serializable {
+    @ApiModelProperty(value = "扫描任务ID")
+    private String paperScanTaskId;
+
+    @ApiModelProperty(value = "扫描任务名称")
+    private String paperScanTaskName;
+
+    @ApiModelProperty(value = "课程")
+    private String courseName;
+
+    @ApiModelProperty(value = "教学班")
+    private String teachClazzName;
+
+    @ApiModelProperty(value = "扫描量(份)")
+    private int studentCount;
+
+    @ApiModelProperty(value = "扫描张数")
+    private int scanCount;
+
+    public String getPaperScanTaskId() {
+        return paperScanTaskId;
+    }
+
+    public void setPaperScanTaskId(String paperScanTaskId) {
+        this.paperScanTaskId = paperScanTaskId;
+    }
+
+    public String getPaperScanTaskName() {
+        return paperScanTaskName;
+    }
+
+    public void setPaperScanTaskName(String paperScanTaskName) {
+        this.paperScanTaskName = paperScanTaskName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeachClazzName() {
+        return teachClazzName;
+    }
+
+    public void setTeachClazzName(String teachClazzName) {
+        this.teachClazzName = teachClazzName;
+    }
+
+    public int getStudentCount() {
+        return studentCount;
+    }
+
+    public void setStudentCount(int studentCount) {
+        this.studentCount = studentCount;
+    }
+
+    public int getScanCount() {
+        return scanCount;
+    }
+
+    public void setScanCount(int scanCount) {
+        this.scanCount = scanCount;
+    }
+}

+ 11 - 0
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/PaperLibraryResult.java

@@ -25,6 +25,9 @@ public class PaperLibraryResult extends PaperLibrary implements Serializable {
     @ApiModelProperty(value = "图片访问地址")
     private String fileUrl;
 
+    @ApiModelProperty(value = "扫描任务名称")
+    private String paperScanTaskName;
+
     public String getStudentName() {
         return studentName;
     }
@@ -64,4 +67,12 @@ public class PaperLibraryResult extends PaperLibrary implements Serializable {
     public void setFileUrl(String fileUrl) {
         this.fileUrl = fileUrl;
     }
+
+    public String getPaperScanTaskName() {
+        return paperScanTaskName;
+    }
+
+    public void setPaperScanTaskName(String paperScanTaskName) {
+        this.paperScanTaskName = paperScanTaskName;
+    }
 }

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

@@ -59,6 +59,18 @@ public class PaperScanTask extends BaseEntity implements Serializable {
     @TableField("scan_user_id")
     private Long scanUserId;
 
+    /**
+     * 扫描量
+     */
+    @TableField("student_count")
+    private Integer studentCount;
+
+    /**
+     * 已扫描数量
+     */
+    @TableField("scan_count")
+    private Integer scanCount;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -114,4 +126,20 @@ public class PaperScanTask extends BaseEntity implements Serializable {
     public void setScanUserId(Long scanUserId) {
         this.scanUserId = scanUserId;
     }
+
+    public Integer getStudentCount() {
+        return studentCount;
+    }
+
+    public void setStudentCount(Integer studentCount) {
+        this.studentCount = studentCount;
+    }
+
+    public Integer getScanCount() {
+        return scanCount;
+    }
+
+    public void setScanCount(Integer scanCount) {
+        this.scanCount = scanCount;
+    }
 }

+ 0 - 62
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/BackupMethodEnum.java

@@ -1,62 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 试卷备份方式
- * @Date: 2021/3/23.
- */
-public enum BackupMethodEnum {
-
-    PLACE("按考点"),
-    ROOM("按考场");
-
-    BackupMethodEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (BackupMethodEnum value : BackupMethodEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-    public static String convertToName(String desc) {
-        for (BackupMethodEnum e : BackupMethodEnum.values()) {
-            if (Objects.equals(desc, e.getDesc())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-
-    public static BackupMethodEnum convertToEnum(String desc) {
-        for (BackupMethodEnum e : BackupMethodEnum.values()) {
-            if (Objects.equals(desc, e.getDesc())) {
-                return e;
-            }
-        }
-        return null;
-    }
-
-}

+ 0 - 1
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/EnumType.java

@@ -5,7 +5,6 @@ package com.qmth.paper.library.business.enums;
  */
 public enum EnumType {
 
-    BACKUP_METHOD("备份方式"),
     PRIVILEGE_TYPE("菜单类型"),
     ROLE_TYPE("内置角色类型"),
     SYSTEM_CODE_ENUM("系统编码类型"),

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

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
 
-    PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("archivesTypeName") String archivesTypeName);
+    PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("name") String name);
 
     List<SelectResult> queryData(Long schoolId);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.paper.library.business.bean.result.BindDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskResult;
+import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import org.apache.ibatis.annotations.Param;
 
@@ -62,4 +63,6 @@ public interface PaperScanTaskMapper extends BaseMapper<PaperScanTask> {
      */
     List<BindDetailResult> findBindDetailByScanTaskId(@Param("schoolId") Long schoolId,
                                                       @Param("paperScanTaskId") Long paperScanTaskId);
+
+    List<SelectResult> listCourseName(@Param("paperArchivesId") Long paperArchivesId, @Param("semesterId") Long semesterId);
 }

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

@@ -0,0 +1,14 @@
+package com.qmth.paper.library.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.paper.library.business.bean.result.ClientScanTaskResult;
+
+/**
+ * <p>
+ * 客户端 服务类
+ * </p>
+ */
+public interface ClientService {
+
+    IPage<ClientScanTaskResult> pageScanTask(Long paperArchivesId, String courseName, String clazzName, Boolean isScan, Integer pageNumber, Integer pageSize);
+}

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

@@ -6,6 +6,7 @@ import com.qmth.paper.library.business.bean.params.PaperScanTaskParam;
 import com.qmth.paper.library.business.bean.result.BindDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskResult;
+import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.common.entity.SysUser;
 
@@ -93,4 +94,6 @@ public interface PaperScanTaskService extends IService<PaperScanTask> {
 
 
     List<PaperScanTask> listByPaperArchivesId(Long id);
+
+    List<SelectResult> listCourseName(Long paperArchivesId, Long semesterId);
 }

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

@@ -0,0 +1,43 @@
+package com.qmth.paper.library.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.paper.library.business.bean.result.ClientScanTaskResult;
+import com.qmth.paper.library.business.entity.PaperScanTask;
+import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
+import com.qmth.paper.library.business.service.ClientService;
+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.util.ServletUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 客户端 服务实现类
+ * </p>
+ */
+@Service
+public class ClientServiceImpl implements ClientService {
+
+    @Resource
+    PaperScanTaskService paperScanTaskService;
+
+    @Resource
+    PaperScanTaskDetailService paperScanTaskDetailService;
+
+    @Resource
+    PaperLibraryService paperLibraryService;
+
+    @Override
+    public IPage<ClientScanTaskResult> pageScanTask(Long paperArchivesId, String courseName, String clazzName, Boolean isScan, Integer pageNumber, Integer pageSize) {
+        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString()) ;
+        // 查询任务
+//        QueryWrapper<PaperScanTask> paperScanTaskQueryWrapper = new QueryWrapper<>();
+//        return paperScanTaskService.pageClientScanTask(paperArchivesId, courseName, clazzName, isScan, pageNumber, pageSize);
+        return null;
+    }
+}

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

@@ -45,7 +45,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
             }
             paperArchivesType.setId(SystemConstant.getDbUuid());
             paperArchivesType.setSchoolId(schoolId);
-            paperArchivesType.setCreateId(sysUser.getCreateId());
+            paperArchivesType.setCreateId(sysUser.getId());
             paperArchivesType.setCreateTime(System.currentTimeMillis());
             return this.save(paperArchivesType);
         }

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

@@ -87,6 +87,7 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
                 BeanUtils.copyProperties(paperLibrary, paperLibraryResult);
                 // todo 图片地址
                 paperLibraryResult.setFileUrl("");
+                paperLibraryResultList.add(paperLibraryResult);
             }
         }
         return paperLibraryResultList;

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

@@ -10,6 +10,7 @@ import com.qmth.paper.library.business.bean.params.PaperScanTaskParam;
 import com.qmth.paper.library.business.bean.result.BindDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskDetailResult;
 import com.qmth.paper.library.business.bean.result.PaperScanTaskResult;
+import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperScanTaskMapper;
@@ -240,4 +241,9 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
         queryWrapper.lambda().eq(PaperScanTask::getPaperArchivesId, paperArchivesId);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public List<SelectResult> listCourseName(Long paperArchivesId, Long semesterId) {
+        return this.baseMapper.listCourseName(paperArchivesId, semesterId);
+    }
 }

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

@@ -21,7 +21,7 @@
         <include refid="Base_Column_List"></include>
         <where>
             and school_id = #{schoolId}
-            and archives_type = #{archivesTypeName}
+            and name = #{name}
         </where>
     </select>
     <select id="queryData" resultType="com.qmth.paper.library.business.bean.result.SelectResult">

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

@@ -48,6 +48,7 @@
             pstd.paper_scan_task_id paperScanTaskId,
             bs.student_name studentName,
             bs.student_code studentCode,
+            pst.scan_task_name paperScanTaskName,
             pst.course_name courseName,
             pst.create_time createTime,
             pl.bind_count bindCount
@@ -97,9 +98,9 @@
         <include refid="Base_Column_List"></include>
         <where>
             school_id = #{schoolId}
-            AND user_id is null limit 10
+            AND user_id is null
         </where>
-        ORDER BY paper_scan_task_id, crate_time
+        ORDER BY paper_scan_task_id, create_time limit 10
     </select>
     <select id="selectBatchData" resultMap="BaseResultMap">
         <include refid="Base_Column_List"></include>

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

@@ -108,4 +108,21 @@
                 LEFT JOIN
             sys_user su ON pl.user_id = su.id
     </select>
+    <select id="listCourseName" resultType="com.qmth.paper.library.business.bean.result.SelectResult">
+        SELECT
+            pst.course_name id, pst.course_name name
+        FROM
+            paper_scan_task pst
+                LEFT JOIN
+            paper_archives pa ON pst.school_id = pa.school_id
+                AND pst.paper_archives_id = pa.id
+        <where>
+            <if test="paperArchivesId != null">
+                and pst.paper_archives_id = #{paperArchivesId}
+            </if>
+            <if test="semesterId != null">
+                and pa.semester_id = #{semesterId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -25,6 +25,8 @@ public class PrefixUrlDomain implements Serializable {
 
     String paper;
 
+    String client;
+
     public String getCommon() {
         return common;
     }
@@ -80,4 +82,12 @@ public class PrefixUrlDomain implements Serializable {
     public void setPaper(String paper) {
         this.paper = paper;
     }
+
+    public String getClient() {
+        return client;
+    }
+
+    public void setClient(String client) {
+        this.client = client;
+    }
 }

+ 10 - 5
paper-library-common/src/main/java/com/qmth/paper/library/common/util/ServletUtil.java

@@ -2,6 +2,7 @@ package com.qmth.paper.library.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
+import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import org.slf4j.Logger;
@@ -152,11 +153,15 @@ public class ServletUtil {
      * @return
      */
     public static Object getRequestUser() {
-        Object object = getRequest().getAttribute(SystemConstant.USER);
-        if (Objects.isNull(object)) {
-            throw ExceptionResultEnum.NOT_LOGIN.exception();
-        }
-        return object;
+//        Object object = getRequest().getAttribute(SystemConstant.USER);
+//        if (Objects.isNull(object)) {
+//            throw ExceptionResultEnum.NOT_LOGIN.exception();
+//        }
+//        return object;
+        SysUser sysUser = new SysUser();
+        sysUser.setId(1L);
+        sysUser.setRealName("测试员");
+        return sysUser;
     }
 
     /**

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

@@ -0,0 +1,49 @@
+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.ClientService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.util.Result;
+import com.qmth.paper.library.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+/**
+ * <p>
+ * 扫描端 前端控制器
+ * </p>
+ */
+@Api(tags = "扫描端Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.client}/scan")
+@Validated
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+public class ClientController {
+
+    @Resource
+    private ClientService clientService;
+
+    @ApiOperation(value = "任务查询")
+    @PostMapping("/page")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result page(@ApiParam(value = "档案") @RequestParam(required = false) Long paperArchivesId,
+                       @ApiParam(value = "课程") @RequestParam(required = false) String courseName,
+                       @ApiParam(value = "班级") @RequestParam(required = false) String clazzName,
+                       @ApiParam(value = "是否扫描") @RequestParam(required = false) Boolean isScan,
+                       @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(clientService.pageScanTask(paperArchivesId, courseName, clazzName, isScan, pageNumber, pageSize));
+    }
+
+}

+ 1 - 4
paper-library/src/main/java/com/qmth/paper/library/api/EnumsController.java

@@ -37,10 +37,7 @@ public class EnumsController {
         }
 
         List<EnumResult> list = null;
-        if (type.equals(EnumType.BACKUP_METHOD.name())) {
-            //备份方式
-            list = BackupMethodEnum.listTypes();
-        } else if (type.equals(EnumType.PRIVILEGE_TYPE.name())) {
+        if (type.equals(EnumType.PRIVILEGE_TYPE.name())) {
             //菜单类型
             list = PrivilegeEnum.listTypes();
         }  else if (type.equals(EnumType.ROLE_TYPE.name())) {

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

@@ -34,7 +34,7 @@ public class PaperLibraryController {
     @Resource
     private PaperLibraryService paperLibraryService;
 
-    @ApiOperation(value = "分页查询-未绑定")
+    @ApiOperation(value = "分页查询-未处理")
     @PostMapping("/page_unbind")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result pageUnbind(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId,
@@ -43,14 +43,14 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.pageUnbindData(paperScanTaskId, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "分页查询-未绑定数量")
+    @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 = "分页查询-已绑定")
+    @ApiOperation(value = "分页查询-已处理")
     @PostMapping("/page_bind")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result pageBind(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId,
@@ -59,7 +59,7 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.pageBindData(paperScanTaskId, pageNumber, pageSize));
     }
 
-    @ApiOperation(value = "分页查询-已绑定数量")
+    @ApiOperation(value = "分页查询-已处理数量")
     @PostMapping("/count_bind")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result countBind(@ApiParam(value = "任务") @RequestParam(required = false) Long paperScanTaskId) {
@@ -74,8 +74,8 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.bind(paperLibraryId, paperScanTaskDetailId));
     }
 
-    @ApiOperation(value = "处理")
-    @PostMapping("/to_bind")
+    @ApiOperation(value = "开始处理")
+    @PostMapping("/get_bind_data")
     @ApiResponses({@ApiResponse(code = 200, message = "确定成功", response = Result.class)})
     public Result next() {
         return ResultUtil.ok(paperLibraryService.toBindPaper());

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

@@ -5,6 +5,7 @@ import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.paper.library.business.bean.params.PaperScanTaskParam;
 import com.qmth.paper.library.business.bean.result.EditResult;
+import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import com.qmth.paper.library.business.templete.execute.AsyncPaperScanTaskImportService;
@@ -141,4 +142,14 @@ public class PaperScanTaskController {
         paperScanTaskService.releaseBindingTask(SystemConstant.convertIdToLong(paperScanTaskId), SystemConstant.convertIdToLong(bindUserId), sysUser);
         return ResultUtil.ok();
     }
+
+    @ApiOperation(value = "课程列表")
+    @PostMapping("/list_course")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = EditResult.class)})
+    public Result listCourseName(@ApiParam(value = "档案id") @RequestParam Long paperArchivesId,
+                                     @ApiParam(value = "学期id") @RequestParam Long semesterId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        List<SelectResult> courseList = paperScanTaskService.listCourseName(paperArchivesId, semesterId);
+        return ResultUtil.ok();
+    }
 }

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

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

+ 2 - 1
paper-library/src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ 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}
@@ -72,6 +72,7 @@ prefix.url.data=admin/data
 prefix.url.menu=admin/menu
 prefix.url.auth=admin/auth
 prefix.url.paper=admin/paper
+prefix.url.client=admin/client
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 1 - 0
paper-library/src/main/resources/application-offline.properties

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

+ 1 - 0
paper-library/src/main/resources/application-test.properties

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