From 9cea4833f937cd6dfb49299d0240215581c79188 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 05 五月 2026 15:25:08 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
index 3059ac1..dfdf07a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.common.utils.CodeUtils;
+import com.zy.acs.common.utils.QrCodeCodecSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.domain.CodeExcel;
import com.zy.acs.manager.common.exception.BusinessException;
@@ -46,7 +47,11 @@
@Override
public Code selectByData(String data) {
- return this.getOne(new LambdaQueryWrapper<Code>().eq(Code::getData, data));
+ if (Cools.isEmpty(data)) {
+ return null;
+ }
+ data = QrCodeCodecSupport.normalize(data);
+ return this.getOne(new LambdaQueryWrapper<Code>().eq(Code::getData, data), false);
}
@Override
@@ -66,9 +71,10 @@
@Override
public Code getCacheByData(String data) {
- if (data == null) {
+ if (Cools.isEmpty(data)) {
return null;
}
+ data = QrCodeCodecSupport.normalize(data);
Code code = CODE_DATA_CACHE.get(data);
if (code == null) {
code = this.selectByData(data);
@@ -177,17 +183,18 @@
@Override
public void importExecute(List<CodeExcel> excelList) {
for (CodeExcel excel : excelList) {
+ String codeData = QrCodeCodecSupport.normalize(excel.getCode());
Code code = this.selectByData(excel.getCode());
if (null == code) {
code = new Code();
- code.setUuid("code" + excel.getCode());
- code.setData(excel.getCode());
+ code.setUuid("code" + codeData);
+ code.setData(codeData);
code.setX(excel.getX());
code.setY(excel.getY());
code.setScale(CodeUtils.DEFAULT_SCALE);
code.setMemo(excel.getMemo());
if (!save(code)) {
- throw new BusinessException(excel.getCode() + "淇濆瓨澶辫触");
+ throw new BusinessException(codeData + "淇濆瓨澶辫触");
}
}
}
@@ -327,8 +334,9 @@
if (code == null || code.getId() == null || code.getData() == null) {
return;
}
- CODE_ID_CACHE.put(code.getId(), this.copyCode(code));
- CODE_DATA_CACHE.put(code.getData(), this.copyCode(code));
+ Code cachedCode = this.copyCode(code);
+ CODE_ID_CACHE.put(code.getId(), cachedCode);
+ CODE_DATA_CACHE.put(code.getData(), this.copyCode(cachedCode));
}
private Code copyCode(Code code) {
--
Gitblit v1.9.1