设备详情反显通电状态

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

@@ -158,6 +158,7 @@ public class MercMiniDeviceController {
 
                 Integer deviceStateL = deviceStatus.getLockStateL();
                 Integer deviceStateR = deviceStatus.getLockStateR();
+                vo.setSysPower(deviceStatus.getSysPower());
                 vo.setDeviceStateL(deviceStateL);
                 vo.setDeviceStateR(deviceStateR);
                 DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);

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

@@ -813,7 +813,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             Long districtId = v.getDistrictId();
             vo.setDeviceNum(v.getDeviceNum());
             vo.setDistrictId(v.getDistrictId());
-            vo.setDistrictName(v.getDistrictId()==-1L ? "未分配区域" : districtMap.get(v.getDistrictId()));
+            vo.setDistrictName(v.getDistrictId() == -1L ? "未分配区域" : districtMap.get(v.getDistrictId()));
             //区域下的设备列表
             List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(districtId), DeviceInfoDto.MercHomeDeviceVo.class);
             if (CollUtil.isEmpty(deviceInfos)) {
@@ -888,6 +888,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setTempValue(deviceStatus.getTempValue());
                     device.setDeviceStateL(deviceStateL);
                     device.setDeviceStateR(deviceStateR);
+                    device.setSysPower(deviceStatus.getSysPower());
                     DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
                     DeviceLockState deviceLockStateR = DeviceLockState.getEnumByCode(deviceStateR);
                     device.setDeviceStateRName(deviceLockStateR == null ? "未知" : deviceLockStateR.getDescription());

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -298,6 +298,9 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class Vo {
 
+        @ApiModelProperty("通电状态")
+        private Integer sysPower;
+        
         @ApiModelProperty("左门锁机状态名称")
         private String deviceStateLName;
 
@@ -824,7 +827,7 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("右门锁机状态，字典类型：devcie_lock_status")
         private Integer deviceStateR;
-        
+
         @ApiModelProperty("通电状态")
         private Integer sysPower;