|
@ -796,7 +796,8 @@ public class DcDeviceController extends BaseController { |
|
|
results.sort(Comparator.comparing(hashMap -> hashMap.get("timestamp"))); |
|
|
results.sort(Comparator.comparing(hashMap -> hashMap.get("timestamp"))); |
|
|
return AjaxResult.success(results); |
|
|
return AjaxResult.success(results); |
|
|
} |
|
|
} |
|
|
if (UniversalEnum.THREE.getValue().equals(deviceType)||UniversalEnum.SEVENTEEN.getValue().equals(deviceType)){ //气象预警/ups设备
|
|
|
if (UniversalEnum.THREE.getValue().equals(deviceType)||UniversalEnum.SEVENTEEN.getValue().equals(deviceType)|| |
|
|
|
|
|
UniversalEnum.FIFTEEN.getValue().equals(deviceType)){ //气象预警/ups设备/太阳能板
|
|
|
JSONObject data = (JSONObject) ajaxResult.get("data"); |
|
|
JSONObject data = (JSONObject) ajaxResult.get("data"); |
|
|
JSONArray dataValue = (JSONArray) data.get("data"); |
|
|
JSONArray dataValue = (JSONArray) data.get("data"); |
|
|
List<JSONObject> jsonObjectList = dataValue.toJavaList(JSONObject.class); |
|
|
List<JSONObject> jsonObjectList = dataValue.toJavaList(JSONObject.class); |
|
|