Browse Source

印刷任务管理优化和合并pdf修改

wangliang 2 years ago
parent
commit
97aefcafa9

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

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

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/MenuCustomController.java

@@ -67,7 +67,7 @@ public class MenuCustomController {
     public Result customList() {
         List<PrivilegeDto> customPrivilegeList = sysPrivilegeService.addCustomList();
 //        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
-//        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("未配置全局pdf格式清单"));
+//        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
 //        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "))));
         return ResultUtil.ok(customPrivilegeList);
     }