vertoryao/iot-gateway
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(iot): 重构设备服务调用接口

Browse Source 
- 修改参数处理方式，使用 JSONObject 替代 JSONArray
- 优化参数的获取和组装逻辑，使用 identifier 和 uint 字段
- 修复 deviceId 的获取方式，使用 device 对象替代参数
- 添加 uint 字段到 ParamDto 类
This commit is contained in:
zhuangtianxiang 2025-03-03 13:14:16 +08:00
parent 662d34da11
commit 1481dbd95e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
View File

@ -231,18 +231,17 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
Serve serve = serveService.detail(serve1.getId()); Serve serve = serveService.detail(serve1.getId());
List<Param> params = serve.getInputs(); List<Param> params = serve.getInputs();
params.addAll(serve.getOutputs()); params.addAll(serve.getOutputs());
JSONArray paramArray = new JSONArray(); JSONObject parasJson = new JSONObject();
for (Param param : params) { for (Param param : params) {
JSONObject paramJson = new JSONObject(); parasJson.put(param.getIdentifier(), param.getUint());
paramJson.put("name", param.getName()); log.info("Param identifier: {}, uint: {}", param.getIdentifier(), param.getUint());
paramArray.add(paramJson);
} }
JSONObject payloadJson = new JSONObject(); JSONObject payloadJson = new JSONObject();
payloadJson.put("mid", 641); payloadJson.put("mid", 641);
payloadJson.put("serviceId", serve.getId()); payloadJson.put("serviceId", serve.getId());
payloadJson.put("deviceId", deviceId); payloadJson.put("deviceId", device.getId());
payloadJson.put("cmd", "runParam"); payloadJson.put("cmd", "runParam");
payloadJson.put("paras", paramArray); payloadJson.put("paras", parasJson);
payloadJson.put("msgType", "cloudReq"); payloadJson.put("msgType", "cloudReq");
String payload = payloadJson.toString(); String payload = payloadJson.toString();
boolean sendSuccess = true; boolean sendSuccess = true;
@ -261,4 +260,5 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
return responseJson.toString(); return responseJson.toString();
} }
} }

2
src/main/java/com/zsc/edu/gateway/modules/iot/tsl/dto/ParamDto.java
View File

@ -16,6 +16,8 @@ public class ParamDto {
public String name; public String name;
public String uint;
public String identifier; public String identifier;
public String remark; public String remark;