From 3d6372cee9b0c414667c8dd326e9d0864bb4b94d Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Mon, 18 Nov 2024 08:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=A2=92=E6=83=85=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...viceRealtimedataMeteorologyController.java | 5 ++++ .../DeviceRealtimedataMoistureController.java | 24 +++++++++++++++++++ .../domain/DeviceRealtimedataMoisture.java | 3 +-- .../IDeviceRealtimedataMoistureService.java | 6 +++++ ...DeviceRealtimedataMoistureServiceImpl.java | 12 ++++++++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMoistureController.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMeteorologyController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMeteorologyController.java index 60a3f7e..9a011af 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMeteorologyController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMeteorologyController.java @@ -13,6 +13,11 @@ public class DeviceRealtimedataMeteorologyController { @Autowired private DeviceRealtimedataMeteorologyServiceImpl deviceRealtimedataMeteorologyService; + + /** + * 获取最新的一条气象数据 + * @return + */ @GetMapping(value = "/weather/realtimedata") public AjaxResult getLatestWeatherRealtimedata() { return AjaxResult.success(deviceRealtimedataMeteorologyService.getLatestWeatherRealtimedata()); diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMoistureController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMoistureController.java new file mode 100644 index 0000000..6ec6dca --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceData/DeviceRealtimedataMoistureController.java @@ -0,0 +1,24 @@ +package com.fastbee.data.controller.deviceData; + +import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.deviceData.service.impl.DeviceRealtimedataMoistureServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController() +@RequestMapping("/moisture") +public class DeviceRealtimedataMoistureController { + @Autowired + private DeviceRealtimedataMoistureServiceImpl deviceRealtimedataMoistureServiceImpl; + + /** + * 获取最新一条墒情数据 + * @return + */ + @GetMapping("/weather/realtimedata") + public AjaxResult getLatestWeatherRealtimedata() { + return AjaxResult.success(deviceRealtimedataMoistureServiceImpl.getLatestWeatherRealtimedata()); + } +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java index 74eeafc..54fe165 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java @@ -23,9 +23,8 @@ import com.fastbee.common.core.domain.BaseEntity; @Builder @AllArgsConstructor @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) @TableName("iot_device_realtimedata_moisture") -public class DeviceRealtimedataMoisture extends BaseEntity +public class DeviceRealtimedataMoisture { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java index 45ded44..bc3befe 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java @@ -58,4 +58,10 @@ public interface IDeviceRealtimedataMoistureService * @return 结果 */ public int deleteDeviceRealtimedataMoistureById(Long id); + + /** + * 获取最新一条墒情数据 + * @return + */ + public DeviceRealtimedataMoisture getLatestWeatherRealtimedata(); } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java index 9691226..dad7ee5 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java @@ -1,6 +1,8 @@ package com.fastbee.deviceData.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fastbee.deviceData.mapper.DeviceRealtimedataMoistureMapper; @@ -90,4 +92,14 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat { return deviceRealtimedataMoistureMapper.deleteDeviceRealtimedataMoistureById(id); } + /** + * 获取最新一条墒情数据 + * @return + */ + public DeviceRealtimedataMoisture getLatestWeatherRealtimedata(){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.orderByDesc("real_time"); + queryWrapper.last("limit 1"); + return deviceRealtimedataMoistureMapper.selectOne(queryWrapper); + } }