1
0

2 Revīzijas f7a69b7ded ... 2703bcfb43

Autors SHA1 Ziņojums Datums
  zhouyy 2703bcfb43 Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper 2 nedēļas atpakaļ
  zhouyy 54ac87b9cf 二维码修改 2 nedēļas atpakaļ

+ 23 - 23
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/QRCodeController.java

@@ -93,30 +93,30 @@ public class QRCodeController {
             String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
             String fileName = erpOrderInfo.getProjectName()+erpOrderInfo.getOrderId()+erpOrderInfo.getLine()+".png";
             fileName = replaceChar(fileName);
             fileName = replaceChar(fileName);
             if(StringUtils.isBlank(fileName)){
             if(StringUtils.isBlank(fileName)){
-                System.out.println("here=== "+fileName);
-            }
-
-            try {
-                BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
-                // 创建带标题和两行底部文字的完整图片
-                BufferedImage combinedImage = QRCodeUtil.createCompleteImage(
-                        qrImage,
-                        titleText,
-                        new String[]{footerLine1, footerLine2},
-                        new Color(70, 130, 180),  // 标题背景色(钢蓝色)
-                        new Color(220, 220, 220)   // 底部背景色(浅灰色)
-                );
-
-                // 保存最终图片
-                File outputFile = new File(uploadPath+fileName);
-                ImageIO.write(combinedImage, "png", outputFile);
-            } catch (Exception e) {
-                e.printStackTrace();
-                msg.setError("二维码生成失败,请联系管理员");
-                return msg;
+                System.out.println("文件参数有空,projectName== "+erpOrderInfo.getProjectName()+",orderID== "+erpOrderInfo.getOrderId()+",line:"+ erpOrderInfo.getLine());
+            }else{
+                try {
+                    BufferedImage qrImage = QRCodeUtil.generateQRCodeImage(data, width, height);
+                    // 创建带标题和两行底部文字的完整图片
+                    BufferedImage combinedImage = QRCodeUtil.createCompleteImage(
+                            qrImage,
+                            titleText,
+                            new String[]{footerLine1, footerLine2},
+                            new Color(70, 130, 180),  // 标题背景色(钢蓝色)
+                            new Color(220, 220, 220)   // 底部背景色(浅灰色)
+                    );
+
+                    // 保存最终图片
+                    File outputFile = new File(uploadPath+fileName);
+                    ImageIO.write(combinedImage, "png", outputFile);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    msg.setError("二维码生成失败,请联系管理员");
+                    return msg;
+                }
+                filesToZip[index] = uploadPath+fileName;
+                index++;
             }
             }
-            filesToZip[index] = uploadPath+fileName;
-            index++;
 
 
         }
         }
         String zipFileName = System.currentTimeMillis()+".zip";
         String zipFileName = System.currentTimeMillis()+".zip";