From f713377299af992ffcdc41270c017e54e3e79a98 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 11 Oct 2025 16:22:31 +0800
Subject: [PATCH] 修改调用的字段名organizationGet、BindDeviceReceiver的字段名
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index 0609536..c75090c 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -735,7 +735,8 @@
BindDeviceReceiver dock = null;
BindDeviceReceiver drone = null;
for (BindDeviceReceiver device : devices) {
- int val = Integer.parseInt(device.getDeviceModelKey().split("-")[0]);
+ int val = Integer.parseInt(device.getDevice_model_key().split("-")[0]);
+ // .getDeviceModelKey()
if (val == DeviceDomainEnum.DOCK.getVal()) {
dock = device;
}
@@ -1003,7 +1004,8 @@
if (receiver == null) {
return Optional.empty();
}
- int[] droneKey = Arrays.stream(receiver.getDeviceModelKey().split("-")).mapToInt(Integer::parseInt).toArray();
+ int[] droneKey = Arrays.stream(receiver.getDevice_model_key().split("-")).mapToInt(Integer::parseInt).toArray();
+ //.getDeviceModelKey()
Optional<DeviceDictionaryDTO> dictionaryOpt = dictionaryService.getOneDictionaryInfoByTypeSubType(domain,
droneKey[1], droneKey[2]);
DeviceEntity.DeviceEntityBuilder builder = DeviceEntity.builder();
@@ -1013,7 +1015,7 @@
.nickname(entity.getDeviceName())
.deviceDesc(entity.getDeviceDesc()));
- SysDept sysDept = sysDeptService.selectDeptByBindCode(receiver.getDeviceBindingCode());
+ SysDept sysDept = sysDeptService.selectDeptByBindCode(receiver.getDevice_binding_code()); //.getDeviceBindingCode()
DeviceEntity entity = builder
.deptId(sysDept.getDeptId())
.domain(droneKey[0])
@@ -1026,8 +1028,9 @@
.urlSelect(IconUrlEnum.SELECT_EQUIPMENT.getUrl())
.urlNormal(IconUrlEnum.NORMAL_EQUIPMENT.getUrl())
.build();
- if (StringUtils.hasText(receiver.getDeviceCallsign())) {
- entity.setNickname(receiver.getDeviceCallsign());
+ if (StringUtils.hasText(receiver.getDevice_callsign())) {
+ //.getDeviceCallsign()
+ entity.setNickname(receiver.getDevice_callsign());
}
return Optional.of(entity);
}
@@ -1104,13 +1107,14 @@
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC).toString() + TopicConst._REPLY_SUF;
- if (!StringUtils.hasText(organizationGet.getDeviceBindingCode())) {
+ if (!StringUtils.hasText(organizationGet.getDevice_binding_code())) {
+ // .getDeviceBindingCode()
builder.data(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT));
messageSender.publish(topic, builder.build());
return;
}
- SysDept sysDept = sysDeptService.selectDeptByBindCode(organizationGet.getDeviceBindingCode());
+ SysDept sysDept = sysDeptService.selectDeptByBindCode(organizationGet.getDevice_binding_code());
if (sysDept == null) {
builder.data(RequestsReply.error(CommonErrorEnum.GET_ORGANIZATION_FAILED));
messageSender.publish(topic, builder.build());
--
Gitblit v1.9.3