diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataSeedlingGrowthController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataSeedlingGrowthController.java index 3d0fc4d..5aba478 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataSeedlingGrowthController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataSeedlingGrowthController.java @@ -14,6 +14,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * @author mijiupro + */ @RestController @RequestMapping("/seedlingGrowth") public class DeviceRealtimedataSeedlingGrowthController { diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModelItem/Datatype.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModelItem/Datatype.java index 94c7e32..1fe0bde 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModelItem/Datatype.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModelItem/Datatype.java @@ -2,10 +2,11 @@ package com.fastbee.iot.model.ThingsModelItem; import com.fastbee.iot.model.ThingsModels.ThingsModelValueItem; +import java.io.Serializable; import java.math.BigDecimal; import java.util.List; -public class Datatype +public class Datatype implements Serializable { /** 数据类型 */ private String type; diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModels/ThingsModelValueItem.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModels/ThingsModelValueItem.java index f775b64..87b473a 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModels/ThingsModelValueItem.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ThingsModels/ThingsModelValueItem.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) -public class ThingsModelValueItem { +public class ThingsModelValueItem implements java.io.Serializable{ /** * 物模型唯一标识符 */ diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/DeviceRealTimeDataStorage.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/DeviceRealTimeDataStorage.java index 57e8200..634cd50 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/DeviceRealTimeDataStorage.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/DeviceRealTimeDataStorage.java @@ -204,5 +204,8 @@ public class DeviceRealTimeDataStorage { } + + + } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/impl/ZhanLianDeviceRealTimeDataGetStrategy.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/impl/ZhanLianDeviceRealTimeDataGetStrategy.java index f418175..c0a91b3 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/impl/ZhanLianDeviceRealTimeDataGetStrategy.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/impl/ZhanLianDeviceRealTimeDataGetStrategy.java @@ -43,7 +43,7 @@ public class ZhanLianDeviceRealTimeDataGetStrategy implements DeviceRealTimeData //解析设备对接参数 String devParams = device.getDevParams(); if(StringUtils.isBlank(devParams)){ - throw new RuntimeException("展连设备对接参数为空!设备id为："+device.getDeviceId()); + throw new RuntimeException("展连设备对接参数为空!设备id为："+device.getDeviceId()+"设备序列号为："+device.getSerialNumber()); } JSONArray paramArray = JSONUtil.parseArray(devParams); //解析参数列表建立map @@ -75,7 +75,7 @@ public class ZhanLianDeviceRealTimeDataGetStrategy implements DeviceRealTimeData ZhanLianBaseService zhanLianBaseService = new ZhanLianBaseService(); //请求设备 - System.err.println(reqBody); + // System.err.println(reqBody); JSONObject respObj = zhanLianBaseService.baseRequest(reqBody, authEndpoint); //解析设备实时数据 JSONObject deviceRealTimeData = getDeviceRealTimeData(respObj, deviceId); diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/test11.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/test11.java index 72176f5..6373053 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/test11.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/strategy/test11.java @@ -19,16 +19,17 @@ public class test11 { @GetMapping("/test") public AjaxResult test(){ - String deviceId = "3270"; + String deviceId = "3269"; String deviceBrand = "展连IOT"; // String deviceId = "1017240042"; // String deviceBrand = "仁科"; Long productId = 143L; //获取设备对应数据获取器 DeviceRealTimeDataGetStrategy DataGetMachine = dataGetFactory.getDeviceRealTimeDataGetStrategy(deviceBrand); + System.err.println("获取到设备数据获取器："+DataGetMachine.getClass()); //获取设备实时数据 JSONObject deviceRealTimeData = DataGetMachine.getDeviceRealTimeData(deviceId); - System.err.println(deviceRealTimeData); + System.err.println("实时数据："+deviceRealTimeData); return AjaxResult.success(deviceRealTimeData); } diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/zhanlian/ZhanLianBaseService.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/zhanlian/ZhanLianBaseService.java index b59d502..1b6a0eb 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/zhanlian/ZhanLianBaseService.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/zhanlian/ZhanLianBaseService.java @@ -25,7 +25,7 @@ public class ZhanLianBaseService { String jsonStr = JSONUtil.toJsonStr(body); String respStr = HttpUtil.post(url,jsonStr); JSONObject resp = JSONUtil.parseObj(respStr); - System.err.println(resp); + // System.err.println(resp); if(!resp.getStr("code").equals("200")){ throw new ServiceException("展联基本请求失败！"); }