|
@@ -118,8 +118,7 @@ public class GenerateCodeConsumer {
|
|
|
// private File file = new File(this.getClass().getResource("/").getPath()+"/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();
|
|
|
}
|
|
|
|
|
@@ -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();
|
|
|
// 第一行为每列的名称,用“,”分隔
|