dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/UserCarServiceImpl.java

@@ -90,5 +90,6 @@ public class UserCarServiceImpl extends ServiceImpl<UserCarMapper, UserCar> impl
      **/
     @Override
     public void empowerUserInfo(String tenantId) {
+
     }
 }

dl-module-repair/pom.xml

@@ -29,8 +29,30 @@
         <dependency>
             <groupId>com.deepoove</groupId>
             <artifactId>poi-tl</artifactId>
-            <version>1.10.0</version>
+            <version>1.12.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>dl-module-knowledge</artifactId>
+            <version>2.1.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-infra-biz</artifactId>
+            <version>2.1.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+
     </dependencies>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java

@@ -1,24 +1,38 @@
 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 javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 /**
  * 维修工单表(DlRepairTickets)表控制层
- *
  * @author 小李
  * @date 18:21 2024/9/13
 **/
@@ -30,15 +44,22 @@ public class DlRepairTicketsController {
      */
     @Resource
     private DlRepairTicketsService dlRepairTicketsService;
+    @Autowired
+    private TOperaDocRequestUtil tOperaDocRequestUtil;
+    @Autowired
+    private FileService fileService;
+    @Resource
+    private FileConfigService fileConfigService;
+
 
 
 
     /**
      * 维修工单表 新增
      *
-     * @param ticketsRespVO 新增对象
      * @author 小李
      * @date 11:33 2024/9/20
+     * @param ticketsRespVO 新增对象
     **/
     @PostMapping("/create")
     @Operation(summary = "维修工单表 新增")
@@ -50,11 +71,11 @@ public class DlRepairTicketsController {
     /**
      * 维修工单表 分页
      *
+     * @author 小李
+     * @date 20:51 2024/9/20
      * @param repairTicketsReqVO 查询对象
      * @param pageNo 页码
      * @param pageSize 条数
-     * @author 小李
-     * @date 20:51 2024/9/20
     **/
     @GetMapping("/page")
     @Operation(summary = "维修工单表 分页")
@@ -68,9 +89,9 @@ public class DlRepairTicketsController {
     /**
      * 获得一个工单的详细信息
      *
-     * @param id 工单ID
      * @author 小李
      * @date 16:05 2024/9/21
+     * @param id 工单ID
     **/
     @GetMapping("/get")
     @Operation(summary = "查看一个工单的详细信息")
@@ -81,9 +102,9 @@ public class DlRepairTicketsController {
     /**
      * 维修工单表 作废
      *
-     * @param repairTicketsReqVO 工单对象
      * @author 小李
      * @date 19:46 2024/9/22
+     * @param repairTicketsReqVO 工单对象
     **/
     @PostMapping("/void")
     @Operation(summary = "维修工单表 作废")
@@ -95,9 +116,9 @@ public class DlRepairTicketsController {
     /**
      * 维修工单表 结算
      *
-     * @param repairTicketsRespVO 工单
      * @author 小李
      * @date 8:50 2024/9/23
+     * @param repairTicketsRespVO 工单
     **/
     @PostMapping("/paid")
     @Operation(summary = "维修工单表 结算")
@@ -106,48 +127,34 @@ public class DlRepairTicketsController {
         return CommonResult.ok();
     }
 
-//    /**
-//     * 维修工单表 导出
-//     *
-//     * @param file 导出文件
-//     * @author lzt
-//     * @date 2024年10月11日
-//     */
-//    @PostMapping("/print")
-//    @Operation(summary = "维修工单表 导出")
-//    public ResponseEntity<Result<FileInfo>> 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()));
-//        }
-//    }
-
     /**
-     * 维修工单打印
+     * 维修工单表 导出
      *
-     * @param response HttpServletResponse
+     * @author lzt
-     * @param id       维修工单id
+     * @date 2024年10月11日
-     * @author PQZ
+     * @param file 导出文件
-     * @date 13:48 2024/10/12
+     */
-     **/
+    @PostMapping("/print")
-    @GetMapping("/print/{id}")
+    @Operation(summary = "维修工单表 导出")
-    @Operation(summary = "维修工单打印")
+    public ResponseEntity<Result<FileInfo>> printDocument(@RequestParam("file") MultipartFile file) {
-    public void printDocument(HttpServletResponse response, @PathVariable String id) {
+        if (file.isEmpty()) {
-        dlRepairTicketsService.print(response,id);
+            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()));
+        }
     }
 
     /**
      * 客户信息和车辆信息 新增、修改
      *
-     * @param customerAndCarVO 用户信息和车辆信息
      * @author 小李
      * @date 9:25 2024/10/8
+     * @param customerAndCarVO 用户信息和车辆信息
     **/
     @PostMapping("/updateUserAndCar")
     @Operation(summary = "客户信息和车辆信息 新增、修改")

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 针对表【dl_repair_tickets(维修工单表)】的数据库操作Service
  *
@@ -21,64 +19,54 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
     /**
      * 维修工单表 新增
      *
-     * @param ticketsRespVO 新增对象
      * @author 小李
      * @date 11:33 2024/9/20
+     * @param ticketsRespVO 新增对象
      **/
     void createTickets(DlRepairTicketsRespVO ticketsRespVO);
 
     /**
      * 维修工单表 分页
      *
-     * @param repairTicketsReqVO 查询对象
      * @author 小李
      * @date 20:51 2024/9/20
+     * @param repairTicketsReqVO 查询对象
      **/
     IPage<DlRepairTickets> getTicketsPage(DlRepairTicketsReqVO repairTicketsReqVO, Page<DlRepairTickets> page);
 
     /**
      * 获得一个工单的详细信息
      *
-     * @param id 工单ID
      * @author 小李
      * @date 16:05 2024/9/21
+     * @param id 工单ID
      **/
     DlRepairTicketsRespVO getTicketsById(String id);
 
     /**
      * 维修工单表 作废
      *
-     * @param repairTicketsReqVO 工单对象
      * @author 小李
      * @date 19:46 2024/9/22
+     * @param repairTicketsReqVO 工单对象
      **/
     void setTicketsVoid(DlRepairTicketsReqVO repairTicketsReqVO);
 
     /**
      * 维修工单表 结算
      *
-     * @param repairTicketsRespVO 工单
      * @author 小李
      * @date 8:50 2024/9/23
+     * @param repairTicketsRespVO 工单
      **/
     void setTicketsPaid(DlRepairTicketsRespVO repairTicketsRespVO);
 
     /**
      * 客户信息和车辆信息 新增、修改
      *
-     * @param customerAndCarVO 用户信息和车辆信息
      * @author 小李
      * @date 9:25 2024/10/8
+     * @param customerAndCarVO 用户信息和车辆信息
      **/
     void updateCustomerAndCar(CustomerAndCarVO customerAndCarVO);
-
-    /**
-     * 打印工单
-     *
-     * @param response HttpServletResponse
-     * @param id       String
-     * @author PQZ
-     * @date 14:00 2024/10/12
-     **/
-    void print(HttpServletResponse response, String id);
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java

@@ -32,7 +32,6 @@ import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
 import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper;
 import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
 import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService;
-import cn.iocoder.yudao.module.tickets.tools.WordUtil;
 import cn.iocoder.yudao.module.tickets.vo.CustomerAndCarVO;
 import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
 import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
@@ -42,18 +41,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.deepoove.poi.XWPFTemplate;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -331,34 +325,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             }
         }
     }
-
-    /**
-     * 打印工单
-     *
-     * @param response HttpServletResponse
-     * @param id       String
-     * @author PQZ
-     * @date 14:00 2024/10/12
-     **/
-    @Override
-    public void print(HttpServletResponse response, String id) {
-        Map<String,Object> params = new HashMap<>();
-        params.put("jobNumber","123456789");
-        String fileName = "结算单.docx";
-        String tmpPath = "D:\\"+fileName;
-        try{
-            InputStream inputStream = XWPFTemplate.class.getResourceAsStream("/templates/gdmb.docx");
-            XWPFTemplate template = XWPFTemplate.compile(inputStream);
-            template.render(params);
-            FileOutputStream fos = new FileOutputStream(tmpPath);
-            template.write(fos);
-            fos.flush();
-            template.close();
-            WordUtil.down(response,tmpPath,fileName);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/TOperaDocRequestUtil.java

@@ -1,94 +1,96 @@
-//package cn.iocoder.yudao.module.tickets.tools;
+package cn.iocoder.yudao.module.tickets.tools;
-//
+
-//import cn.iocoder.yudao.module.infra.service.file.FileService;
+import cn.iocoder.yudao.module.infra.service.file.FileService;
-//import cn.iocoder.yudao.module.knowledge.constants.Result;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
-//import cn.iocoder.yudao.module.tickets.controller.admin.DlRepairTicketsController;
+import cn.iocoder.yudao.module.tickets.controller.admin.DlRepairTicketsController;
-//import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
+import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsReqVO;
-//import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.XWPFTemplate;
-//import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.config.Configure;
-//import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
-//import com.tencentcloudapi.ess.v20201111.models.FileInfo;
+import com.tencentcloudapi.ess.v20201111.models.FileInfo;
-//import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.http.ResponseEntity;
+import org.springframework.http.ResponseEntity;
-//import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.mock.web.MockMultipartFile;
-//import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Component;
-//import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartFile;
-//
+
-//import javax.annotation.Resource;
+import javax.annotation.Resource;
-//import java.io.ByteArrayInputStream;
+import java.io.ByteArrayInputStream;
-//import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayOutputStream;
-//import java.io.FileNotFoundException;
+import java.io.FileNotFoundException;
-//import java.io.IOException;
+import java.io.IOException;
-//import java.util.HashMap;
+import java.util.HashMap;
-//
+
-//
+import static com.fhs.core.trans.util.ConvertUtil.convert;
-///**
+
-// * 工单导出工具类
+
-// * @author lzt
+/**
-// * @date 9:27 2024年10月11日
+ * 工单导出工具类
-// */
+ * @author lzt
-//@Component(value = "TOperaDocRequestUtil" )
+ * @date 9:27 2024年10月11日
-//public class TOperaDocRequestUtil {
+ */
-//
+@Component(value = "TOperaDocRequestUtil" )
-//    @Resource
+public class TOperaDocRequestUtil {
-//    private FileService fileService;
+
-//    @Value("${minio.bucketName:dev}")
+    @Resource
-//    private String bucketName;
+    private FileService fileService;
-//
+    @Value("${minio.bucketName:dev}")
-//    public TOperaDocRequestUtil() throws FileNotFoundException {
+    private String bucketName;
-//    }
+
-//
+    public TOperaDocRequestUtil() throws FileNotFoundException {
-//
+    }
-//    private static String TEMPLATE_PATH = "/templates/gdmb.docx";
+
-//
+
-//    @Autowired
+    private static String TEMPLATE_PATH = "/templates/gdmb.docx";
-//    private DlRepairTicketsController dlRepairTicketsController;
+
-//
+    @Autowired
-//    public FileInfo export(DlRepairTicketsReqVO request) throws IOException {
+    private DlRepairTicketsController dlRepairTicketsController;
-//        String fileStr = TEMPLATE_PATH;
+
-//
+    public FileInfo export(DlRepairTicketsReqVO request) throws IOException {
-//        if (fileStr != null) {
+        String fileStr = TEMPLATE_PATH;
-//            byte[] inputStream = fileService.downloadFile(bucketName, fileStr);
+
-//
+        if (fileStr != null) {
-//            // 数据循环填充
+            byte[] inputStream = fileService.downloadFile(bucketName, fileStr);
-//            LoopRowTableRenderPolicy loopRowTableRenderPolicy = new LoopRowTableRenderPolicy();
+
-//            Configure configure = Configure.builder().bind("czTable", loopRowTableRenderPolicy).build();
+            // 数据循环填充
-//
+            LoopRowTableRenderPolicy loopRowTableRenderPolicy = new LoopRowTableRenderPolicy();
-//            // word导出到本地
+            Configure configure = Configure.builder().bind("czTable", loopRowTableRenderPolicy).build();
-//            MultipartFile convert = null;
+
-//            if (fileStr.contains("gdmb.docx")) {
+            // word导出到本地
-//                // 操作模板文件-数据填充
+            MultipartFile convert = null;
-//                XWPFTemplate template = XWPFTemplate.compile(String.valueOf(inputStream), configure).render(
+            if (fileStr.contains("gdmb.docx")) {
-//                        new HashMap<String, Object>() {{
+                // 操作模板文件-数据填充
-//                            // 填充数据 TODO
+                XWPFTemplate template = XWPFTemplate.compile(String.valueOf(inputStream), configure).render(
-//                            //put("requestData", request);
+                        new HashMap<String, Object>() {{
-//
+                            // 填充数据 TODO
-//                        }}
+                            //put("requestData", request);
-//                );
+
-//                ByteArrayOutputStream outputStreamWord = new ByteArrayOutputStream();;
+                        }}
-//                template.writeAndClose(outputStreamWord);
+                );
-//                //IConverter converter = LocalConverter.builder().build();
+                ByteArrayOutputStream outputStreamWord = new ByteArrayOutputStream();;
-//                byte[] bytes = outputStreamWord.toByteArray();
+                template.writeAndClose(outputStreamWord);
-//                ByteArrayInputStream inputStreamWord = new ByteArrayInputStream(bytes);
+                //IConverter converter = LocalConverter.builder().build();
-//
+                byte[] bytes = outputStreamWord.toByteArray();
-//                ByteArrayOutputStream outputStreamPdf = new ByteArrayOutputStream();
+                ByteArrayInputStream inputStreamWord = new ByteArrayInputStream(bytes);
-//
+
-//                //converter.convert(inputStreamWord).as(DocumentType.DOCX).to(outputStreamPdf).as(DocumentType.PDF).execute();
+                ByteArrayOutputStream outputStreamPdf = new ByteArrayOutputStream();
-//                byte[] bytesPdf = outputStreamPdf.toByteArray();
+
-//                ByteArrayInputStream inputStreamPdf = new ByteArrayInputStream(bytesPdf);
+                //converter.convert(inputStreamWord).as(DocumentType.DOCX).to(outputStreamPdf).as(DocumentType.PDF).execute();
-//
+                byte[] bytesPdf = outputStreamPdf.toByteArray();
-//                // convert = new MultipartFile(fileStr.replace(".docx", ".pdf"), "application/pdf", inputStreamPdf.readAllBytes());
+                ByteArrayInputStream inputStreamPdf = new ByteArrayInputStream(bytesPdf);
-//                convert = new MockMultipartFile("gdmb.pdf", bytes);
+
-//            }
+                // convert = new MultipartFile(fileStr.replace(".docx", ".pdf"), "application/pdf", inputStreamPdf.readAllBytes());
-//            ResponseEntity<Result<FileInfo>> responseEntity = dlRepairTicketsController.printDocument(convert);
+                convert = new MockMultipartFile("gdmb.pdf", bytes);
-//
+            }
-//            // 获取 Result<FileInfo> 对象
+            ResponseEntity<Result<FileInfo>> responseEntity = dlRepairTicketsController.printDocument(convert);
-//            Result<FileInfo> fileupload = responseEntity.getBody();
+
-//            if (fileupload != null) {
+// 获取 Result<FileInfo> 对象
-//                return fileupload.getData();
+            Result<FileInfo> fileupload = responseEntity.getBody();
-//            }
+            if (fileupload != null) {
-//        }
+                return fileupload.getData();
-//        return null;
+            }
-//    }
+        }
-//}
+        return null;
+    }
+}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/tools/WordUtil.java

@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.tickets.tools;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileInputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-/**
- * POI-TL工具类
- * @author PQZ
- * @date 13:49 2024/10/12
-**/
-public class WordUtil {
-    /**模版路径*/
-    public static String TEMPLATE_PATH = "/templates/gdmb.docx";
-
-    public static void down(HttpServletResponse response, String filePath, String fileName) {
-        String encodeName = null;
-        try {
-            encodeName = encodeStr(fileName);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        response.addHeader("Access-Control-Allow-Origin", "*");
-        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
-        response.setHeader("Content-disposition", "attachment; filename=" + encodeName + ";" + "filename*=" + "utf-8''" + encodeName);
-        response.setHeader("download-filename", encodeName);
-        try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(filePath));
-             // 输出流
-             BufferedOutputStream bos = new BufferedOutputStream(response.getOutputStream());) {
-            byte[] buff = new byte[1024];
-            int len = 0;
-            while ((len = bis.read(buff)) > 0) {
-                bos.write(buff, 0, len);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 编码工具方法
-     */
-    public static String encodeStr(String fileName) throws UnsupportedEncodingException {
-        return URLEncoder.encode(fileName,"UTF-8");
-    }
-
-}

yudao-module-infra/yudao-module-infra-biz/pom.xml

@@ -124,6 +124,12 @@
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
         </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.11.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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);
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java

@@ -144,4 +144,44 @@ public class FileServiceImpl implements FileService {
         return BeanUtils.toBean(presignedObjectUrl, FilePresignedUrlRespVO.class,
                 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();
+//        }
+//    }
+
+
+
+
 }

yudao-server/src/main/resources/application.yaml

@@ -237,8 +237,6 @@ yudao:
       - /admin-api/rescue/driverLogin
       - /admin-api/rescuePayApi/payNotify
       - /admin-api/payApi/payNotify
-      - /repair/tickets/print/**
-      - /admin-api/repair/tickets/print/**
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径
@@ -300,8 +298,6 @@ yudao:
       - /admin-api/payApi/payNotify
       - /admin-api/base/notice/**
       - /app-api/** #小程序端接口，不区分租户
-      - /repair/tickets/print/**
-      - /admin-api/repair/tickets/print/**
     ignore-tables:
       - system_tenant
       - system_tenant_package

yudao-server/src/main/resources/templates/gdmb.docx

@@ -1,97 +0,0 @@
-                    泸州市蓝安汽车销售有限公司
-                             车辆维修结算单
-                                                         工号：{{jobNumber}}
-                                客户名称：
-{{customerName}}
-                                 送修人：
-{{repairer}}
-送修人电话：
-{{repairerTelephone}}
-                                   车牌：
-{{plate}}
-                                   车型：
-{{carType}}
-发动机号码：
-{{engineNumber}}
-                                 车架号：
-{{frameNumber}}
-                                开单时间：
-{{billingTime}}
-已行里程：
-{{mileage}}
-                                三包单位：
-{{tripleUnit}}
-                                保险名称：
-{{insuranceName}}
-旧件处理：
-{{oldhandle}}
-维修内容
-                                    序号
-                                 维修项目
-                                    单价
-                                    数量
-                                   折扣率
-                                   工时费
-                                   主修人
-                                    备注
-                                    性质
-                                  {{repRort}}
-                                  {{repItem}}
-                                 {{repPrice}}
-                                 {{repCount}}
-                                {{repDiscount}}
-                               {{labourAmount}}
-                                   {{major}}
-                                 {{repRemark}}
-                                 {{repNature}}
-	材料清单
-                                    序号
-                                 配件件号
-                                    名称
-                                    单位
-                                    单价
-                                    数量
-                                   折扣率
-                                    金额
-                                    备注
-                                    性质
-                                  {{matRort}}
-{{matNum}}
-{{matName}}
-                                  {{matUnit}}
-                                 {{matPrice}}
-                                 {{matCount}}
-                                {{matDiscount}}
-                                 {{matAmount}}
-                                 {{matRemark}}
-                                 {{matNature}}
-                                    小计
-                                       
-                                       
-                                       
-                                       
-                              {{matTotalAmount}}
-                                       
-                                       
-材料费：{{matCost}} 
-材料费优惠：{{matFavorable}}
-管理费：{{manageCost}}
-总费用：{{matTotalCost}}
-工时费：{{labourCost}}
-工时费优惠：{{labourFavorable}}
-其他费：{{otherCost}}
-材料工时优惠：{{matlabourFavorable}}
-救援费：{{rescueCost}}
-三包费：{{tripleCost}}
-定损费：{{lossCost}}
-应收费：{{allCost}}
-大写：{{bigAllCost}}
-                                付款情况：
-{{costCondition}}
-工单备注：{{paperRemark}}
-客户签字：
-结算备注：{{costRemark}}
-                                       
-单位：{{corporation}}														服务顾问：{{serviceConsultant}}  联系电话：{{serviceTelephone}}
-开户行：{{bank}}														地址：{{bankAddress}}
-账号：{{account}}														结算日期：{{settleDate}}