码拆分列开发

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrData.java

@@ -21,12 +21,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-//@Document(collection = "qr_data")
 public class QrData implements Serializable {
 
-	/** MongoDB主键 */
-	private String _id;
-
 	/** 码库id */
 	private Long qrRepertoryId;
 
@@ -41,4 +37,5 @@ public class QrData implements Serializable {
 
 	/** 创建时间 */
 	private LocalDateTime createTime;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrInnerData.java

@@ -32,4 +32,7 @@ public class QrInnerData implements Serializable {
 	/** 已生成码包位置 */
 	private Long codeIndex;
 
+	/** 拆分数量 */
+	private Integer splitNum;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/RabbitmqConfig.java

@@ -1,6 +1,5 @@
 package com.abi.qms.platform.infrastructure.config;
 
-import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import com.abi.qms.platform.infrastructure.mq.TableStoreBatchInsertConsumer;
 import org.springframework.amqp.core.Queue;
 import org.springframework.context.annotation.Bean;
@@ -15,11 +14,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class RabbitmqConfig {
 
-	@Bean
-	public Queue declareQueue() {
-		return new Queue(GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE);
-	}
-
 	@Bean
 	public Queue declareTableBatchInsertQueue() {
 		return new Queue(TableStoreBatchInsertConsumer.TABLE_STORE_BATCH_INSERT_QUEUE);

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

@@ -1,54 +1,54 @@
-package com.abi.qms.platform.infrastructure.mq;
-
-import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
-import com.abi.qms.platform.service.GenerateCodeService;
-import com.abi.qms.platform.service.QrPackageService;
-import com.abi.task.common.api.exception.BusinessException;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 生成码-消费者
- *
- * @author WeiganCai
- * @date: 2021-05-06
- */
-@Slf4j
-@Component
-public class GenerateCodeConsumer {
-
-	public static final String GENERATE_CODE_BY_REPERTORY_QUEUE = "generate_code_queue";
-
-	@Autowired
-	private GenerateCodeService generateCodeService;
-
-	@Autowired
-	private QrPackageService qrPackageService;
-
-	@SneakyThrows
-	@RabbitHandler
-	@RabbitListener(queues = GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE,ackMode = "AUTO")
-	public void onMessage(String id) {
-		//判断rabbit消息是否为空
-		if(StringUtils.isEmpty(id)){
-			throw new BusinessException("队列监听数据为空！");
-		}
-		try {
-			// 生成码
-			generateCodeService.generateQrCode(Long.parseLong(id));
-		} catch (Exception e) {
-			log.error("生成码失败", e);
-			// 回滚
-			QrPackage qrPackage = new QrPackage();
-			qrPackage.setId(Long.parseLong(id));
-			qrPackage.setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_FAIL.getCode());
-			qrPackageService.failedRollback(qrPackage);
-		}
-	}
-}
+//package com.abi.qms.platform.infrastructure.mq;
+//
+//import com.abi.qms.platform.dao.entity.QrPackage;
+//import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
+//import com.abi.qms.platform.service.GenerateCodeService;
+//import com.abi.qms.platform.service.QrPackageService;
+//import com.abi.task.common.api.exception.BusinessException;
+//import lombok.SneakyThrows;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 生成码-消费者
+// *
+// * @author WeiganCai
+// * @date: 2021-05-06
+// */
+//@Slf4j
+//@Component
+//public class GenerateCodeConsumer {
+//
+//	public static final String GENERATE_CODE_BY_REPERTORY_QUEUE = "generate_code_queue";
+//
+//	@Autowired
+//	private GenerateCodeService generateCodeService;
+//
+//	@Autowired
+//	private QrPackageService qrPackageService;
+//
+//	@SneakyThrows
+//	@RabbitHandler
+//	@RabbitListener(queues = GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE,ackMode = "AUTO")
+//	public void onMessage(String id) {
+//		//判断rabbit消息是否为空
+//		if(StringUtils.isEmpty(id)){
+//			throw new BusinessException("队列监听数据为空！");
+//		}
+//		try {
+//			// 生成码
+//			generateCodeService.generateQrCode(Long.parseLong(id));
+//		} catch (Exception e) {
+//			log.error("生成码失败", e);
+//			// 回滚
+//			QrPackage qrPackage = new QrPackage();
+//			qrPackage.setId(Long.parseLong(id));
+//			qrPackage.setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_FAIL.getCode());
+//			qrPackageService.failedRollback(qrPackage);
+//		}
+//	}
+//}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/GenerateCodeServiceImpl.java

@@ -14,7 +14,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.GenerateCodeConsumer;
 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.BuildCodeUtil;
@@ -25,7 +24,6 @@ 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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
@@ -34,12 +32,9 @@ import net.lingala.zip4j.util.Zip4jConstants;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
@@ -202,7 +197,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
                 log.info("7 loopGenerateCode save tablestore async -->"+System.currentTimeMillis());
 
                 // 创建码文件
-                String md5 = createCodeFile(qrRepertory, batchNumber, qrBoxCodeFormat, fileList, codeList);
+                String md5 = createCodeFile(qrRepertory,splitCache, batchNumber, qrBoxCodeFormat, fileList, codeList);
                 fileVerifyMd5List.add(md5);
                 log.info("8 loopGenerateCode create file -->"+System.currentTimeMillis());
             }catch(Exception e){
@@ -412,7 +407,6 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
         StringBuilder codeSb = new StringBuilder();
 
         for (int i = 0; i < needGenerateNumber; i++) {
-            log.info("doLoopGenerateCode 的疑似死循环.2");
             QrData qrData = new QrData()
                     .setQrRepertoryId(qrRepertoryId)
                     .setBatchNumber(batchNumber)
@@ -422,38 +416,25 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
             List<QrInnerData> qrInnerDataList = new LinkedList<>();
             //箱子码幅面
             for (int a = 0; a < boxCodeFormat.getFormatNumber(); a++) {
-                log.info("doLoopGenerateCode 的疑似死循环.3");
                 for (int j = 0; j < qrRepertoryColumnList.size(); j++) {
-                    log.info("doLoopGenerateCode 的疑似死循环.4");
                     QrRepertoryColumnVO qrRepertoryColumn = qrRepertoryColumnList.get(j);
                     Long qrRepertoryColumnId = qrRepertoryColumn.getId();
-                    //声明拆分数量
-                    int splitNum = 0;
-                    if(splitCache.containsKey(qrRepertoryColumnId)){
-                        splitNum = splitCache.get(qrRepertoryColumnId).getSplitNum();
-                    }
                     // 非clone列，设置code和url
                     String code = buildUniqueCode(uniqueSet, qrRepertoryColumn, codeSb, paramMap, qrRepertorySerialNumberMap, 0);
                     if (code == null) {
                         throw new RuntimeException("生成码失败，重复生成码次数超过" + REPEAT_BUILD_CODE_TIMES + "次");
                     }
                     //判断拆分数量是否为空
-                    if( splitNum >0){
-                        List<char[]> codeStr = segmentation(code, splitNum);
-                        for (char[] chars:codeStr) {
-                            QrInnerData qrInnerData = new QrInnerData();
-                            qrInnerData.setCode(String.valueOf(chars));
-                            qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnId).setSortNumber(qrRepertoryColumn.getSortNumber());
-                            qrInnerData.setCodeIndex(++qrIndex);
-                            qrInnerDataList.add(qrInnerData);
-                        }
-                    } else {
-                        QrInnerData qrInnerData = new QrInnerData();
-                        qrInnerData.setCode(code);
-                        qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnId).setSortNumber(qrRepertoryColumn.getSortNumber());
-                        qrInnerData.setCodeIndex(++qrIndex);
-                        qrInnerDataList.add(qrInnerData);
+                    int splitNum = 0;
+                    if(splitCache.containsKey(qrRepertoryColumnId)){
+                        splitNum = splitCache.get(qrRepertoryColumnId).getSplitNum();
                     }
+                    QrInnerData qrInnerData = new QrInnerData();
+                    qrInnerData.setCode(code);
+                    qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnId).setSortNumber(qrRepertoryColumn.getSortNumber());
+                    qrInnerData.setCodeIndex(++qrIndex);
+                    qrInnerData.setSplitNum(splitNum);
+                    qrInnerDataList.add(qrInnerData);
                 }
             }
             qrData.setInnerDataList(qrInnerDataList);
@@ -520,13 +501,24 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
     /**
      * 创建码文件
      */
-    private String createCodeFile( QrRepertoryVO qrRepertory,String batchNumber,QrBoxCodeFormat boxCodeFormat,ArrayList<File> fileList,List<QrData> qrDataList) {
+    private String createCodeFile( QrRepertoryVO qrRepertory,Map<Long,QrBoxCodeFormatSplit> splitCache,String batchNumber,QrBoxCodeFormat boxCodeFormat,ArrayList<File> fileList,List<QrData> codeList) {
         List<QrRepertoryColumnVO> qrRepertoryColumnList = qrRepertory.getQrRepertoryColumnList();
+        List<String> columnNameList = new ArrayList<>();
         StringBuilder content = new StringBuilder();
         // 第一行为每列的名称，用“,”分隔
-        String dataComposition = qrRepertoryColumnList.stream().map(col -> col.getAlias()).collect(Collectors.joining(","));
+        for(QrRepertoryColumnVO colVO:qrRepertoryColumnList){
+            int splitNum = splitCache.containsKey(colVO.getId()) ? splitCache.get(colVO.getId()).getSplitNum() : 0;
+            if(splitNum>1){
+                for(int i=1;i<=splitNum;i++){
+                    columnNameList.add(colVO.getAlias()+i);
+                }
+            }else{
+                columnNameList.add(colVO.getAlias());
+            }
+        }
+        String dataComposition = String.join(",",columnNameList);
         content.append(dataComposition);
-        //暂时根据项目幅面分，没有根据拆分数量分
+        //箱码幅面再翻倍
         if(boxCodeFormat.getFormatNumber() > 1){
             for (int i = 1; i < boxCodeFormat.getFormatNumber(); i++) {
                 content.append(",").append(dataComposition);
@@ -534,11 +526,22 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
         }
         content.append("\r\n");
         // 拼接码
-        List<QrInnerData> innerDataList;
-        String innerData;
-        for (QrData qrData : qrDataList) {
-            innerDataList = qrData.getInnerDataList();
-            innerData = innerDataList.stream().map(qrInnerData -> qrInnerData.getCode()).collect(Collectors.joining(","));
+        for (QrData qrData : codeList) {
+            List<String> codeTextList = new ArrayList<>();
+            for(QrInnerData qrInnerData:qrData.getInnerDataList()){
+                String code = qrInnerData.getCode();
+                int splitNum = qrInnerData.getSplitNum();
+                //如果拆分数量大于1，则做拆分，否则直接放入
+                if(splitNum>1){
+                    List<char[]> codeStr = segmentation(code, splitNum);
+                    for (char[] chars:codeStr) {
+                        codeTextList.add(String.valueOf(chars));
+                    }
+                } else {
+                    codeTextList.add(code);
+                }
+            }
+            String innerData = String.join(",",codeTextList);
             content.append(innerData).append("\r\n");
         }
         //如果文件不存在，创建一个文件

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrDataServiceImpl.java

@@ -1,266 +0,0 @@
-package com.abi.qms.platform.service.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.abi.qms.platform.dao.entity.QrData;
-import com.abi.qms.platform.dao.entity.QrInnerData;
-import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
-import com.abi.qms.platform.dao.mapper.QrPackageMapper;
-import com.abi.qms.platform.dao.mapper.QrRepertoryMapper;
-import com.abi.qms.platform.dao.vo.result.QrPackageVO;
-import com.abi.qms.platform.dao.vo.result.QrRepertoryColumnVO;
-import com.abi.qms.platform.dao.vo.result.QrRepertoryVO;
-import com.abi.qms.platform.dto.req.ImportQrDataReq;
-import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
-import com.abi.qms.platform.service.QrDataService;
-import com.abi.qms.platform.service.QrPackageService;
-import com.abi.task.common.api.exception.BusinessException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * 码数据 Service业务层处理
- *
- * @author WeiganCai
- * @date: 2021-05-11
- */
-@Service
-@Slf4j
-public class QrDataServiceImpl {
-//
-////	@Autowired
-////	private MongoTemplate mongoTemplate;
-//
-//	@Autowired
-//	private QrPackageMapper qrPackageMapper;
-//
-//	@Autowired
-//	private QrRepertoryMapper qrRepertoryMapper;
-//
-//	@Autowired
-//	private QrPackageService qrPackageService;
-//
-//	/**
-//	 * 根据批次号查询码数量
-//	 */
-//	@Override
-//	public long selectCountByBatchNumber(String batchNumber) {
-////		Query query = new Query();
-////		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-////		return mongoTemplate.count(query, QrData.class);
-//		return 0L;
-//	}
-//
-//	/**
-//	 * 根据批次号删除码
-//	 */
-//	@Override
-//	public void deleteCodeByBatchNumber(String batchNumber) {
-////		Query query = new Query();
-////		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-////		mongoTemplate.remove(query, QrData.class);
-//	}
-//
-//	/**
-//	 * 根据批次号查询码
-//	 */
-//	@Override
-//	public List<QrData> selectCodeByBatch(String batchNumber) {
-////		Query query = new Query();
-////		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-////		return mongoTemplate.find(query, QrData.class);
-//		return null;
-//	}
-//
-//	/**
-//	 * 批量插入
-//	 */
-//	@Override
-//	public void batchInsert(List<QrData> qrDataList) {
-////		mongoTemplate.insert(qrDataList, QrData.class);
-//	}
-//
-//	/**
-//	 * 导入码数据
-//	 */
-//	@Override
-//	public void importQrData(ImportQrDataReq req) {
-//		// 校验txt文件
-//		MultipartFile file = req.getFile();
-//		checkTxtFile(file);
-//
-//		// 查询码包
-//		QrPackageVO qrPackageVo = qrPackageMapper.selectQrPackageDetailById(req.getQrPackageId());
-//
-//		List<QrData> qrDataList = new LinkedList<>();
-//
-//		// 从txt中提取码数据
-//		txtToQrData(file, qrPackageVo, qrDataList);
-//
-//		try {
-//			// 插入文本中的数据
-//			insertImportData(qrPackageVo, qrDataList);
-//
-//			// 压缩文件
-//			zipFile(file, qrPackageVo);
-//
-//			// 更改生成状态为已生成
-//			QrPackage update = new QrPackage().setId(qrPackageVo.getId()).setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_SUCCESS.getCode());
-//			qrPackageMapper.updateById(update);
-//
-//		} catch (Exception e) {
-//			log.error("导入码失败", e);
-//			qrPackageService.failedRollback(new QrPackage().setId(qrPackageVo.getId()).setBatchNumber(qrPackageVo.getBatchNumber()));
-//		}
-//	}
-//
-//	/**
-//	 * 压缩文件
-//	 */
-//	private void zipFile(MultipartFile file, QrPackageVO qrPackageVo) {
-//		try {
-//			File txtFile = File.createTempFile(qrPackageVo.getBatchNumber(), "txt");
-//			file.transferTo(txtFile);
-//			// 按照批次号.txt的方式重命名
-//			txtFile = FileUtil.rename(txtFile, qrPackageVo.getBatchNumber() + ".txt", true, true);
-//
-//			// 压缩文件
-//			File zipFile = ZipUtil.zip(txtFile);
-//
-//			// 删除生成的临时文件，上传阿里云，并更新码包的下载路径
-//			qrPackageService.delFileAndUpdatePath(txtFile, zipFile, qrPackageVo.getId());
-//		} catch (IOException e) {
-//			log.error("IOException", e);
-//			throw new BusinessException("压缩文件错误");
-//		}
-//	}
-//
-//	/**
-//	 * 从txt中提取码数据
-//	 * @param file txt文件
-//	 * @param qrPackageVo 码包
-//	 * @param qrDataList 码数据
-//	 */
-//	private void txtToQrData(MultipartFile file, QrPackageVO qrPackageVo, List<QrData> qrDataList) {
-//		// 码库 & 码库的列
-//		QrRepertoryVO qrRepertory = qrRepertoryMapper.selectQrRepertoryDetailById(qrPackageVo.getQrRepertoryId());
-//		List<QrRepertoryColumnVO> qrRepertoryColumnList = qrRepertory.getQrRepertoryColumnList();
-//
-//		// 用于比较申请数量和txt中的数量是否一致
-//		Long qrNumber = qrPackageVo.getQrNumber();
-//		long txtCodeNumber = 0;
-//
-//		BufferedReader br = null;
-//		try {
-//			br = new BufferedReader(new InputStreamReader(file.getInputStream()));
-//			LocalDateTime localDateTime = LocalDateTime.now();
-//			String line = null;
-//			while ((line = br.readLine()) != null) {
-//				if (StringUtils.isBlank(line)) {
-//					continue;
-//				}
-//
-//				line = line.replace("，", ",");
-//				// 跳过特殊字符
-//				if (!line.matches("[0-9a-zA-Z\\.\\,\\:\\-/]*")) {
-//					continue;
-//				}
-//
-//				String[] codeArr = line.split(",");
-//				// 验证导入的码列数是否与定义的码库列数一致
-//				if (codeArr.length != qrRepertoryColumnList.size()) {
-//					throw new BusinessException("导入文件的码列数与码库定义的码列数不一致，导入失败");
-//				}
-//
-//				txtCodeNumber++;
-//				QrData qrData = new QrData();
-//				List<QrInnerData> qrInnerDataList = new LinkedList<>();
-//
-//				for (int i = 0; i < codeArr.length; i++) {
-//					String urlCode = codeArr[i];
-//					// 分离url与code
-//					int urlIndex = urlCode.lastIndexOf("/") + 1;
-//					QrInnerData qrInnerData = new QrInnerData();
-//					qrInnerData.setUrl(urlCode.substring(0, urlIndex));
-//					qrInnerData.setCode(urlCode.substring(urlIndex));
-//					qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnList.get(i).getId());
-//					qrInnerData.setSortNumber(i);
-//
-//					qrInnerDataList.add(qrInnerData);
-//				}
-//
-//				qrData.setQrRepertoryId(qrRepertory.getId());
-//				qrData.setBatchNumber(qrPackageVo.getBatchNumber());
-//				qrData.setQrRepertoryType(qrRepertory.getType());
-//				qrData.setInnerDataList(qrInnerDataList);
-//				qrData.setCreateTime(localDateTime);
-//
-//				qrDataList.add(qrData);
-//			}
-//		} catch (IOException e) {
-//			log.error("读取码文件出错", e);
-//			throw new BusinessException("读取码文件出错");
-//		} finally {
-//			IoUtil.close(br);
-//		}
-//
-//		if (qrNumber.longValue() != txtCodeNumber) {
-//			throw new BusinessException("申请数量与导入数量不一致，无法导入");
-//		}
-//	}
-//
-//	/**
-//	 * 校验txt文件
-//	 * @param file
-//	 */
-//	private void checkTxtFile(MultipartFile file) {
-//		if (file != null && file.getSize() > 0) {
-//			String fileName = file.getOriginalFilename();
-//			String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-//			if (!"txt".equals(suffix)) {
-//				throw new BusinessException("上传文件格式不正确");
-//			}
-//		} else {
-//			throw new BusinessException("上传文件为空");
-//		}
-//	}
-//
-//	/**
-//	 * 插入文本中的数据
-//	 * @param qrPackageVo 码包
-//	 * @param qrDataList 码数据List
-//	 */
-//	private void insertImportData(QrPackageVO qrPackageVo, List<QrData> qrDataList) {
-//		try {
-//			List<QrData> batchInsertList = new ArrayList<>();
-//			for (int i = 0; i < qrDataList.size(); i++) {
-//				batchInsertList.add(qrDataList.get(i));
-//				// 每5000个插入一次
-//				if (i > 0 && i % GenerateCodeConsumer.ONCE_GENERATE_NUMBER == 0) {
-//					batchInsert(batchInsertList);
-//					batchInsertList.clear();
-//				}
-//			}
-//			if (!batchInsertList.isEmpty()) {
-//				batchInsert(batchInsertList);
-//			}
-//		} catch (Exception e) {
-//			log.error("导入的码插入mongodb失败", e);
-//			throw new BusinessException("导入的码重复或与系统中的码重复，导入失败");
-//		}
-//	}
-}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -12,7 +12,6 @@ import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.constant.RedisKey;
 import com.abi.qms.platform.infrastructure.event.CodePackageCreateEvent;
-import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import com.abi.qms.platform.infrastructure.util.*;
 import com.abi.qms.platform.service.FactoryService;
 import com.abi.qms.platform.service.MaterialService;

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/GenerateCodeTest.java

@@ -4,7 +4,6 @@ import com.abi.qms.platform.dao.entity.QrData;
 import com.abi.qms.platform.dao.entity.QrInnerData;
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.mapper.QrPackageMapper;
-import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -29,14 +28,6 @@ public class GenerateCodeTest {
 	@Autowired
 	private QrPackageMapper qrPackageMapper;
 
-//	@Autowired
-//	private MongoTemplate mongoTemplate;
-
-	@Test
-	public void generateCodeTest() {
-		QrPackage qrPackage = qrPackageMapper.selectById(3);
-		amqpTemplate.convertAndSend(GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE, qrPackage);
-	}
 
 	@Test
 	public void uniqueTest() {