diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java index 4ce935b..765c4bc 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/archives/ArchivesQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.edu.command.query.archives; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.exception.BizException; import com.alibaba.cola.statemachine.impl.SysOutVisitor; @@ -41,6 +42,7 @@ import com.zcloud.edu.persistence.repository.study.*; import com.zcloud.gbscommon.utils.*; import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.coobird.thumbnailator.Thumbnails; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.output.ByteArrayOutputStream; @@ -71,6 +73,7 @@ import java.util.stream.Collectors; */ @Component @AllArgsConstructor +@Slf4j public class ArchivesQueryExe { private final ArchivesPdfFileRepository archivesPdfFileRepository; private final ArchivesPdfFileCoConvertor archivesPdfFileCoConvertor; @@ -320,6 +323,7 @@ public class ArchivesQueryExe { public void execteGeneratePdfList(ArchivesQry qry, List personArchivesDTOList){ String archivesDate = DateUtil.getSdfTimes(); String tempDir = System.getProperty("java.io.tmpdir"); + log.info("execteGeneratePdfList,开始一人一档下载{}", JSONUtil.toJsonStr(personArchivesDTOList)); List stringList = new ArrayList<>(); try { for (PersonArchivesDTO params : personArchivesDTOList){ @@ -350,17 +354,22 @@ public class ArchivesQueryExe { Files.write(Paths.get(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf"), pdf); stringList.add(new File(tempDir+"/"+params.getClassName()+"-一人一档-"+DateUtil.getSdfTimes()+".pdf")); } + log.info("execteGeneratePdfList,开始合并{}", JSONUtil.toJsonStr(personArchivesDTOList)); FileZip.zipList(tempDir+"/"+personArchivesDTOList.get(0).getName()+"-"+ archivesDate+"一人一档.zip", stringList); File file = new File(tempDir+"/"+personArchivesDTOList.get(0).getName()+"-"+ archivesDate+"一人一档.zip"); byte[] bytes = Files.readAllBytes(file.toPath()); + log.info("execteGeneratePdfList,开始保存"); String filepath = zcloudImgFilesFacade.saveFile(bytes, personArchivesDTOList.get(0).getName()+"-"+ archivesDate+"一人一档.zip","personArchives", personArchivesDTOList.get(0).getClassCorpinfoId()); + log.info("execteGeneratePdfList,保存成功,路径:{}", filepath); ArchivesPdfFileE archivesPdfFileE = new ArchivesPdfFileE(); archivesPdfFileE.initEdit(personArchivesDTOList.get(0).getArchivesPdfFileId(), filepath, 1, null); + log.info("execteGeneratePdfList,开始更新状态,{}", JSONUtil.toJsonStr(archivesPdfFileE)); ArchivesPdfFileDO archivesPdfFileDO = new ArchivesPdfFileDO(); BeanUtils.copyProperties(archivesPdfFileE, archivesPdfFileDO); archivesPdfFileRepository.updateById(archivesPdfFileDO); } catch (Exception e) { e.printStackTrace(); + log.error("execteGeneratePdfList,失败", e); // throw new BizException("导出失败"); } } diff --git a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java index a6d6acd..27f17f8 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/archives/ArchivesServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.edu.service.archives; +import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.edu.api.archives.ArchivesReviewServiceI; @@ -21,6 +22,7 @@ import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.WordToPdfUtil; import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.http.MediaType; @@ -40,6 +42,7 @@ import java.util.List; */ @Service @AllArgsConstructor +@Slf4j public class ArchivesServiceImpl implements ArchivesServiceI { @DubboReference private ZcloudImgFilesFacade zcloudImgFilesFacade; @@ -58,6 +61,7 @@ public class ArchivesServiceImpl implements ArchivesServiceI { @Override public void downloadPersonArchivesList(ArchivesQry qry) { List personArchivesDTOList = archivesQueryExe.downloadPersonArchivesList(qry); + log.info("downloadPersonArchivesList,开始一人一档异步下载{}", JSONUtil.toJsonStr(personArchivesDTOList)); archivesQueryExe.execteGeneratePdfList(qry,personArchivesDTOList); }