update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -20,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
@@ -68,7 +67,7 @@ public abstract class AsyncExportTaskTemplete {
         InputStream inputStream = null;
         try {
             JSONObject jsonObject = JSONObject.parseObject(tbTask.getResultFilePath());
-            if (Objects.isNull(jsonObject)){
+            if (Objects.isNull(jsonObject)) {
                 throw ExceptionResultEnum.ERROR.exception("未能获取文件路径，文件上传失败");
             }
             String path = (String) jsonObject.get(SystemConstant.PATH);

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

@@ -14,6 +14,7 @@ import com.qmth.distributed.print.business.bean.dto.excel.UserImportDto;
 import com.qmth.distributed.print.business.bean.result.ExaminationResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.DrawRuleEnum;
+import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.*;
@@ -395,7 +396,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         String dirName = stringJoiner.toString().replaceAll("\\\\", "/");
 //        File file = new File(dirName);
 //        ConvertUtil.inputStream2File(in,file);
-        ossUtil.ossUpload(dirName, in, DigestUtils.md5Hex(in));
+        ossUtil.ossUpload(dirName, in, null);
         jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
         jsonObject.put(SystemConstant.PATH, dirName);
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE.getTitle());
@@ -823,6 +824,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         examDetail.setAttachmentId(basicAttachment.getId());
         examDetail.setPagesA3(pageA3Count);
         examDetail.setPagesA4(pageA4Count);
+        examDetail.setStatus(ExamDetailStatusEnum.READY);
         detailService.saveOrUpdate(examDetail);
         ossUtil.ossUpload(dirName, localPdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(localPdfFile)))));
         localPdfFile.delete();

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

@@ -153,11 +153,11 @@ public class AuthUtil {
             return true;
         }
         //系统公用接口不拦截
-//        List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
-//        int sysCount = (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
-//        if (sysCount > 0) {
-//            return true;
-//        }
+        List<String> sysUrls = cacheService.privilegeUrlCache(PrivilegePropertyEnum.SYS);
+        int sysCount = (int) sysUrls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
+        if (sysCount > 0) {
+            return true;
+        }
         Set<String> urls = authBean.getUrls();
         int privilegeCount = (int) urls.stream().filter(s -> s.equalsIgnoreCase(url)).count();
         if (privilegeCount == 0) {

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

@@ -49,14 +49,14 @@ public class OssUtil {
      * @param inputStream
      * @param md5
      */
-    public void ossUpload(String dirName, InputStream inputStream, String md5) {
+    public void ossUpload(String dirName, InputStream inputStream, String md5) throws IOException {
         log.info("ossUpload is come in");
         ObjectMetadata meta = new ObjectMetadata();
         if (Objects.nonNull(md5)) {
             // 设置MD5校验。
             meta.setContentMD5(md5);
         }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream, meta);
         PutObjectResult por = this.ossClient.putObject(putObjectRequest);
         log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
     }

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

@@ -22,6 +22,7 @@ import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTemple
 import com.qmth.distributed.print.business.templete.execute.AsyncUserImportTempleteService;
 import com.qmth.distributed.print.business.templete.execute.UserImportTempleteService;
 import com.qmth.distributed.print.business.util.ExcelUtil;
+import com.qmth.distributed.print.business.util.OssUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
@@ -225,6 +226,9 @@ public class SysUserController {
     @Resource
     AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
 
+    @Resource
+    OssUtil ossUtil;
+
     @ApiOperation(value = "异步创建pdf接口")
     @RequestMapping(value = "/async/create_pdf", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})