Commit bb165784 authored by wujipeng's avatar wujipeng
Browse files

优化接口

parent bd2f99b8
......@@ -25,7 +25,7 @@ public class EquipmentController {
return Result.success(equipmentService.getDeviceDataByDeviceId(deviceId));
}
@ApiOperation(value = "根据设备id查询设备信息")
@ApiOperation(value = "根据设备id查询设备信息和最新的一条上报信息")
@GetMapping("/info/{deviceId}")
public Result getDeviceInfoByDeviceId(@PathVariable String deviceId) {
return Result.success(equipmentService.getDeviceInfoByDeviceId(deviceId));
......
......@@ -16,4 +16,7 @@ public class EquipmentVO extends EquipmentEntity {
@ApiModelProperty(value = "液位状态 0:没超过阀值 1:超过阀值")
private Integer liquidLevelStatus;
@ApiModelProperty(value = "最新一条上报信息")
private DeviceVO deviceVO;
}
package com.ruzhoukj.rx.service.impl;
import ch.qos.logback.classic.spi.EventArgUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.common.NumberConstant;
import com.ruzhoukj.rx.dao.DeviceDao;
......@@ -32,7 +33,12 @@ public class EquipmentServiceImpl
@Override
public EquipmentVO getDeviceInfoByDeviceId(String deviceId) {
return baseMapper.getDeviceInfoByDeviceId(deviceId);
EquipmentVO equipmentVO = baseMapper.getDeviceInfoByDeviceId(deviceId);
DeviceVO deviceVO = deviceDao.findTopByDeviceIdOrderByTimestampDesc(deviceId);
if(equipmentVO != null && deviceVO != null){
equipmentVO.setDeviceVO(deviceVO);
}
return equipmentVO;
}
@Override
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment