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