|
@@ -3,6 +3,7 @@ package com.abi.qms.platform.service.impl;
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.core.io.file.FileWriter;
|
|
|
import com.abi.base.foundation.util.RedisClient;
|
|
|
+import com.abi.ootb.core.utils.JsonUtils;
|
|
|
import com.abi.qms.platform.dao.entity.*;
|
|
|
import com.abi.qms.platform.dao.enums.CodePackageOrderTypeEnum;
|
|
|
import com.abi.qms.platform.dao.enums.InvalidEnum;
|
|
@@ -161,6 +162,8 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
log.info("4 loopGenerateCode do some qrcode opts -->"+System.currentTimeMillis());
|
|
|
|
|
|
//2-生成二维码
|
|
|
+ log.info("码包的批次列表数量为"+qrPackageBatches.size());
|
|
|
+ log.info(JsonUtils.toJson(qrPackageBatches));
|
|
|
for (QrPackageBatch qrPackageBatch:qrPackageBatches) {
|
|
|
//计算备用码包数量
|
|
|
Long standbyRatio = 0L;
|
|
@@ -202,6 +205,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
fileVerifyMd5List.add(md5);
|
|
|
log.info("8 loopGenerateCode create file -->"+System.currentTimeMillis());
|
|
|
}
|
|
|
+ log.info("9 loopGenerateCode all files -->"+System.currentTimeMillis());
|
|
|
|
|
|
//3-保存压缩文件并上传oss
|
|
|
//压缩后得名字 正式码_SAP订单号_物料名称_文件内码数量
|
|
@@ -220,6 +224,8 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
//压缩加密文件
|
|
|
File file = new File("/code");
|
|
|
zipEncryption(file, fileList,pas,zipName);
|
|
|
+ log.info("10 loopGenerateCode zip file -->"+System.currentTimeMillis());
|
|
|
+
|
|
|
//上传阿里云,并更新码包的下载路径 保存zip密码
|
|
|
try{
|
|
|
MultipartFile multipartFile = toMultipartFile(file.getPath()+"/"+zipName, zipName);
|
|
@@ -237,6 +243,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
}catch (Exception e){
|
|
|
throw new BusinessException("上传OSS失败");
|
|
|
}
|
|
|
+ log.info("11 loopGenerateCode upload oss -->"+System.currentTimeMillis());
|
|
|
|
|
|
//3-更改生成状态为已生成
|
|
|
qrPackage.setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_SUCCESS.getCode());
|
|
@@ -252,6 +259,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
qrPackageService.sendEmailForQrPackageCreated(baseFactory.getEmail(),qrPackage,aliPath,qrPackage.getZipPassword());
|
|
|
//邮件发送后修改状态
|
|
|
qrPackageMapper.updateById(qrPackage);
|
|
|
+ log.info("12 loopGenerateCode send email -->"+System.currentTimeMillis());
|
|
|
}
|
|
|
|
|
|
/**
|