楚江ERP-发货单批量打印

@@ -46,6 +46,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -201,8 +202,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
      */
     @ApiOperation("发货单批量打印")
     @GetMapping("/batchPrintShipmentsOrder")
-    public void batchPrintShipmentsOrder(@Valid ExportShipmentsOrderVo vo, HttpServletResponse response) {
-        List<ShipmentsOrderInfo> orderInfoList = shipmentsOrderInfoService.listByIds(vo.getIds());
+    public void batchPrintShipmentsOrder(@Valid @RequestBody ExportShipmentsOrderVo vo, HttpServletResponse response) {
+        List<ShipmentsOrderInfo> orderInfoList = shipmentsOrderInfoService.queryByIds(vo.getIds());
         if (CollectionUtils.isEmpty(orderInfoList)) {
             throw new DefaultClientException("发货单不存在！");
         }
@@ -214,11 +215,11 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
         // 创建临时目录
         Path tempDir = null;
         File zipFile = null;
+        Path baseDir = Paths.get("/tmp");
         try {
             // 设置响应头
-            ResponseUtil.setZipResponseHead(response, "发货单.zip");
-            // 创建临时目录存放Excel文件
-            tempDir = Files.createTempDirectory("/tmp/shipments_order_export");
+            ResponseUtil.setZipResponseHead(response, "发货单批量打印_" + System.currentTimeMillis() + ".zip");            // 创建临时目录存放Excel文件
+            tempDir = Files.createTempDirectory(baseDir, "shipments_order_export");
 
             List<String> shipmentsOrderIds = new ArrayList<>();
             for (ShipmentsOrderInfo orderInfo : orderInfoList) {
@@ -247,7 +248,9 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 }
             }
             // 创建ZIP压缩包
-            createZipFile(excelFiles, "发货单批量导出_" + System.currentTimeMillis() + ".zip");
+            zipFile = createZipFile(excelFiles, tempDir);
+            // 将ZIP文件写入响应流
+            writeZipToResponse(zipFile, response);
         } catch (FileNotFoundException e) {
             log.error("发货单批量打印失败: ", e);
             throw new DefaultClientException("模板文件不存在: " + templatePath);
@@ -399,10 +402,12 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
 
 
     /**
-     * 创建ZIP压缩包
+     * 创建ZIP压缩包并返回文件对象
      */
-    private void createZipFile(List<File> excelFiles, String zipFileName) throws IOException {
-        File zipFile = File.createTempFile("/tmp/shipments_order_export", ".zip");
+    private File createZipFile(List<File> excelFiles, Path tempDir) throws IOException {
+        String zipFileName = "发货单批量打印_" + System.currentTimeMillis() + ".zip";
+        File zipFile = new File(tempDir.toFile(), zipFileName);
+
         try (FileOutputStream fos = new FileOutputStream(zipFile);
              ZipOutputStream zos = new ZipOutputStream(fos)) {
             byte[] buffer = new byte[1024];
@@ -418,6 +423,23 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 }
             }
         }
+        return zipFile;
+    }
+
+
+    /**
+     * 将ZIP文件写入HTTP响应
+     */
+    private void writeZipToResponse(File zipFile, HttpServletResponse response) throws IOException {
+        try (FileInputStream fis = new FileInputStream(zipFile);
+             OutputStream os = response.getOutputStream()) {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = fis.read(buffer)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.flush();
+        }
     }
 
     /**
@@ -425,17 +447,17 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
      */
     private void cleanupTempFiles(Path tempDir, File zipFile) {
         try {
-            // 删除临时目录
+            // 删除临时目录及其所有内容
             if (tempDir != null && Files.exists(tempDir)) {
                 Files.walk(tempDir)
                         .sorted(Comparator.reverseOrder())
                         .map(Path::toFile)
                         .forEach(File::delete);
             }
-            // 清理
-             if (zipFile != null && zipFile.exists()) {
-                 zipFile.delete();
-             }
+            // 单独删除ZIP文件（如果存在）
+            if (zipFile != null && zipFile.exists()) {
+                zipFile.delete();
+            }
         } catch (IOException e) {
             log.warn("清理临时文件失败", e);
         }

@@ -116,6 +116,12 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String createById;
 
     /**
+     * 创建人姓名
+     */
+    @TableField(exist = false)
+    private String createBy;
+
+    /**
      * 更新人ID
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)

@@ -366,6 +366,14 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         getBaseMapper().update(updateWrapper);
     }
 
+    @Override
+    public List<ShipmentsOrderInfo> queryByIds(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        return getBaseMapper().queryByIds(ids);
+    }
+
 
     /**
      * 处理批次数据

@@ -29,4 +29,13 @@ public interface ShipmentsOrderInfoMapper extends BaseMapper<ShipmentsOrderInfo>
      * @param orderInfos    数据集合
      */
     void batchAdd(List<ShipmentsOrderInfo> orderInfos);
+
+
+    /**
+     * 根据主键批量查询
+     *
+     * @param ids   主键集合
+     * @return      List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryByIds(@Param("ids") List<String> ids);
 }

@@ -91,4 +91,12 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @param status    状态
      */
     void updateStatus(String id, String status);
+
+    /**
+     * 根据主键批量查询
+     *
+     * @param ids   主键集合
+     * @return      List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryByIds(List<String> ids);
 }

@@ -33,6 +33,7 @@
             tb.delivery_type,
             tb.destination,
             tb.status,
+            u.name as create_by,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
@@ -40,6 +41,7 @@
         FROM shipments_order_info AS tb
         LEFT JOIN base_data_customer c ON tb.customer_id = c.id
         LEFT JOIN base_data_workshop w ON tb.workshop_id = w.id
+        LEFT JOIN sys_user u ON tb.create_by_id = u.id
     </sql>
 
     <select id="query" resultMap="ShipmentsOrderInfo">
@@ -102,4 +104,12 @@
             )
         </foreach>
     </insert>
+
+    <select id="queryByIds" resultType="com.lframework.xingyun.sc.entity.ShipmentsOrderInfo">
+        <include refid="ShipmentsOrderInfo_sql"/>
+        where tb.id in
+        <foreach collection="ids" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </select>
 </mapper>