Merge remote-tracking branch 'origin/master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -105,8 +105,8 @@ public class MercMiniDeviceController {
             DeviceStatusDto.Vo deviceStatus = vo.getDeviceStatus();
             vo.setNetStateName(deviceStatus == null ? StrUtil.EMPTY : DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
 
-            Integer deviceStateL = deviceStatus.getDeviceStateL();
-            Integer deviceStateR = deviceStatus.getDeviceStateR();
+            Integer deviceStateL = deviceStatus.getLockStateL();
+            Integer deviceStateR = deviceStatus.getLockStateR();
             vo.setDeviceStateL(deviceStateL);
             vo.setDeviceStateR(deviceStateR);
             DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -630,8 +630,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     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.setDeviceStateR(deviceStateR);
                 DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
@@ -731,8 +731,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 merHomeSearchVO.setAppUpmVersion(deviceSysinfo.getAppUpmVersion());
                 merHomeSearchVO.setTempValue(deviceStatus.getTempValue());
                 merHomeSearchVO.setNetDbm(deviceStatus.getNetDbm());
-                Integer deviceStateL = deviceStatus.getDeviceStateL();
-                Integer deviceStateR = deviceStatus.getDeviceStateR();
+                Integer deviceStateL = deviceStatus.getLockStateL();
+                Integer deviceStateR = deviceStatus.getLockStateR();
                 merHomeSearchVO.setDeviceStateL(deviceStateL);
                 merHomeSearchVO.setDeviceStateR(deviceStateR);
                 DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);