Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite.java

@@ -7,7 +7,6 @@ import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfWriter;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 /**
  * @author zhangchuangbiao
@@ -46,8 +45,8 @@ public class PDFWrite {
         // --------------产品名称-------------------------------
         PdfPTable pdfPTable2 = new PdfPTable(1);
         Font font = new Font(bfHei, 60);
-        if (pdfGoodsDto.getProductName().length()>30){
-            font = new Font(bfHei,30);
+        if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 30) {
+            font = new Font(bfHei, 30);
         }
         Paragraph tParagraph = new Paragraph(pdfGoodsDto.getProductName(), font);
 
@@ -64,8 +63,8 @@ public class PDFWrite {
         // --------------产品英文名称-------------------------------
         PdfPTable pdfPTable3 = new PdfPTable(1);
         font = new Font(bfHei, 30);
-        if (pdfGoodsDto.getEnglishName().length()>50){
-            font = new Font(bfHei,15);
+        if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
+            font = new Font(bfHei, 15);
         }
         Paragraph englistPararaph = new Paragraph(pdfGoodsDto.getEnglishName(), font);
         PdfPCell englishNameCell = new PdfPCell(englistPararaph);

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_12.java

@@ -1,9 +1,9 @@
 package com.kmall.admin.utils.pdf.type;
+
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 /**
@@ -70,9 +70,9 @@ public class PDFWrite_12 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 8, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
             }
 
@@ -95,9 +95,9 @@ public class PDFWrite_12 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 6, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 12, pdfGoodsDto.getEnglishName());
             }
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_18.java

@@ -2,9 +2,11 @@ package com.kmall.admin.utils.pdf.type;
 
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.lowagie.text.*;
-import com.lowagie.text.pdf.*;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfPCell;
+import com.lowagie.text.pdf.PdfPTable;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 /**
@@ -70,9 +72,9 @@ public class PDFWrite_18 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 12, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 16, pdfGoodsDto.getProductName());
             }
 
@@ -95,9 +97,9 @@ public class PDFWrite_18 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 10, pdfGoodsDto.getEnglishName());
             }
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_36.java

@@ -4,7 +4,6 @@ import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 /**
@@ -73,9 +72,9 @@ public class PDFWrite_36 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 5, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 11, pdfGoodsDto.getProductName());
             }
 
@@ -99,9 +98,9 @@ public class PDFWrite_36 {
         table = new PdfPTable(6);
 
         for (int i = 0; i < 6; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
             }
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_4.java

@@ -4,7 +4,6 @@ import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 /**
  * @author zhangchuangbiao
@@ -64,9 +63,9 @@ public class PDFWrite_4 {
         table = new PdfPTable(2);
 
         for (int i = 0; i < 2; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 25, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 40, pdfGoodsDto.getProductName());
             }
 
@@ -89,9 +88,9 @@ public class PDFWrite_4 {
         table = new PdfPTable(2);
 
         for (int i = 0; i < 2; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 13, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 20, pdfGoodsDto.getEnglishName());
             }
         }

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_9.java

@@ -4,7 +4,6 @@ import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.lowagie.text.*;
 import com.lowagie.text.pdf.*;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 /**
@@ -68,9 +67,9 @@ public class PDFWrite_9 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 14, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 22, pdfGoodsDto.getProductName());
             }
 
@@ -93,9 +92,9 @@ public class PDFWrite_9 {
         table = new PdfPTable(3);
 
         for (int i = 0; i < 3; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 14, pdfGoodsDto.getEnglishName());
             }
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_nohead_36.java

@@ -3,13 +3,15 @@ package com.kmall.admin.utils.pdf.type;
 import com.kmall.admin.utils.pdf.BarcodeUtil;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.kmall.common.fileserver.util.FileManager;
-import com.lowagie.text.*;
 import com.lowagie.text.Font;
 import com.lowagie.text.Image;
-import com.lowagie.text.pdf.*;
+import com.lowagie.text.*;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfPCell;
+import com.lowagie.text.pdf.PdfPTable;
+import com.lowagie.text.pdf.PdfWriter;
 
 import java.awt.*;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.UUID;
 
@@ -54,9 +56,9 @@ public class PDFWrite_nohead_36 {
         table = new PdfPTable(4);
 
         for (int i = 0; i < 4; i++) {
-            if (pdfGoodsDto.getProductName().length()>20){
+            if (pdfGoodsDto.getProductName() != null && pdfGoodsDto.getProductName().length() > 20) {
                 setTable(bfHei, table, 5, pdfGoodsDto.getProductName());
-            }else{
+            } else {
                 setTable(bfHei, table, 10, pdfGoodsDto.getProductName());
             }
 
@@ -70,9 +72,9 @@ public class PDFWrite_nohead_36 {
         table = new PdfPTable(4);
 
         for (int i = 0; i < 4; i++) {
-            if (pdfGoodsDto.getEnglishName().length()>50){
+            if (pdfGoodsDto.getEnglishName() != null && pdfGoodsDto.getEnglishName().length() > 50) {
                 setTable(bfHei, table, 5, pdfGoodsDto.getEnglishName());
-            }else{
+            } else {
                 setTable(bfHei, table, 7, pdfGoodsDto.getEnglishName());
             }