设备列表显示温度

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

@@ -12,7 +12,6 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -48,6 +47,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jodd.introspector.MapperFunction;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -72,6 +72,7 @@ import static com.xy.utils.PlusBeans.*;
  * @author lijin
  * @since 2022-12-23
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Api(tags = "设备-信息")
@@ -745,7 +746,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         } else {
             return R.ok(new ArrayList<>());
         }
-        System.out.println("deviceIdList---------" + JSONUtil.toJsonPrettyStr(deviceIdList));
 
 
         List<DeviceInfoDto.MercHomeCountVO> list = this.baseMapper.merHomeCountList(dto);
@@ -844,6 +844,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 if (deviceStatus != null) {
                     Integer deviceStateL = deviceStatus.getLockStateL();
                     Integer deviceStateR = deviceStatus.getLockStateR();
+                    device.setTempValue(deviceStatus.getTempValue());
                     device.setDeviceStateL(deviceStateL);
                     device.setDeviceStateR(deviceStateR);
                     DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);

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

@@ -716,6 +716,9 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class MercHomeDeviceVo {
 
+        @ApiModelProperty("温度值")
+        private Integer tempValue;
+
         @ApiModelProperty("设备id")
         private Long deviceId;