mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化设备功能调用返回内容逻辑

develop
zhaoxianglong 9 months ago
parent
8abda21eb4
commit
65837ede55
1 changed files with 54 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

107
zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
View File

@ -570,69 +570,70 @@ public class DcDeviceController extends BaseController {
} }
} }
break; } else {
}
JSONObject mdJSONObject = (JSONObject) JSON.toJSON(getDeviceLatestProperty(iotDeviceId, UniversalEnum.MD.getValue()).get("data"));
String mdValue = mdJSONObject.getString("value"); JSONObject mdJSONObject = (JSONObject) JSON.toJSON(getDeviceLatestProperty(iotDeviceId, UniversalEnum.MD.getValue()).get("data"));
JSONObject tmJSONObject = (JSONObject) JSON.toJSON(getDeviceLatestProperty(iotDeviceId, UniversalEnum.TM.getValue()).get("data")); String mdValue = mdJSONObject.getString("value");
String tmValue = tmJSONObject.getString("value"); JSONObject tmJSONObject = (JSONObject) JSON.toJSON(getDeviceLatestProperty(iotDeviceId, UniversalEnum.TM.getValue()).get("data"));
for (Object function : functions) { String tmValue = tmJSONObject.getString("value");
JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function);
//JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function.toString()) ; for (Object function : functions) {
String functionId = functionJSONObject.getString("functionId"); JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function);
if (continueToExecute) { //JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function.toString()) ;
JSONObject jsonObject = functionJSONObject.getJSONObject("params") != null ? functionJSONObject.getJSONObject("params") : new JSONObject(); String functionId = functionJSONObject.getString("functionId");
JSONObject result = getResult(device, iotDeviceId, functionId, jsonObject); if (continueToExecute) {
resultArray.add(result); JSONObject jsonObject = functionJSONObject.getJSONObject("params") != null ? functionJSONObject.getJSONObject("params") : new JSONObject();
AjaxResult ajaxResult = (AjaxResult) result.get("result"); JSONObject result = getResult(device, iotDeviceId, functionId, jsonObject);
if (!Objects.equals(String.valueOf(ajaxResult.get("code")), UniversalEnum.TWO_HUNDRED.getValue())) {
continueToExecute = false;
if (Objects.equals(device.getString("deviceType"), UniversalEnum.FIFTEEN.getValue())) {
return AjaxResult.error(UniversalEnum.TWO_HUNDRED.getNumber(), UniversalEnum.FIVE_HUNDRED.getValue());
}
}
} else {
List<Object> collect = resultArray.stream().filter(item -> Objects.equals(((JSONObject) JSON.toJSON(item)).getString("device"), device.getString("id"))).collect(Collectors.toList());
if (collect.size() == UniversalEnum.ZERO.getNumber()) {
JSONObject result = new JSONObject();
result.put("device", device.getString("id"));
result.put("deviceType", device.getInteger("deviceType"));
result.put("functionId", functionId);
result.put("result", AjaxResult.error());
resultArray.add(result); resultArray.add(result);
AjaxResult ajaxResult = (AjaxResult) result.get("result");
if (!Objects.equals(String.valueOf(ajaxResult.get("code")), UniversalEnum.TWO_HUNDRED.getValue())) {
continueToExecute = false;
if (Objects.equals(device.getString("deviceType"), UniversalEnum.FIFTEEN.getValue())) {
return AjaxResult.error(UniversalEnum.TWO_HUNDRED.getNumber(), UniversalEnum.FIVE_HUNDRED.getValue());
}
}
} else { } else {
for (int i = UniversalEnum.ZERO.getNumber(); i < resultArray.size(); i++) { List<Object> collect = resultArray.stream().filter(item -> Objects.equals(((JSONObject) JSON.toJSON(item)).getString("device"), device.getString("id"))).collect(Collectors.toList());
JSONObject jsonObject = (JSONObject) JSON.toJSON(resultArray.get(i)); if (collect.size() == UniversalEnum.ZERO.getNumber()) {
if (!Objects.equals(jsonObject.getString("device"), device.getString("id"))) { JSONObject result = new JSONObject();
JSONObject result = jsonObject.getJSONObject("result"); result.put("device", device.getString("id"));
if (!Objects.equals(result.getString("code"), UniversalEnum.TWO_HUNDRED.getValue())) { result.put("deviceType", device.getInteger("deviceType"));
break; result.put("functionId", functionId);
result.put("result", AjaxResult.error());
resultArray.add(result);
} else {
for (int i = UniversalEnum.ZERO.getNumber(); i < resultArray.size(); i++) {
JSONObject jsonObject = (JSONObject) JSON.toJSON(resultArray.get(i));
if (!Objects.equals(jsonObject.getString("device"), device.getString("id"))) {
JSONObject result = jsonObject.getJSONObject("result");
if (!Objects.equals(result.getString("code"), UniversalEnum.TWO_HUNDRED.getValue())) {
break;
} else {
result.put("code", UniversalEnum.FIVE_HUNDRED.getValue());
jsonObject.put("result", result);
resultArray.add(i, jsonObject);
}
} else { } else {
result.put("code", UniversalEnum.FIVE_HUNDRED.getValue()); break;
jsonObject.put("result", result);
resultArray.add(i, jsonObject);
} }
} else {
break;
} }
}
} }
if (Objects.equals(functionId, UniversalEnum.SETMD.getValue())) { if (Objects.equals(functionId, UniversalEnum.SETMD.getValue())) {
JSONObject jsonObjectMD = new JSONObject(); JSONObject jsonObjectMD = new JSONObject();
jsonObjectMD.put(UniversalEnum.SET.getValue(), mdValue); jsonObjectMD.put(UniversalEnum.SET.getValue(), mdValue);
getAjaxResult(iotDeviceId, functionId, jsonObjectMD.toJavaObject(new TypeReference<HashMap<String, Object>>() { getAjaxResult(iotDeviceId, functionId, jsonObjectMD.toJavaObject(new TypeReference<HashMap<String, Object>>() {
})); }));
} }
if (Objects.equals(functionId, UniversalEnum.SETTM.getValue())) { if (Objects.equals(functionId, UniversalEnum.SETTM.getValue())) {
JSONObject jsonObjectTM = new JSONObject(); JSONObject jsonObjectTM = new JSONObject();
jsonObjectTM.put(UniversalEnum.SET.getValue(), tmValue); jsonObjectTM.put(UniversalEnum.SET.getValue(), tmValue);
getAjaxResult(iotDeviceId, functionId, jsonObjectTM.toJavaObject(new TypeReference<HashMap<String, Object>>() { getAjaxResult(iotDeviceId, functionId, jsonObjectTM.toJavaObject(new TypeReference<HashMap<String, Object>>() {
})); }));
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save