修改生成码包数据主键，删除鼎昌指定跳转路径

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

@@ -14,16 +14,11 @@ import java.time.LocalDateTime;
  */
 @Data
 @NoArgsConstructor
-@TableStore(tableName = "qr_code",primaryKeyName = "id")
+@TableStore(tableName = "qr_code",primaryKeyName = "code")
 public class QrCode implements TableStoreEntity, Serializable {
 
     /**
-     * 主键
-     */
-    private String id;
-
-    /**
-     * 码
+     * 主键码
      */
     private String code;
 
@@ -37,11 +32,6 @@ public class QrCode implements TableStoreEntity, Serializable {
      */
     private Long batchNumberId;
 
-    /**
-     * url
-     */
-    private String url;
-
     /**
      * 创建时间
      */

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

@@ -130,10 +130,6 @@ public class GenerateCodeConsumer {
 	/** 声明码对应的值 */
 	public Long codeIndex = 0L;
 
-	/** 系统url */
-	@Value("${system.url}")
-	private String systemUrl;
-
 	@SneakyThrows
 	@RabbitHandler
 	@RabbitListener(queues = GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE)
@@ -333,15 +329,12 @@ public class GenerateCodeConsumer {
 			List<QrInnerData> innerDataList = qrData.getInnerDataList();
 			for (QrInnerData qrInnerData:innerDataList) {
 				QrCode qrCode = new QrCode();
-				qrCode.setId(String.valueOf(IdWorker.getId()));
 				//码
 				qrCode.setCode(qrInnerData.getCode());
 				//批次id
 				qrCode.setBatchNumberId(qrPackageBatch.getId());
 				//码包id
 				qrCode.setPackageId(qrPackageBatch.getPackageId());
-				//要拼接的url
-				qrCode.setUrl(qrInnerData.getUrl());
 				//创建时间
 				qrCode.setCreateTime(LocalDateTime.now());
 				//已生成码包位置
@@ -422,14 +415,14 @@ public class GenerateCodeConsumer {
 							List<char[]> codeStr = a(code, splitNum);
 							for (char[] chars:codeStr) {
 								QrInnerData qrInnerData = new QrInnerData();
-								qrInnerData.setCode(String.valueOf(chars)).setUrl(url);
+								qrInnerData.setCode(String.valueOf(chars));
 								qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnId).setSortNumber(qrRepertoryColumn.getSortNumber());
 								qrInnerData.setCodeIndex(codeIndex+=1);
 								qrInnerDataList.add(qrInnerData);
 							}
 						} else {
 							QrInnerData qrInnerData = new QrInnerData();
-							qrInnerData.setCode(code).setUrl(url);
+							qrInnerData.setCode(code);
 							qrInnerData.setQrRepertoryColumnId(qrRepertoryColumnId).setSortNumber(qrRepertoryColumn.getSortNumber());
 							qrInnerData.setCodeIndex(codeIndex+=1);
 							qrInnerDataList.add(qrInnerData);
@@ -462,16 +455,16 @@ public class GenerateCodeConsumer {
 			Long qrRepertoryColumnId = qrRepertoryColumn.getId();
 
 			// 每列的url格式
-			Integer urlType = qrRepertoryColumn.getUrlType();
-			String url = "";
-			if (QrFormatUrlEnum.SYSTEM_URL.is(urlType)) {
-				url = systemUrl;
-			}
-			// 如果url没有以/结尾，则加上/
-			if (StringUtils.isNotBlank(url) && !url.endsWith("/")) {
-				url += "/";
-			}
-			urlMap.put(qrRepertoryColumnId, url);
+//			Integer urlType = qrRepertoryColumn.getUrlType();
+//			String url = "";
+//			if (QrFormatUrlEnum.SYSTEM_URL.is(urlType)) {
+//				url = systemUrl;
+//			}
+//			// 如果url没有以/结尾，则加上/
+//			if (StringUtils.isNotBlank(url) && !url.endsWith("/")) {
+//				url += "/";
+//			}
+			urlMap.put(qrRepertoryColumnId, "");
 
 			// 使用到流水号参数的列
 			String[] buildClassArr = qrRepertoryColumn.getQrFormatVO().getCodeVariableBuildClass().split(",");
@@ -531,7 +524,7 @@ public class GenerateCodeConsumer {
 		String innerData;
 		for (QrData qrData : qrDataList) {
 			innerDataList = qrData.getInnerDataList();
-			innerData = innerDataList.stream().map(qrInnerData -> qrInnerData.getUrl() + qrInnerData.getCode()).collect(Collectors.joining(","));
+			innerData = innerDataList.stream().map(qrInnerData -> qrInnerData.getCode()).collect(Collectors.joining(","));
 			content.append(innerData).append("\r\n");
 		}
 		//如果文件不存在，创建一个文件