From 0bd3125739c0d8bded4f7bd405fd99f1723df964 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 15:51:49 +0800
Subject: [PATCH] 不同服务器配置文件备份

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
index 67e1afd..4626135 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java
@@ -7,6 +7,9 @@
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pmsGlobal.aop.Log;
 import com.dy.pmsGlobal.pojoPlt.PltProduct;
+import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.ExportExcelUtil;
+import com.dy.pmsGlobal.util.QrCodeConstant;
 import com.dy.pmsGlobal.util.QrCodeUtil;
 import com.google.zxing.WriterException;
 import jakarta.servlet.http.HttpServletResponse;
@@ -137,7 +140,7 @@
      */
     @GetMapping(path="getProduct")
     @SsoPowerAop(power = "10300000")
-    @Log("鍙牴鎹畂rderId鏌ヨ浜у搧")
+    @Log("鏍规嵁orderId鏌ヨ浜у搧")
     public BaseResponse<List<PltProduct>> getProduct(Long orderId){
         return BaseResponseUtils.buildSuccess(proSv.getProduct(orderId));
     }
@@ -149,8 +152,25 @@
     public void export(@RequestBody QueryVo queryVo, HttpServletResponse response){
         List<Converter> list = new ArrayList<>() ;
 
-        List<PltProduct> porList = proSv.selectAll(queryVo);
-        // 浣跨敤骞惰娴佹彁楂樻�ц兘
+        List<PltProduct> products = proSv.selectAll(queryVo);
+        if(products != null){
+            for(PltProduct product : products){
+                ExcelVo vo = new ExcelVo();
+                vo.name = product.name;
+                vo.type = product.type;
+                vo.code = product.code;
+                try {
+                    vo.qrCode = QrCodeUtil.genQrCode(product.code);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                } catch (WriterException e) {
+                    e.printStackTrace();
+                }
+                list.add(vo);
+            }
+        }
+        // 浣跨敤骞惰娴佹彁楂樻�ц兘锛屼絾鐢熸垚鐨勭粨鏋滃彉鎴愭棤搴忕殑浜�
+        /*
         porList.parallelStream().forEach(pro -> {
             ExcelVo vo = new ExcelVo();
             vo.name = pro.name;
@@ -165,7 +185,8 @@
             }
             list.add(vo);
         });
-        QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+         */
+        ExportExcelUtil.downloadExcel(response, fileName, sheetName, list);
     }
 
 

--
Gitblit v1.8.0