|
@@ -65,6 +65,7 @@ public class IotController {
|
|
|
if(ObjectUtil.isNull(source.getRunState())){
|
|
if(ObjectUtil.isNull(source.getRunState())){
|
|
|
throw new CustomException("[runState]设备运行状态不能为空");
|
|
throw new CustomException("[runState]设备运行状态不能为空");
|
|
|
}
|
|
}
|
|
|
|
|
+ source.setTest(false);
|
|
|
executorService.execute(()->{
|
|
executorService.execute(()->{
|
|
|
BusDeviceEntity device = new BusDeviceEntity();
|
|
BusDeviceEntity device = new BusDeviceEntity();
|
|
|
device.setStatus(DeviceStatusEnum2.ONLINE);
|
|
device.setStatus(DeviceStatusEnum2.ONLINE);
|
|
@@ -79,7 +80,8 @@ public class IotController {
|
|
|
hospitalLog.setTenantId(device.getTenantId());
|
|
hospitalLog.setTenantId(device.getTenantId());
|
|
|
long startTime = System.currentTimeMillis();
|
|
long startTime = System.currentTimeMillis();
|
|
|
try {
|
|
try {
|
|
|
- iotMsgHandler.sync(source,source.getDeviceId());
|
|
|
|
|
|
|
+ BusDeviceRunningEntity sync = iotMsgHandler.sync(source, source.getDeviceId());
|
|
|
|
|
+ hospitalLog.setResult(JSONUtil.toJsonStr(sync));
|
|
|
hospitalLog.setSuccess(true);
|
|
hospitalLog.setSuccess(true);
|
|
|
}catch (Exception e) {
|
|
}catch (Exception e) {
|
|
|
hospitalLog.setSuccess(false);
|
|
hospitalLog.setSuccess(false);
|