From 3eccec25db4871891989ef1bdcd028bed6ced183 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 08:47:27 +0800
Subject: [PATCH] 完善日志代码
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductCtrl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 e09023d..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;
@@ -135,11 +138,11 @@
* 鍙牴鎹畂rderId鏌ヨ浜у搧
* @return
*/
- @GetMapping(path="selectByOrderId")
+ @GetMapping(path="getProduct")
@SsoPowerAop(power = "10300000")
- @Log("鍙牴鎹畂rderId鏌ヨ浜у搧")
- public BaseResponse<List<PltProduct>> selectByOrderId(Long orderId){
- return BaseResponseUtils.buildSuccess(proSv.selectByOrderId(orderId));
+ @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