|
@@ -630,8 +630,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
device.setNetStateName(DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
|
|
device.setNetStateName(DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
|
|
}
|
|
}
|
|
|
|
|
|
- Integer deviceStateL = deviceStatus.getDeviceStateL();
|
|
|
|
- Integer deviceStateR = deviceStatus.getDeviceStateR();
|
|
|
|
|
|
+ Integer deviceStateL = deviceStatus.getLockStateL();
|
|
|
|
+ Integer deviceStateR = deviceStatus.getLockStateR();
|
|
device.setDeviceStateL(deviceStateL);
|
|
device.setDeviceStateL(deviceStateL);
|
|
device.setDeviceStateR(deviceStateR);
|
|
device.setDeviceStateR(deviceStateR);
|
|
DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
|
|
DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
|
|
@@ -731,8 +731,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
merHomeSearchVO.setAppUpmVersion(deviceSysinfo.getAppUpmVersion());
|
|
merHomeSearchVO.setAppUpmVersion(deviceSysinfo.getAppUpmVersion());
|
|
merHomeSearchVO.setTempValue(deviceStatus.getTempValue());
|
|
merHomeSearchVO.setTempValue(deviceStatus.getTempValue());
|
|
merHomeSearchVO.setNetDbm(deviceStatus.getNetDbm());
|
|
merHomeSearchVO.setNetDbm(deviceStatus.getNetDbm());
|
|
- Integer deviceStateL = deviceStatus.getDeviceStateL();
|
|
|
|
- Integer deviceStateR = deviceStatus.getDeviceStateR();
|
|
|
|
|
|
+ Integer deviceStateL = deviceStatus.getLockStateL();
|
|
|
|
+ Integer deviceStateR = deviceStatus.getLockStateR();
|
|
merHomeSearchVO.setDeviceStateL(deviceStateL);
|
|
merHomeSearchVO.setDeviceStateL(deviceStateL);
|
|
merHomeSearchVO.setDeviceStateR(deviceStateR);
|
|
merHomeSearchVO.setDeviceStateR(deviceStateR);
|
|
DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
|
|
DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
|