Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/ExcelInputFactory.java

@@ -6,6 +6,7 @@ import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.excel.common.AbstractExcelProperty;
 import com.abi.task.common.excel.common.ExcelHeadAlias;
+import com.abi.task.common.utils.StrUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -166,7 +167,7 @@ public class ExcelInputFactory {
                     //调用method
                     if (value != null) {
                         Method method = methodCache.get(fieldName);
-                        method.invoke(t, String.valueOf(value));
+                        method.invoke(t, StrUtils.filterHtml(String.valueOf(value)));
                     }
                 }
                 excelPojoList.add(t);

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/utils/StrUtils.java

@@ -0,0 +1,45 @@
+package com.abi.task.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @className: com.abi.qms.platform.infrastructure.util-> StrUtils
+ * @description:
+ * @author: Marko.W
+ * @createDate: 2021-06-15 15:06
+ * @version: 1.0
+ * @todo:
+ */
+public class StrUtils {
+    public static String filterHtml(String input){
+        if(input == null){
+            return null;
+        }
+        if(input.length() == 0){
+            return input;
+        }
+        input = input.replaceAll("&", "&");
+        input = input.replaceAll("<", "≶");
+        input = input.replaceAll(">", ">");
+        input = input.replaceAll(" ", " ");
+        input = input.replaceAll("'", "'");
+        input = input.replaceAll("\"", "");
+        return input.replaceAll("\n", "<br>");
+    }
+
+    /**
+     * 拼接字符串，为空就不拼
+     * @param args
+     * @return
+     */
+    public static String concat(String... args){
+        StringBuffer sb = new StringBuffer();
+        for(String s:args){
+            if(StringUtils.isNotBlank(s)){
+                sb.append(s);
+            }
+        }
+        return sb.toString();
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrPackageRes.java

@@ -79,6 +79,10 @@ public class ListQrPackageRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
+        @ApiModelProperty(value = "更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime updateTime;
+
         @ApiModelProperty(value = "创建人id")
         private Long createBy;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/mq/GenerateCodeConsumer.java

@@ -116,10 +116,9 @@ public class GenerateCodeConsumer {
 
 	//生成码包路径
 //	private File file = new File(this.getClass().getResource("/").getPath()+"/code");
-	private File file = new File("classpath:META-INF/code");
+	private File file = new File("/code");
+
 
-	//批量添加文件
-	private ArrayList<File> fileList = new ArrayList<>();
 
 	//批量添加文件
 	private ArrayList<String> fileVerifyMd5List = new ArrayList<>();
@@ -182,6 +181,8 @@ public class GenerateCodeConsumer {
 		if (QrPackageGenerateStatusEnum.GENERATE_SUCCESS.is(qrPackage.getGenerateStatus())) {
 			return;
 		}
+		//批量添加文件
+		ArrayList<File> fileList = new ArrayList<>();
 		// 更改生成状态为生成中
 		qrPackage.setGenerateStatus(QrPackageGenerateStatusEnum.GENERATING.getCode());
 		qrPackageMapper.updateById(qrPackage);
@@ -257,7 +258,7 @@ public class GenerateCodeConsumer {
 			saveTableStore(tableStoreEntityList);
 
 			// 创建码文件
-			createCodeFile(qrRepertory,batchNumber,qrBoxCodeFormat);
+			createCodeFile(qrRepertory,batchNumber,qrBoxCodeFormat,fileList);
 			qrDataList.clear();
 		}
 
@@ -273,7 +274,7 @@ public class GenerateCodeConsumer {
 		zipEncryption(file, fileList,pas,zipName);
 		//上传阿里云，并更新码包的下载路径 保存zip密码
 		try{
-			MultipartFile multipartFile = toMultipartFile(file.getPath()+"\\"+zipName, zipName);
+			MultipartFile multipartFile = toMultipartFile(file.getPath()+"/"+zipName, zipName);
 			Object returDat = basicServiceClient.uploadFileOss(multipartFile);
 			if(null != returDat){
 				Map<String,Object> result =(Map<String, Object>)returDat;
@@ -282,6 +283,7 @@ public class GenerateCodeConsumer {
 			}
 			//放入oss地址和密码
 			qrPackage.setZipPassword(pas);
+			fileList.clear();
 			//删除生成文件
 			FileUtil.del(file);
 		}catch (Exception e){
@@ -501,7 +503,7 @@ public class GenerateCodeConsumer {
 	/**
 	 * 创建码文件
 	 */
-	private void createCodeFile( QrRepertoryVO qrRepertory,String batchNumber,QrBoxCodeFormat boxCodeFormat) {
+	private void createCodeFile( QrRepertoryVO qrRepertory,String batchNumber,QrBoxCodeFormat boxCodeFormat,ArrayList<File> fileList) {
 		List<QrRepertoryColumnVO> qrRepertoryColumnList = qrRepertory.getQrRepertoryColumnList();
 		StringBuilder content = new StringBuilder();
 		// 第一行为每列的名称，用“,”分隔

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -49,7 +49,7 @@
             package.update_time,
             bookingOrder.description,
         IF
-            ( package.sap_order_no IS NOT NULL, 1, 2 ) type
+            ( package.sap_order_no IS NULL, 1, 2 ) type
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -43,6 +43,7 @@
             qp.apply_status,
             qp.is_download,
             qp.create_time,
+            qp.update_time,
             qp.create_by,
             qp.qr_type,
             bm.material_name,