Explorar o código

去除部门url

luyanwen %!s(int64=3) %!d(string=hai) anos
pai
achega
9b6f00c4ac

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

@@ -159,7 +159,6 @@ public class GenerateCodeConsumer {
 		QrRepertoryVO qrRepertory = qrRepertoryMapper.selectQrRepertoryDetailById(qrPackageVo.getQrRepertoryId());
 		List<QrRepertoryColumnVO> qrRepertoryColumnList = qrRepertory.getQrRepertoryColumnList();
 		Long qrRepertoryId = qrRepertory.getId();
-		String deptUrl = qrRepertory.getDeptUrl();
 
 		// 存放每列的url
 		Map<Long, String> urlMap = new LinkedHashMap<>();
@@ -169,7 +168,7 @@ public class GenerateCodeConsumer {
 		Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap = new LinkedHashMap<>();
 
 		// 处理url和流水号--后续生成码要用到
-		getUrlAndSerialNumber(qrRepertoryColumnList, qrRepertoryId, deptUrl, urlMap, qrRepertorySerialNumberMap);
+		getUrlAndSerialNumber(qrRepertoryColumnList, qrRepertoryId, urlMap, qrRepertorySerialNumberMap);
 
 		//码包id
         //根据码包id查询,获取批次号
@@ -374,7 +373,7 @@ public class GenerateCodeConsumer {
 	/**
 	 * 处理url和流水号
 	 */
-	private void getUrlAndSerialNumber(List<QrRepertoryColumnVO> qrRepertoryColumnList, Long qrRepertoryId, String deptUrl, Map<Long, String> urlMap, Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap) {
+	private void getUrlAndSerialNumber(List<QrRepertoryColumnVO> qrRepertoryColumnList, Long qrRepertoryId, Map<Long, String> urlMap, Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap) {
 		for (int i = 0; i < qrRepertoryColumnList.size(); i++) {
 			QrRepertoryColumnVO qrRepertoryColumn = qrRepertoryColumnList.get(i);
 			Long qrRepertoryColumnId = qrRepertoryColumn.getId();
@@ -384,8 +383,6 @@ public class GenerateCodeConsumer {
 			String url = "";
 			if (QrFormatUrlEnum.SYSTEM_URL.is(urlType)) {
 				url = systemUrl;
-			} else if (QrFormatUrlEnum.DEPT_URL.is(urlType)) {
-				url = deptUrl;
 			}
 			// 如果url没有以/结尾,则加上/
 			if (StringUtils.isNotBlank(url) && !url.endsWith("/")) {