From a122df4763682eb20d01411172d1b56327a4dc92 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 9 Dec 2024 11:47:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=A3=85=E7=BD=AE=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E8=A7=A3=E5=AF=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/TerminalBaseServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 61e24f29e..34a2c78ac 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -121,6 +121,11 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple @Value("${oracle.syncLedgerDeleteLine}") private String urlDelete; + @Value("${devCD:0}") + private Integer devCD; + + + /** * 终端新增操作 * @@ -810,18 +815,18 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple private void coderM3d(Device deviceDetail){ if(StrUtil.isNotBlank(deviceDetail.getDevKey())){ - deviceDetail.setDevKey(DeviceUtil.encodeString(1,deviceDetail.getDevKey())); + deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey())); } if(StrUtil.isNotBlank(deviceDetail.getSeries())){ - deviceDetail.setSeries(DeviceUtil.encodeString(1,deviceDetail.getSeries())); + deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries())); } } private void decoderM3d(Device deviceDetail){ if(StrUtil.isNotBlank(deviceDetail.getDevKey())){ - deviceDetail.setDevKey(DeviceUtil.decoderString(1,deviceDetail.getDevKey())); + deviceDetail.setDevKey(DeviceUtil.decoderString(devCD,deviceDetail.getDevKey())); } if(StrUtil.isNotBlank(deviceDetail.getSeries())){ - deviceDetail.setSeries(DeviceUtil.decoderString(1,deviceDetail.getSeries())); + deviceDetail.setSeries(DeviceUtil.decoderString(devCD,deviceDetail.getSeries())); } }