diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMoistureController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMoistureController.java
index 31a0416..4a75386 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMoistureController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceRealtimedataMoistureController.java
@@ -1,9 +1,13 @@
 package com.fastbee.data.controller.aaScreenAgricultural;
 
 import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture;
 import com.fastbee.deviceData.service.impl.DeviceRealtimedataMoistureServiceImpl;
+import com.fastbee.deviceInfo.service.impl.DeviceInformationMoistureServiceImpl;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,13 +16,19 @@ import org.springframework.web.bind.annotation.RestController;
 public class DeviceRealtimedataMoistureController {
     @Autowired
     private DeviceRealtimedataMoistureServiceImpl deviceRealtimedataMoistureServiceImpl;
-
+    @Autowired
+    private DeviceInformationMoistureServiceImpl deviceInformationMoistureServiceImpl;
     /**
      * 获取最新一条墒情数据
      * @return
      */
     @GetMapping("/weather/realtimedata")
-    public AjaxResult getLatestWeatherRealtimedata() {
-        return AjaxResult.success(deviceRealtimedataMoistureServiceImpl.getLatestWeatherRealtimedata());
+    public AjaxResult getLatestWeatherRealtimedata( String deviceId) {
+        return AjaxResult.success(deviceRealtimedataMoistureServiceImpl.getLatestWeatherRealtimedata(deviceId));
+    }
+
+    @GetMapping("/weather/pullDown")
+    public AjaxResult getLatestWeatherPullDown() {
+        return AjaxResult.success(deviceInformationMoistureServiceImpl.selectDeviceInformationMoistureList(null));
     }
 }
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 9f0c717..83e0dc0 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
@@ -64,5 +64,5 @@ public interface IDeviceRealtimedataMoistureService
      * 获取最新一条墒情数据
      * @return
      */
-    public List<DeviceProperties> getLatestWeatherRealtimedata();
+    public List<DeviceProperties> getLatestWeatherRealtimedata(String deviceId);
 }
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 ad7c8df..8a834d6 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
@@ -100,10 +100,11 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat
      * 获取最新一条墒情数据
      * @return
      */
-    public List<DeviceProperties> getLatestWeatherRealtimedata(){
+    public List<DeviceProperties> getLatestWeatherRealtimedata(String deviceId){
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.orderByDesc("real_time");
         queryWrapper.last("limit 1");
+        queryWrapper.eq("device_id",deviceId);
         DeviceRealtimedataMoisture moisture = deviceRealtimedataMoistureMapper.selectOne(queryWrapper);
         List<Map<String, String>> mapList = new ArrayList<>();
         Map<String, String> map = new HashMap<String, String>();