Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

设备秘钥bug

Browse Source
This commit is contained in:
cdf
2026-03-18 17:55:46 +08:00
parent c0db2cf961
commit 475ca820c8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java
View File

@@ -885,11 +885,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
private void coderM3d(Device deviceDetail, Boolean updateFlag) { private void coderM3d(Device deviceDetail, Boolean updateFlag) {
if (updateFlag) { if (updateFlag) {
Device deviceRes = deviceMapper.selectById(deviceDetail.getId()); Device deviceRes = deviceMapper.selectById(deviceDetail.getId());
if (StrUtil.isNotBlank(deviceDetail.getDevKey()) && !deviceRes.getDevKey().equals(deviceDetail.getDevKey())) { if (!Objects.equals(deviceRes.getDevKey(),deviceDetail.getDevKey())) {
deviceDetail.setDevKey(DeviceUtil.encodeString(devCD, deviceDetail.getDevKey())); deviceDetail.setDevKey(DeviceUtil.encodeString(devCD, deviceDetail.getDevKey()));
} }
if (!Objects.equals(deviceRes.getSeries(),deviceDetail.getSeries())) {
if (StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())) {
deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries())); deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries()));
} }
} else { } else {
@@ -900,7 +899,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries())); deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries()));
} }
} }
} }
private void decoderM3d(Device deviceDetail) { private void decoderM3d(Device deviceDetail) {