From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
index 35235db..7bc03be 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
@@ -5,6 +5,7 @@
import com.ltkj.common.core.page.TableDataInfo;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -20,9 +21,11 @@
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;
@@ -45,8 +48,10 @@
private TjProConsumablesService proConsumablesService;
@Resource
private ITjConsumablesService consumablesService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
+@Autowired
+private ISysConfigService configService;
/**
* 鎵撳嵃鏉＄爜
*/
@@ -56,53 +61,46 @@
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq);
-
+ String value = configService.selectConfigByKey("path_filePath");
if (tjOrder!=null){
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer one = tjCustomerService.getOne(wq1);
//鏌ュ埌椤圭洰璇︽儏 鍒ゆ柇姣忎釜椤圭洰鐨勮�楁潗 鍘婚噸 is_calculation涓篩鐨勬墦鍗� 涓旀嬁鍒拌�楁潗鍚嶇О
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+// List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
- List<TjProConsumables> list1=new ArrayList<>();
- for (TjOrderDetail tjOrderDetail : list) {
- LambdaQueryWrapper<TjProConsumables> wq3 = new LambdaQueryWrapper<>();
- wq3.eq(TjProConsumables::getProId, tjOrderDetail.getProId());
- List<TjProConsumables> list2 = proConsumablesService.list(wq3);
- for (TjProConsumables tjProConsumables : list2) {
- list1.add(tjProConsumables);
- }
- }
- List<TjProConsumables> collect = list1.stream().distinct().collect(Collectors.toList());
- if (collect.size()==0){
+ List<TjOrderDetail> list = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+
+// List<TjProConsumables> list1=new ArrayList<>();
+// for (TjOrderDetail tjOrderDetail : list) {
+// LambdaQueryWrapper<TjProConsumables> wq3 = new LambdaQueryWrapper<>();
+// wq3.eq(TjProConsumables::getProId, tjOrderDetail.getProId());
+// List<TjProConsumables> list2 = proConsumablesService.list(wq3);
+// for (TjProConsumables tjProConsumables : list2) {
+// list1.add(tjProConsumables);
+// }
+// }
+// List<TjProConsumables> collect = list1.stream().distinct().collect(Collectors.toList());
+ if (list.isEmpty()){
return AjaxResult.success("璇ヤ綋妫�鍙锋棤鎶借椤圭洰锛�");
}
- //绾靛悜鎷兼帴鐢�
- //List<String> pac=new ArrayList<>();
- for (TjProConsumables tjProConsumables : collect) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- if ("Y".equals(tjConsumables.getIsCalculation())){
- try {
- BufferedImage image = BarCodeUtils.getBarCodeWithWords(tjNumber+tjConsumables.getId(), tjNumber, one.getCusName(), tjConsumables.getMakings());
- ImageIO.write(image, "jpg", new File(value+"\\"+tjNumber+tjConsumables.getMakings()+".jpg"));
- //pac.add(value+tjNumber+tjConsumables.getMakings()+".jpg"); //绾靛悜鎷兼帴鐢�
- //BarCodeUtils.barCodePrint(image,250,150,250,150); //绾靛悜鎷兼帴鐢�
- } catch (IOException e) {
- e.printStackTrace();
- return AjaxResult.error();
- }
- }
+
+ try {
+ BufferedImage image = BarCodeUtils.getBarCodeWithWords(tjNumber, tjNumber, one.getCusName(),null);
+
+// ImageIO.write(image, "jpg", new File(value+"\\"+one.getCusName()+tjNumber+".jpg"));
+ ByteArrayOutputStream out=new ByteArrayOutputStream();
+ ImageIO.write(image,"jpg",out);
+ byte[] bytes = out.toByteArray();
+ String encodedToString = Base64.getEncoder().encodeToString(bytes);
+ return AjaxResult.success("鏉＄爜宸茬敓鎴愶紒鍦ㄦ枃浠跺す涓嬶細"+value,encodedToString);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return AjaxResult.error();
}
- //绾靛悜鎷兼帴
- //String[] title = pac.toArray(new String[pac.size()]);
- //joinImageListVertical(title,"jpg","E:\\mycode\\2023-2\\2.16\\"+tjNumber+".jpg");
- //璇嗗埆鏉＄爜鍐呭
- //String s = QRCodeUtils.deEncodeByPath("E:\\mycode\\2023-2\\2.16\\10001230128175552绾㈢洊瀛愭娊琛�绠�.jpg");
- //System.out.println(s);
- return AjaxResult.success("鏉＄爜宸茬敓鎴愶紒鍦ㄦ枃浠跺す涓嬶細"+value);
}
return AjaxResult.error("璇ヤ綋妫�鍙锋棤鏁堬紒");
@@ -115,7 +113,7 @@
@GetMapping("/GetByCode")
@ApiOperation(value = "鏍规嵁鍥剧墖璇嗗埆鏉＄爜")
public AjaxResult GetByCode(String path) {
- path=value+"10001230306223716钃濊壊澶寸洊绠�.jpg";
+// path=value+"10001230306223716钃濊壊澶寸洊绠�.jpg";
//璇嗗埆鏉＄爜
String s = QRCodeUtils.deEncodeByPath(path);
return AjaxResult.success(s);
--
Gitblit v1.8.0