From b92caa380bb6242ae11a3606ea908c7029aaeeb6 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 06 一月 2025 09:57:53 +0800
Subject: [PATCH] Handler
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
index 5f13142..67cfb88 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/product/ProductSv.java
@@ -1,5 +1,6 @@
package com.dy.pmsPlatform.product;
+import cn.hutool.core.codec.Base64;
import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
@@ -12,6 +13,8 @@
import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
+import com.dy.pmsGlobal.util.QrCodeUtil;
+import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -22,6 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@@ -72,6 +76,10 @@
@Transactional
public int save(PltProduct p) {
+ //鍒ゆ柇浜у搧 鍚嶇О鍜屽瀷鍙� 涓嶈兘閲嶅悕
+ if (dao.exists(p.name.trim(), p.type.trim() ,p.id)) {
+ throw new RuntimeException("宸茬粡瀛樺湪鐩稿悓鐨勪骇鍝佸悕绉�&鍨嬪彿");
+ }
int flag=0;
do {
p.code = getNextCode();
@@ -106,6 +114,9 @@
@Transactional
public int update(PltProduct p) {
+ if (dao.exists(p.name.trim(), p.type.trim(),p.id)) {
+ throw new RuntimeException("宸茬粡瀛樺湪鐩稿悓鐨勪骇鍝佸悕绉�&鍨嬪彿");
+ }
int count = dao.updateByPrimaryKeySelective(p);
//鍒犻櫎鏃ф暟鎹�,閲嶆柊鎻掑叆
pfDao.deleteByProId(p.id);
@@ -166,8 +177,7 @@
return;
}
FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
-
- doc.webUrl = fileRestVo.fileWebUrl + file.filePath;
+ doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
doc.orgName = file.orgName;
doc.extName = file.extName;
});
@@ -195,44 +205,54 @@
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
rsVo.obj = dao.selectSome(params) ;
if(CollectionUtils.isNotEmpty(rsVo.obj)){
- rsVo.obj.forEach(pro->{
- pro = addWebUrl(pro);
+ rsVo.obj.parallelStream().forEach(item->{
+ try {
+ byte[] codes = QrCodeUtil.genQrCode(item.code);
+ item.qrCode = "data:image/jpeg;base64," + Base64.encode(codes);
+ item = addWebUrl(item);
+ } catch (IOException e) {
+ log.error("IOException:",e);
+ } catch (WriterException e) {
+ log.error("WriterException:",e);
+ }
});
}
return rsVo ;
}
- /**
- * 娣诲姞浜у搧鏂囨。鍏宠仈
- * @param proId 浜у搧id
- * @param fileId 鏂囨。id
- * @return 鏇存柊鏁伴噺
- */
- public int addDoc(long proId,long fileId,String fileType){
- PltProductFile pf=new PltProductFile();
- pf.fileId = fileId;
- pf.proId = proId;
- pf.fileType = fileType;
- return pfDao.insertSelective(pf);
- }
+// /**
+// * 娣诲姞浜у搧鏂囨。鍏宠仈
+// * @param proId 浜у搧id
+// * @param fileId 鏂囨。id
+// * @return 鏇存柊鏁伴噺
+// */
+// public int addDoc(long proId,long fileId,String fileType){
+// PltProductFile pf=new PltProductFile();
+// pf.fileId = fileId;
+// pf.proId = proId;
+// pf.fileType = fileType;
+// return pfDao.insertSelective(pf);
+// }
- /**
- * 鏌ヨ浜у搧鍏宠仈鏂囨。
- * @param proId 浜у搧id
- * @return 杩斿洖鍏宠仈鏂囨。闆嗗悎
- */
- public List<OthFile> selectDoc(long proId){
- return othFileMapper.selectByProId(proId);
- }
+// /**
+// * 鏌ヨ浜у搧鍏宠仈鏂囨。
+// * @param proId 浜у搧id
+// * @return 杩斿洖鍏宠仈鏂囨。闆嗗悎
+// */
+// public List<OthFile> selectDoc(long proId){
+// return othFileMapper.selectByProId(proId);
+// }
public List<PltProduct> selectAll(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
return dao.selectAll(params);
}
-
-
- public void downloadDoc(HttpServletResponse response) {
- PltProduct pro=dao.selectByPrimaryKey(Long.valueOf(1));
+ public List<PltProduct> getProduct(Long orderId) {
+ return dao.selectByOrderId(orderId);
}
+
+// public void downloadDoc(HttpServletResponse response) {
+// PltProduct pro=dao.selectByPrimaryKey(Long.valueOf(1));
+// }
}
--
Gitblit v1.8.0