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())); } }