From f71bf1fd7462259b3c392b92446bd963a42c12bd Mon Sep 17 00:00:00 2001 From: Vinjor Date: Sat, 12 Oct 2024 11:52:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=80=E8=AF=B7=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/app/wechat/service/impl/WechatServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/wechat/service/impl/WechatServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/wechat/service/impl/WechatServiceImpl.java index 5c52f685..067f087f 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/wechat/service/impl/WechatServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/wechat/service/impl/WechatServiceImpl.java @@ -159,6 +159,9 @@ public class WechatServiceImpl implements WechatService { wxUser.setUsername(user.getUsername()); wxUser.setNickname(user.getNickname()); } + if(!StringUtils.isEmpty(inviteId)){ + //那邀请者的码查邀请者的信息 + } return wxUser; } } From b8fa5ad88c472ff8a7bf2ddccc37f0c28e604f37 Mon Sep 17 00:00:00 2001 From: lzttt <1803073139@qq.com> Date: Sat, 12 Oct 2024 12:41:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/knowledge/constants/Result.java | 3 + dl-module-repair/pom.xml | 29 +++++- .../admin/DlRepairTicketsController.java | 47 +++++++++ .../tickets/tools/TOperaDocRequestUtil.java | 96 ++++++++++++++++++ .../src/main/resources/templates/gdmb.docx | Bin 0 -> 14825 bytes .../yudao-module-infra-biz/pom.xml | 6 ++ .../infra/service/file/FileService.java | 16 +++ .../infra/service/file/FileServiceImpl.java | 47 +++++++++ 8 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/TOperaDocRequestUtil.java create mode 100644 dl-module-repair/src/main/resources/templates/gdmb.docx diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java index c14bc477..89636c7b 100644 --- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java +++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/constants/Result.java @@ -15,6 +15,9 @@ public class Result implements Serializable { public Result() { } + public Result(Object o, String 文件不能为空) { + } + public Integer getCode() { return this.code; } diff --git a/dl-module-repair/pom.xml b/dl-module-repair/pom.xml index d474358e..a6ee9701 100644 --- a/dl-module-repair/pom.xml +++ b/dl-module-repair/pom.xml @@ -26,10 +26,37 @@ yudao-module-system-biz ${revision} + + com.deepoove + poi-tl + 1.12.2 + + + io.minio + minio + 8.4.0 + + + cn.iocoder.boot + dl-module-knowledge + 2.1.0-jdk8-snapshot + compile + + + cn.iocoder.boot + yudao-module-infra-biz + 2.1.0-jdk8-snapshot + compile + + + org.springframework + spring-test + + 8 8 - \ No newline at end of file + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java index cf88bd70..c3fae8bf 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java @@ -1,18 +1,34 @@ package cn.iocoder.yudao.module.tickets.controller.admin; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Assert; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; +import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClient; +import cn.iocoder.yudao.module.infra.service.file.FileConfigService; +import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.iocoder.yudao.module.knowledge.constants.Result; +import cn.iocoder.yudao.module.knowledge.controller.requestdto.TOperationDocRequest; import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets; import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService; +import cn.iocoder.yudao.module.tickets.tools.TOperaDocRequestUtil; import cn.iocoder.yudao.module.tickets.vo.CustomerAndCarVO; import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO; import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.tencentcloudapi.ess.v20201111.models.FileInfo; import io.swagger.v3.oas.annotations.Operation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; /** @@ -28,6 +44,15 @@ public class DlRepairTicketsController { */ @Resource private DlRepairTicketsService dlRepairTicketsService; + @Autowired + private TOperaDocRequestUtil tOperaDocRequestUtil; + @Autowired + private FileService fileService; + @Resource + private FileConfigService fileConfigService; + + + /** * 维修工单表 新增 @@ -102,6 +127,28 @@ public class DlRepairTicketsController { return CommonResult.ok(); } + /** + * 维修工单表 导出 + * + * @author lzt + * @date 2024年10月11日 + * @param file 导出文件 + */ + @PostMapping("/print") + @Operation(summary = "维修工单表 导出") + public ResponseEntity> printDocument(@RequestParam("file") MultipartFile file) { + if (file.isEmpty()) { + return ResponseEntity.badRequest().body(new Result<>(null, "文件不能为空")); + } + + try { + FileDO fileInfo = fileService.createFileDetail(file.getOriginalFilename(), "/ticket", IoUtil.readBytes(file.getInputStream())); + return ResponseEntity.ok(new Result<>(fileInfo, "文件上传成功")); + } catch (Exception e) { + return ResponseEntity.status(500).body(new Result<>(null, "文件上传失败: " + e.getMessage())); + } + } + /** * 客户信息和车辆信息 新增、修改 * diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/TOperaDocRequestUtil.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/TOperaDocRequestUtil.java new file mode 100644 index 00000000..cd7581c6 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/TOperaDocRequestUtil.java @@ -0,0 +1,96 @@ +package cn.iocoder.yudao.module.tickets.tools; + +import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.iocoder.yudao.module.knowledge.constants.Result; +import cn.iocoder.yudao.module.tickets.controller.admin.DlRepairTicketsController; +import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy; +import com.tencentcloudapi.ess.v20201111.models.FileInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.HashMap; + +import static com.fhs.core.trans.util.ConvertUtil.convert; + + +/** + * 工单导出工具类 + * @author lzt + * @date 9:27 2024年10月11日 + */ +@Component(value = "TOperaDocRequestUtil" ) +public class TOperaDocRequestUtil { + + @Resource + private FileService fileService; + @Value("${minio.bucketName:dev}") + private String bucketName; + + public TOperaDocRequestUtil() throws FileNotFoundException { + } + + + private static String TEMPLATE_PATH = "/templates/gdmb.docx"; + + @Autowired + private DlRepairTicketsController dlRepairTicketsController; + + public FileInfo export(DlRepairTicketsReqVO request) throws IOException { + String fileStr = TEMPLATE_PATH; + + if (fileStr != null) { + byte[] inputStream = fileService.downloadFile(bucketName, fileStr); + + // 数据循环填充 + LoopRowTableRenderPolicy loopRowTableRenderPolicy = new LoopRowTableRenderPolicy(); + Configure configure = Configure.builder().bind("czTable", loopRowTableRenderPolicy).build(); + + // word导出到本地 + MultipartFile convert = null; + if (fileStr.contains("gdmb.docx")) { + // 操作模板文件-数据填充 + XWPFTemplate template = XWPFTemplate.compile(String.valueOf(inputStream), configure).render( + new HashMap() {{ + // 填充数据 TODO + //put("requestData", request); + + }} + ); + ByteArrayOutputStream outputStreamWord = new ByteArrayOutputStream();; + template.writeAndClose(outputStreamWord); + //IConverter converter = LocalConverter.builder().build(); + byte[] bytes = outputStreamWord.toByteArray(); + ByteArrayInputStream inputStreamWord = new ByteArrayInputStream(bytes); + + ByteArrayOutputStream outputStreamPdf = new ByteArrayOutputStream(); + + //converter.convert(inputStreamWord).as(DocumentType.DOCX).to(outputStreamPdf).as(DocumentType.PDF).execute(); + byte[] bytesPdf = outputStreamPdf.toByteArray(); + ByteArrayInputStream inputStreamPdf = new ByteArrayInputStream(bytesPdf); + + // convert = new MultipartFile(fileStr.replace(".docx", ".pdf"), "application/pdf", inputStreamPdf.readAllBytes()); + convert = new MockMultipartFile("gdmb.pdf", bytes); + } + ResponseEntity> responseEntity = dlRepairTicketsController.printDocument(convert); + +// 获取 Result 对象 + Result fileupload = responseEntity.getBody(); + if (fileupload != null) { + return fileupload.getData(); + } + } + return null; + } +} diff --git a/dl-module-repair/src/main/resources/templates/gdmb.docx b/dl-module-repair/src/main/resources/templates/gdmb.docx new file mode 100644 index 0000000000000000000000000000000000000000..6d061efae58adb65ca9daace959f7ea8bddae9e9 GIT binary patch literal 14825 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 literal 0 HcmV?d00001 diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml index a12f078a..ada189a0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml @@ -124,6 +124,12 @@ org.apache.tika tika-core + + com.aliyun.oss + aliyun-sdk-oss + 3.11.2 + compile + diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java index cf40e74e..98bcaaa0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java @@ -5,6 +5,10 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileCreateReq import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; +import org.apache.tomcat.jni.FileInfo; +import org.springframework.web.multipart.MultipartFile; + +import javax.xml.ws.Response; /** * 文件 Service 接口 @@ -63,4 +67,16 @@ public interface FileService { */ FilePresignedUrlRespVO getFilePresignedUrl(String path) throws Exception; + /** + * 下载文件 + * + * @author lzt + * @date 2024年10月11日 + * @param bucketName 存储桶名称 + * @param fileName 文件名称 + * @return 文件下载响应 + */ + byte[] downloadFile(String bucketName, String fileName); + +// FileInfo uploadFile(MultipartFile file); } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java index 85aa8121..f23a7063 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java @@ -13,10 +13,18 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper; +import com.aliyun.oss.OSS; +import com.aliyun.oss.model.PutObjectRequest; import lombok.SneakyThrows; +import org.apache.tomcat.jni.FileInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.xml.ws.Response; + +import java.io.IOException; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; @@ -145,4 +153,43 @@ public class FileServiceImpl implements FileService { object -> object.setConfigId(fileClient.getId())); } + @Override + @SneakyThrows + public byte[] downloadFile(String bucketName, String fileStr) { + // 获取文件存储客户端 + FileClient client = fileConfigService.getFileClient(Long.valueOf(bucketName)); + Assert.notNull(client, "客户端({}) 不能为空", bucketName); + + // 获取文件内容 + return client.getContent(fileStr); + } + +// @Override +// public FileInfo uploadFile(MultipartFile file) { +// String bucketName = "xxxxx"; // 存储桶名称 +// String fileName = file.getOriginalFilename(); +// +// try { +// // 上传文件到 OSS +// PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, fileName, file.getInputStream()); +// ossClient.putObject(putObjectRequest); +// +// // 创建并返回 FileInfo 对象 +// FileInfo fileInfo = new FileInfo(); +// fileInfo.setFileName(fileName); +// fileInfo.setBucketName(bucketName); +// return fileInfo; +// +// } catch (IOException e) { +// e.printStackTrace(); +// throw new RuntimeException("文件上传到 OSS 失败: " + e.getMessage()); +// } finally { +// // 关闭 OSS 客户端 +// ossClient.shutdown(); +// } +// } + + + + }