From 1481dbd95eeef631f5506d3a278831690fab027b Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Mon, 3 Mar 2025 13:14:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E9=87=8D=E6=9E=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改参数处理方式，使用 JSONObject 替代 JSONArray - 优化参数的获取和组装逻辑，使用 identifier 和 uint 字段 - 修复 deviceId 的获取方式，使用 device 对象替代参数 - 添加 uint 字段到 ParamDto 类 --- .../iot/device/service/impl/DeviceServiceImpl.java | 12 ++++++------ .../edu/gateway/modules/iot/tsl/dto/ParamDto.java | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java index 6ed1301..bc7542e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java @@ -231,18 +231,17 @@ public class DeviceServiceImpl extends ServiceImpl imp Serve serve = serveService.detail(serve1.getId()); List params = serve.getInputs(); params.addAll(serve.getOutputs()); - JSONArray paramArray = new JSONArray(); + JSONObject parasJson = new JSONObject(); for (Param param : params) { - JSONObject paramJson = new JSONObject(); - paramJson.put("name", param.getName()); - paramArray.add(paramJson); + parasJson.put(param.getIdentifier(), param.getUint()); + log.info("Param identifier: {}, uint: {}", param.getIdentifier(), param.getUint()); } JSONObject payloadJson = new JSONObject(); payloadJson.put("mid", 641); payloadJson.put("serviceId", serve.getId()); - payloadJson.put("deviceId", deviceId); + payloadJson.put("deviceId", device.getId()); payloadJson.put("cmd", "runParam"); - payloadJson.put("paras", paramArray); + payloadJson.put("paras", parasJson); payloadJson.put("msgType", "cloudReq"); String payload = payloadJson.toString(); boolean sendSuccess = true; @@ -261,4 +260,5 @@ public class DeviceServiceImpl extends ServiceImpl imp return responseJson.toString(); } + } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/dto/ParamDto.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/dto/ParamDto.java index 71f1ce0..fe03bcc 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/dto/ParamDto.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/dto/ParamDto.java @@ -16,6 +16,8 @@ public class ParamDto { public String name; + public String uint; + public String identifier; public String remark;