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-server/src/main/java/com/abi/qms/platform/service/impl/GenerateCodeServiceImpl.java

@@ -11,7 +11,6 @@ import com.abi.qms.platform.dao.tablestore.entity.QrCode;
 import com.abi.qms.platform.dao.vo.result.QrRepertoryColumnVO;
 import com.abi.qms.platform.dao.vo.result.QrRepertoryVO;
 import com.abi.qms.platform.feign.BasicServiceClient;
-import com.abi.qms.platform.infrastructure.mq.TableStoreBatchInsertConsumer;
 import com.abi.qms.platform.infrastructure.qr.build.parent.SerialBuildCode;
 import com.abi.qms.platform.infrastructure.util.AesEncodeUtil;
 import com.abi.qms.platform.infrastructure.util.AsyncTableStoreUtil;
@@ -23,18 +22,17 @@ import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.model.ZipParameters;
 import net.lingala.zip4j.util.Zip4jConstants;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -210,10 +208,14 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
                 // 累加数量
                 sum = sum + qrCodes.size();
                 log.info("7 loopGenerateCode save tablestore async -->"+System.currentTimeMillis());
+                // 清空qrCodes
+                qrCodes.clear();
 
                 // 创建码文件
                 String md5 = createCodeFile(qrPackage,coverFactory,qrRepertory,splitCache, batchNumber, qrBoxCodeFormat, fileList, codeList);
                 fileVerifyMd5List.add(md5);
+                // 清空codeList
+                codeList.clear();
                 log.info("8 loopGenerateCode create file -->"+System.currentTimeMillis());
             }catch(Exception e){
                 log.warn("单个批次生成码异常",e);
@@ -236,10 +238,8 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
 
         //压缩密码
         String pas = RandomCodeUtils.getStr(6);
-        log.info("生成密码："+pas);
         //压缩加密文件
         File file = new File("/code");
-        log.info(file.getAbsolutePath());
         zipEncryption(file, fileList,pas,zipName);
         log.info("10 loopGenerateCode zip file -->"+System.currentTimeMillis());
 
@@ -350,13 +350,13 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
 
     private List<QrCode> convertToTableStoreEntity(List<QrData> codeList,QrPackageBatch qrPackageBatch){
         //保存所有码的列表
-        List<QrCode> qrCodes = new ArrayList<>();
+        List<QrCode> qrCodes = Lists.newLinkedList();
         //将每一列的码拆成多条码保存
-        codeList.forEach(sout-> {
+        codeList.stream().forEach(sout-> {
             List<QrInnerData> innerDataList = sout.getInnerDataList();
             List<QrCode> qrCodeCope = PojoConverterUtils.copyList(innerDataList, QrCode.class);
             //批次号 码包
-            qrCodeCope.forEach(stable->{
+            qrCodeCope.stream().forEach(stable->{
                 stable.setBatchNumberId(qrPackageBatch.getId());
                 stable.setPackageId(qrPackageBatch.getPackageId());
 //                stable.setCreateTime(LocalDateTime.now());
@@ -364,7 +364,6 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
             });
             qrCodes.addAll(qrCodeCope);
         });
-
         return qrCodes;
     }