diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java
index 7481241..a2c6e0a 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.fastbee.common.core.controller.BaseController;
 import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.page.TableDataInfo;
-import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic;
-import com.fastbee.deviceData.domain.DeviceRealtimedataWorms;
+import com.fastbee.deviceData.domain.*;
 import com.fastbee.deviceData.mapper.*;
 import org.redisson.config.BaseConfig;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +24,6 @@ public class DeviceHistoryDataController extends BaseController {
     @Autowired
     private DeviceRealtimedataWormsMapper deviceRealtimedataWormsMapper;
 
-    @Autowired
-    private DeviceRealtimedataPhotovoltaicMapper deviceRealtimedataPhotovoltaicMapper;
-
     @Autowired
     private DeviceRealtimedataMoistureMapper deviceRealtimedataMoistureMapper;
 
@@ -50,23 +46,38 @@ public class DeviceHistoryDataController extends BaseController {
         //虫害列表
         return getDataTable(list);
     }
-    /**
-     * 获取墒情设备历史数据
-     */
-    @GetMapping("/moisture/{deviceId}")
-    public AjaxResult getMoistureHistoryData(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic){
 
-        List<DeviceRealtimedataPhotovoltaic> list = new LambdaQueryChainWrapper<>(deviceRealtimedataPhotovoltaicMapper)
-                .eq(DeviceRealtimedataPhotovoltaic::getDeviceId,deviceRealtimedataPhotovoltaic.getDeviceId()).list();
-        return success(list);
-    }
     /**
      * 获取气象设备历史数据
      */
-    @GetMapping("/meteorology/{deviceId}")
-    public AjaxResult getMeteorologyHistoryData(String deviceId){
-        return null;
+    @GetMapping("/meteorology")
+    public TableDataInfo getMeteorologyHistoryData(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology){
+        startPage();
+        List<DeviceRealtimedataMeteorology> list = new LambdaQueryChainWrapper<>(deviceRealtimedataMeteorologyMapper)
+                .eq(DeviceRealtimedataMeteorology::getDeviceId,deviceRealtimedataMeteorology.getDeviceId()).list();
+        return getDataTable(list);
     }
+    /**
+     * 获取墒情实时数据
+     */
+    @GetMapping("/moisture")
+    public TableDataInfo getMoistureHistoryData(DeviceRealtimedataMoisture deviceRealtimedataMoisture){
+        startPage();
+        List<DeviceRealtimedataMoisture> list = new LambdaQueryChainWrapper<>(deviceRealtimedataMoistureMapper)
+                .eq(DeviceRealtimedataMoisture::getDeviceId,deviceRealtimedataMoisture.getDeviceId()).list();
+        return getDataTable(list);
+    }
+    /**
+     * 获取苗青实时数据
+     */
+    @GetMapping("/miaoqing")
+    public TableDataInfo getMiaoqingHistoryData(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing){
+        startPage();
+        List<DeviceRealtimedataMiaoqing> list = new LambdaQueryChainWrapper<>(deviceRealtimedataMiaoqingMapper)
+                .eq(DeviceRealtimedataMiaoqing::getDeviceId,deviceRealtimedataMiaoqing.getDeviceId()).list();
+        return getDataTable(list);
+    }
+