From 65837ede55861bd15d5c9f0491e8d722f805b896 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Thu, 18 Jul 2024 15:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E7=94=A8=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcDeviceController.java | 107 +++++++++--------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java index aae52723..25b62aaa 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java @@ -570,69 +570,70 @@ public class DcDeviceController extends BaseController { } } - break; - } - JSONObject mdJSONObject = (JSONObject) JSON.toJSON(getDeviceLatestProperty(iotDeviceId, UniversalEnum.MD.getValue()).get("data")); + } else { - 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) { - JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function); - //JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function.toString()) ; - String functionId = functionJSONObject.getString("functionId"); - if (continueToExecute) { - JSONObject jsonObject = functionJSONObject.getJSONObject("params") != null ? functionJSONObject.getJSONObject("params") : new JSONObject(); - JSONObject result = getResult(device, iotDeviceId, functionId, jsonObject); - 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 { - List 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()); + String tmValue = tmJSONObject.getString("value"); + + for (Object function : functions) { + JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function); + //JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function.toString()) ; + String functionId = functionJSONObject.getString("functionId"); + if (continueToExecute) { + JSONObject jsonObject = functionJSONObject.getJSONObject("params") != null ? functionJSONObject.getJSONObject("params") : new JSONObject(); + JSONObject result = getResult(device, iotDeviceId, functionId, jsonObject); 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 { - 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; + List 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); + } 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 { - result.put("code", UniversalEnum.FIVE_HUNDRED.getValue()); - jsonObject.put("result", result); - resultArray.add(i, jsonObject); + break; } - } else { - break; } - } - } - if (Objects.equals(functionId, UniversalEnum.SETMD.getValue())) { - JSONObject jsonObjectMD = new JSONObject(); - jsonObjectMD.put(UniversalEnum.SET.getValue(), mdValue); - getAjaxResult(iotDeviceId, functionId, jsonObjectMD.toJavaObject(new TypeReference>() { - })); - } - if (Objects.equals(functionId, UniversalEnum.SETTM.getValue())) { - JSONObject jsonObjectTM = new JSONObject(); - jsonObjectTM.put(UniversalEnum.SET.getValue(), tmValue); - getAjaxResult(iotDeviceId, functionId, jsonObjectTM.toJavaObject(new TypeReference>() { - })); + } + if (Objects.equals(functionId, UniversalEnum.SETMD.getValue())) { + JSONObject jsonObjectMD = new JSONObject(); + jsonObjectMD.put(UniversalEnum.SET.getValue(), mdValue); + getAjaxResult(iotDeviceId, functionId, jsonObjectMD.toJavaObject(new TypeReference>() { + })); + } + if (Objects.equals(functionId, UniversalEnum.SETTM.getValue())) { + JSONObject jsonObjectTM = new JSONObject(); + jsonObjectTM.put(UniversalEnum.SET.getValue(), tmValue); + getAjaxResult(iotDeviceId, functionId, jsonObjectTM.toJavaObject(new TypeReference>() { + })); + } } } }