bug修改

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

@@ -37,7 +37,7 @@ public interface ClientService {
 
     Boolean validateData(Long schoolId, Long examDetailId, String packageCode, String lastCode);
 
-    List<String> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
+    List<Map<String, String>> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
 
     List<ClientPrintTaskDto> listClientPrintTask(HttpServletResponse response, Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate);
 }

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

@@ -319,6 +319,7 @@ public class ClientServiceImpl implements ClientService {
         List<Map<String, Object>> finalList = new ArrayList<>();
         for (ClientPrintTaskDto clientPrintTaskDto : pirntTaskDtoList) {
             Map<String, Object> map = getPrintData(schoolId, Long.valueOf(clientPrintTaskDto.getExamDetailId()), null, null);
+            map.put("examDetailId", clientPrintTaskDto.getExamDetailId());
             finalList.add(map);
         }
         return finalList;
@@ -422,12 +423,17 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public List<String> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
+    public List<Map<String, String>> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
         List<ClientExamTaskDto> clientExamTaskDtos = examTaskService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
-        List<String> list = new ArrayList<>();
+        List<Map<String, String>> list = new ArrayList<>();
         for (ClientExamTaskDto clientExamTaskDto : clientExamTaskDtos) {
+            Map<String, String> map = new HashMap<>();
+            map.put("courseCode", clientExamTaskDto.getCourseCode());
+            map.put("courseName", clientExamTaskDto.getCourseName());
+            map.put("paperNumber", clientExamTaskDto.getPaperNumber());
             String url = examTaskDetailService.getUrl(schoolId, Long.valueOf(clientExamTaskDto.getExamTaskId()));
-            list.add(url);
+            map.put("url", url);
+            list.add(map);
         }
         return list;
     }

distributed-print-business/src/main/resources/db/init-table.sql

@@ -408,7 +408,7 @@ CREATE TABLE `exam_task_review_log`  (
   `id` bigint(20) NOT NULL,
   `exam_task_id` bigint(20) NOT NULL COMMENT '命题任务ID',
   `review_status` varchar(8) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'PASS-通过，NOT_PASS-不通过',
-  `reason` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审核意见',
+  `reason` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审核意见',
   `operate_id` bigint(20) NULL DEFAULT NULL,
   `operate_time` bigint(20) NULL DEFAULT NULL,
   `create_id` bigint(20) NULL DEFAULT NULL,

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

@@ -160,7 +160,7 @@ public class ClientController {
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "isTry", required = false) Boolean isTry,
                              @RequestParam(value = "isPass", required = false) Boolean isPass) {
-        List<String> urls = clientService.getBatchUrl(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
+        List<Map<String, String>> urls = clientService.getBatchUrl(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
         return ResultUtil.ok(urls);
     }
 

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

@@ -6,9 +6,7 @@ import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.bean.auth.AuthBean;
-import com.qmth.distributed.print.business.bean.auth.ExpireTimeBean;
 import com.qmth.distributed.print.business.bean.dto.MenuDto;
 import com.qmth.distributed.print.business.bean.params.LoginParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
@@ -19,17 +17,15 @@ import com.qmth.distributed.print.business.enums.DownloadFileEnum;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.business.util.AuthUtil;
 import com.qmth.distributed.print.business.util.RedisUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.business.util.security.Md5Utils;
-import com.qmth.distributed.print.common.SignatureEntityTest;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
-import com.qmth.distributed.print.common.util.SessionUtil;
 import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -293,9 +289,13 @@ public class SysController {
     @ApiOperation(value = "文件预览接口")
     @RequestMapping(value = "/file/preview", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-    public Result filePreview(@ApiParam(value = "附件id", required = true) @RequestParam String id) {
-        BasicAttachment basicAttachment = basicAttachmentService.getById(Long.parseLong(id));
-        return ResultUtil.ok(new EditResult(commonService.filePreview(basicAttachment.getPath())));
+    public Result filePreview(@ApiParam(value = "附件id", required = false, defaultValue = "") @RequestParam(value = "id", required = false, defaultValue = "") String id) {
+        if (StringUtils.isBlank(id)) {
+            throw ExceptionResultEnum.ERROR.exception("没有附件");
+        } else {
+            BasicAttachment basicAttachment = basicAttachmentService.getById(Long.parseLong(id));
+            return ResultUtil.ok(new EditResult(commonService.filePreview(basicAttachment.getPath())));
+        }
     }
 
     @ApiOperation(value = "查询用户权限")