设备秘钥bug
This commit is contained in:
@@ -885,11 +885,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
||||
private void coderM3d(Device deviceDetail, Boolean updateFlag) {
|
||||
if (updateFlag) {
|
||||
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()));
|
||||
}
|
||||
|
||||
if (StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())) {
|
||||
if (!Objects.equals(deviceRes.getSeries(),deviceDetail.getSeries())) {
|
||||
deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries()));
|
||||
}
|
||||
} else {
|
||||
@@ -900,7 +899,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
||||
deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries()));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void decoderM3d(Device deviceDetail) {
|
||||
|
||||
Reference in New Issue
Block a user