楚江ERP:客户资信-导出完善

@@ -27,7 +27,6 @@ import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
-import freemarker.template.TemplateException;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -35,18 +34,15 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.*;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -70,6 +66,8 @@ public class CustomerCreditController extends DefaultBaseController {
     private SysUserService sysUserService;
     private SysUserService sysUserService;
     @Autowired
     @Autowired
     private RedisHandler redisHandler;
     private RedisHandler redisHandler;
+    @Value("${customer.credit.export:/web/service/erp/xingyun/export/templates/}")
+    private String exportTemplate;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -267,33 +265,40 @@ public class CustomerCreditController extends DefaultBaseController {
 
 
     /**
     /**
      * 导出
      * 导出
+     *
      * @return
      * @return
      */
      */
     @ApiOperation("导出")
     @ApiOperation("导出")
     @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
     @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
-    @PostMapping("/export")
-    public ResponseEntity<FileSystemResource> export(@NotBlank(message = "ID不能为空") String id, HttpServletResponse response) {
+    @GetMapping("/export")
+    public void export(@NotBlank(message = "ID不能为空") String id, HttpServletResponse response) {
         try {
         try {
             String fileName = customerCreditService.export(id);
             String fileName = customerCreditService.export(id);
-            Path filePath = Paths.get("/web/service/erp/xingyun/export/templates", fileName);
-
-            if (Files.exists(filePath)) {
-                // 创建FileSystemResource实例，用于读取文件
-                FileSystemResource file = new FileSystemResource(filePath.toString());
-
-                // 返回ResponseEntity对象，设置响应头以便浏览器知道这是一个文件下载请求
-                return ResponseEntity.ok()
-                        .header("Content-Disposition", "attachment; filename=" + file.getFilename())
-                        .body(file);
-            } else {
-                response.sendError(404, "文件未找到");
+            String tmpLocation = exportTemplate + fileName;
+            // 创建文件对象
+            File file = new File(tmpLocation);
+            // 检查文件是否存在
+            if (!file.exists()) {
+                throw new DefaultClientException("文件不存在！");
+            }
+            // 设置响应头
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment; filename=" +
+                    URLEncoder.encode(file.getName(), "UTF-8"));
+            response.setContentLengthLong(file.length());
+            // 读取文件并写入响应输出流
+            try (FileInputStream fis = new FileInputStream(file);
+                 OutputStream os = response.getOutputStream()) {
+                byte[] buffer = new byte[1024];
+                int len;
+                while ((len = fis.read(buffer)) > 0) {
+                    os.write(buffer, 0, len);
+                }
+                os.flush();
             }
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (TemplateException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
         }
-        return null;
     }
     }
 
 
 
 

@@ -47,20 +47,17 @@ import freemarker.template.TemplateExceptionHandler;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.IntStream;
@@ -94,6 +91,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Resource
     @Resource
     private SysUserDeptService sysUserDeptService;
     private SysUserDeptService sysUserDeptService;
+    @Value("${customer.credit.export:/web/service/erp/xingyun/export/templates/}")
+    private String exportTemplate;
 
 
     @Override
     @Override
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
     public PageResult<CustomerCredit> query(Integer pageIndex, Integer pageSize, QueryCustomerCreditVo vo) {
@@ -1333,9 +1332,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         StringWriter stringWriter = new StringWriter();
         StringWriter stringWriter = new StringWriter();
         template.process(data, stringWriter);
         template.process(data, stringWriter);
         String processedXml = stringWriter.toString();
         String processedXml = stringWriter.toString();
-        // 1. 定义服务器导出目录
-        String exportDir = "/web/service/erp/xingyun/export/templates";
-        Path dirPath = Paths.get(exportDir);
+        Path dirPath = Paths.get(exportTemplate);
         // 2. 创建目录（如果不存在）
         // 2. 创建目录（如果不存在）
         if (!Files.exists(dirPath)) {
         if (!Files.exists(dirPath)) {
             Files.createDirectories(dirPath);
             Files.createDirectories(dirPath);