3.2.0-bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientServiceImpl.java

@@ -633,8 +633,8 @@ public class ClientServiceImpl implements ClientService {
         for (Map path : pathList) {
             String printType = path.get("printType").toString();
             if (printType.equals(contentMap.get("type").toString())) {
-                vMap.put("htmlUrl", teachcloudCommonService.filePreviewByPathAndType(path.get("htmlPath").toString(), path.get("type").toString(), false));
-                vMap.put("htmlMd5", path.get("htmlMd5"));
+//                vMap.put("htmlUrl", teachcloudCommonService.filePreviewByPathAndType(path.get("htmlPath").toString(), path.get("type").toString(), false));
+//                vMap.put("htmlMd5", path.get("htmlMd5"));
                 vMap.put("pdfUrl", teachcloudCommonService.filePreviewByPathAndType(path.get("pdfPath").toString(), path.get("type").toString(), false));
                 vMap.put("pdfMd5", path.get("pdfMd5"));
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1039,8 +1039,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Override
     public IPage<ClientExamTaskDto> listTryTask(Long schoolId, String machineCode, Long orgId, Long
-            printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer
-                                                        pageSize) {
+            printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize) {
         Page<ClientExamTaskDto> page = new Page<>(pageNumber, pageSize);
         // 印刷任务状态为印刷中（PRINTING）,考场状态为待打印（WAITING）
         String[] examDetailStatus = {ExamDetailStatusEnum.NEW.name(), ExamDetailStatusEnum.READY.name()};
@@ -1051,9 +1050,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     public List<ClientExamTaskDto> listTryTask(Long schoolId, String machineCode, Long orgId, Long
             printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
         // 印刷任务状态为印刷中（PRINTING）,考场状态为待打印（WAITING）
-        String[] examDetailstatus = {ExamDetailStatusEnum.NEW.name(), ExamDetailStatusEnum.READY.name()};
-        List<ClientExamTaskDto> examTaskDtoIPage = this.baseMapper.listClientExamTaskPage(schoolId, machineCode, printPlanId, courseCode, paperNumber, isTry, isPass, orgId, PrintPlanStatusEnum.PRINTING.name(), examDetailstatus);
-        return examTaskDtoIPage;
+        String[] examDetailStatus = {ExamDetailStatusEnum.NEW.name(), ExamDetailStatusEnum.READY.name()};
+        return this.baseMapper.listClientExamTaskPage(schoolId, machineCode, printPlanId, courseCode, paperNumber, isTry, isPass, orgId, PrintPlanStatusEnum.PRINTING.name(), examDetailStatus);
     }
 
     @Transactional

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -195,7 +195,7 @@ public class PdfUtil {
         sysConfig = Objects.isNull(sysConfig) ? commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST) : sysConfig;
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
 
-        String pdfSize = sysConfig.getConfigValue().replace("8K", "A6");
+        String pdfSize = sysConfig.getConfigValue().replace("8K", "K8");
         List<String> pdfSizeList = Objects.nonNull(sysConfig) ? Arrays.asList(pdfSize.replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null;
 
         PageSizeEnum finalPageSizeEnum = pageSizeEnum;

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -698,7 +698,7 @@
                 and IFNULL(e.is_pass, FALSE) = #{isPass}
             </if>
             <if test="orgId != null">
-                AND b.print_house_id = #{orgId}
+                AND (b.print_house_id = #{orgId} or b.print_house_id is null)
             </if>
         </where>
     </select>

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
@@ -57,7 +58,7 @@ public class ClientController {
      * @param login 登录参数
      */
     @ApiOperation(value = "登录")
-    @RequestMapping(value = "/user/login", method = RequestMethod.POST)
+    @PostMapping("/user/login")
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = LoginResult.class)})
     @Aac(auth = BOOL.FALSE)
     public Result login(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody ClientLoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
@@ -97,7 +98,7 @@ public class ClientController {
      * @param pageSize    分页参数
      */
     @ApiOperation(value = "试卷打样-列表")
-    @RequestMapping(value = "/paper_try/list", method = RequestMethod.POST)
+    @PostMapping("/paper_try/list")
     public Result paperTryList(@RequestParam("machineCode") String machineCode,
                                @RequestParam("orgId") Long orgId,
                                @RequestParam(value = "printPlanId", required = false) Long printPlanId,
@@ -117,7 +118,7 @@ public class ClientController {
      * @param examTaskId 命题任务ID
      */
     @ApiOperation(value = "试卷打样-查看/试印/重印")
-    @RequestMapping(value = "/paper_try/print", method = RequestMethod.POST)
+    @PostMapping("/paper_try/print")
     public Result paperTryPrint(@RequestParam("printPlanId") Long printPlanId,
                                 @RequestParam("examTaskId") Long examTaskId) {
         List<Map<String, String>> list = clientService.getPaperUrl(printPlanId, examTaskId);
@@ -136,7 +137,7 @@ public class ClientController {
      * @param isPass      是否通过
      */
     @ApiOperation(value = "试卷打样-批量试印")
-    @RequestMapping(value = "/paper_try/print_batch", method = RequestMethod.POST)
+    @PostMapping("/paper_try/print_batch")
     public Result printBatch(@RequestParam("machineCode") String machineCode,
                              @RequestParam("orgId") Long orgId,
                              @RequestParam(value = "printPlanId", required = false) Long printPlanId,
@@ -156,7 +157,7 @@ public class ClientController {
      * @param userId      用户Id
      */
     @ApiOperation(value = "试卷打样-标记合格状态")
-    @RequestMapping(value = "/paper_try/tag_pass", method = RequestMethod.POST)
+    @PostMapping("/paper_try/tag_pass")
     public Result paperTryTagPass(@RequestParam("printPlanId") Long printPlanId,
                                   @RequestParam("courseCode") String courseCode,
                                   @RequestParam("courseName") String courseName,
@@ -187,7 +188,7 @@ public class ClientController {
      * @param pageSize      分页参数
      */
     @ApiOperation(value = "印刷管理-查询列表")
-    @RequestMapping(value = "/print/task_list", method = RequestMethod.POST)
+    @PostMapping("/print/task_list")
     public Result printTaskList(@RequestParam("machineCode") String machineCode,
                                 @RequestParam("orgId") Long orgId,
                                 @RequestParam(value = "printPlanId", required = false) String printPlanId,
@@ -225,7 +226,7 @@ public class ClientController {
      * @param validate      是否核验
      */
     @ApiOperation(value = "印刷管理-导出")
-    @RequestMapping(value = "/print/task_list_export", method = RequestMethod.POST)
+    @PostMapping("/print/task_list_export")
     public void printTaskListExport(HttpServletResponse response,
                                     @RequestParam("machineCode") String machineCode,
                                     @RequestParam("orgId") Long orgId,
@@ -259,7 +260,7 @@ public class ClientController {
      * @param validate      是否校验
      */
     @ApiOperation(value = "印刷管理-汇总数据查询")
-    @RequestMapping(value = "/print/task_total_data", method = RequestMethod.POST)
+    @PostMapping("/print/task_total_data")
     public Result printTaskTotalData(@RequestParam("machineCode") String machineCode,
                                      @RequestParam("orgId") Long orgId,
                                      @RequestParam(value = "printPlanId", required = false) String printPlanId,
@@ -283,7 +284,7 @@ public class ClientController {
      * @param examDetailId 命题任务ID
      */
     @ApiOperation(value = "印刷管理-查看")
-    @RequestMapping(value = "/print/preview", method = RequestMethod.POST)
+    @PostMapping("/print/preview")
     public Result printPreview(@RequestParam("examDetailId") Long examDetailId) {
         Map<String, Object> map = clientService.getUrlByExamDetailId(examDetailId);
         return ResultUtil.ok(map);
@@ -297,7 +298,7 @@ public class ClientController {
      * @param printUser    打印员
      */
     @ApiOperation(value = "印刷管理-印刷/缓存数据")
-    @RequestMapping(value = "/print/get_print_data", method = RequestMethod.POST)
+    @PostMapping("/print/get_print_data")
     public Result printGetPrintData(@RequestParam("examDetailId") Long examDetailId,
                                     @RequestParam("machineCode") String machineCode,
                                     @RequestParam("isPrint") Boolean isPrint,
@@ -313,7 +314,7 @@ public class ClientController {
      * @param machineCode 机器码
      */
     @ApiOperation(value = "印刷管理-批量缓存数据")
-    @RequestMapping(value = "/print/get_print_data_batch", method = RequestMethod.POST)
+    @PostMapping("/print/get_print_data_batch")
     public Result printGetPrintDataBatch(@RequestParam("machineCode") String machineCode,
                                          @RequestParam("orgId") Long orgId,
                                          @RequestParam(value = "printPlanId", required = false) String printPlanId,
@@ -336,7 +337,7 @@ public class ClientController {
      * @param isDownload   是否缓存
      */
     @ApiOperation(value = "印刷管理-缓存后更新状态")
-    @RequestMapping(value = "/print/update_download", method = RequestMethod.POST)
+    @PostMapping("/print/update_download")
     public Result updateDownload(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("machineCode") String machineCode,
                                  @RequestParam("isDownload") Boolean isDownload) {
@@ -352,7 +353,7 @@ public class ClientController {
      * @param lastCode     校验条码号
      */
     @ApiOperation(value = "印刷管理-校验")
-    @RequestMapping(value = "/print/validate_data", method = RequestMethod.POST)
+    @PostMapping("/print/validate_data")
     public Result dataCheck(@RequestParam("examDetailId") Long examDetailId,
                             @RequestParam("packageCode") String packageCode,
                             @RequestParam("lastCode") String lastCode) {
@@ -368,7 +369,7 @@ public class ClientController {
      * @param printProgress 打印进度
      */
     @ApiOperation(value = "印刷管理-更新打印进度")
-    @RequestMapping(value = "/print/update_progress", method = RequestMethod.POST)
+    @PostMapping("/print/update_progress")
     public Result updateProgress(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("machineCode") String machineCode,
                                  @RequestParam("printProgress") Integer printProgress,
@@ -386,7 +387,7 @@ public class ClientController {
      * @param courseCode   课程代码
      */
     @ApiOperation(value = "重打-查询考生列表")
-    @RequestMapping(value = "/print/list_student", method = RequestMethod.POST)
+    @PostMapping("/print/list_student")
     public Result listStudent(@RequestParam("examDetailId") Long examDetailId,
                               @RequestParam(value = "ticketNumber", required = false) String ticketNumber,
                               @RequestParam(value = "studentName", required = false) String studentName,
@@ -405,7 +406,7 @@ public class ClientController {
      * @param type         类型
      */
     @ApiOperation(value = "重打-内容查询")
-    @RequestMapping(value = "/print/get_reprint_data", method = RequestMethod.POST)
+    @PostMapping("/print/get_reprint_data")
     public Result getReprintData(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("ticketNumber") String ticketNumber,
                                  @RequestParam("type") String type) {
@@ -427,7 +428,7 @@ public class ClientController {
      * @param pageSize      分页参数
      */
     @ApiOperation(value = "统计查询-查询列表")
-    @RequestMapping(value = "/print/statistics_list", method = RequestMethod.POST)
+    @PostMapping("/print/statistics_list")
     public Result printStatisticsList(@RequestParam("orgId") Long orgId,
                                       @RequestParam(value = "printPlanId", required = false) String printPlanId,
                                       @RequestParam(value = "examPlace", required = false) String examPlace,
@@ -453,7 +454,7 @@ public class ClientController {
      * @param paperNumber   试卷编号
      */
     @ApiOperation(value = "统计查询-汇总数据查询")
-    @RequestMapping(value = "/print/statistics_total_data", method = RequestMethod.POST)
+    @PostMapping("/print/statistics_total_data")
     public Result printStatisticsTotalData(@RequestParam("orgId") Long orgId,
                                            @RequestParam(value = "printPlanId", required = false) String printPlanId,
                                            @RequestParam(value = "examPlace", required = false) String examPlace,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/PageSizeEnum.java

@@ -14,6 +14,7 @@ public enum PageSizeEnum {
     A1(1684.0F, 2384.0F),
     A2(1191.0F, 1684.0F),
     A3(842.0F, 1191.0F),
+    K8(737.0F, 1043.0F),
     A4(595.0F, 842.0F),
     A5(420.0F, 595.0F),
     A6(297.0F, 420.0F),//8K