diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/AlertLogController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/AlertLogController.java
index ed63982..b4535bb 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/AlertLogController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/AlertLogController.java
@@ -1,5 +1,6 @@
 package com.fastbee.data.controller;
 
+import java.util.Comparator;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -53,11 +54,24 @@ public class AlertLogController extends BaseController
     @ApiOperation("查询设备告警列表")
 //    @PreAuthorize("@ss.hasPermi('iot:alertLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(AlertLog alertLog)
+    public AjaxResult list(AlertLog alertLog)
     {
-        startPage();
+//        startPage();
         List<AlertLog> list = alertLogService.selectAlertLogList(alertLog);
-        return getDataTable(list);
+//        获取排序类型
+        String sort = alertLog.getSort();
+        if(sort != null){
+            //对列表进行排序
+            //升序
+            if(sort.equals("1")){
+                list.sort(Comparator.comparing(AlertLog::getCreateTime));
+            }
+            //降序
+            else if(sort.equals("2")){
+                list.sort(Comparator.comparing(AlertLog::getCreateTime).reversed());
+            }
+        }
+        return success(list);
     }
 
     /**
diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java
new file mode 100644
index 0000000..eaa9c3c
--- /dev/null
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java
@@ -0,0 +1,50 @@
+package com.fastbee.data.controller.aaScreenAgricultural;
+
+import com.fastbee.common.core.controller.BaseController;
+import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.deviceInfo.mapper.DeviceInformationWormsMapper;
+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("/device/info")
+public class DeviceInfoController extends BaseController {
+
+    @Autowired
+    private DeviceInformationWormsMapper deviceInformationWormsMapper;
+
+
+
+    /**
+     * 查询虫情设备列表
+     */
+    @GetMapping("/wormList")
+    public AjaxResult getDeviceList() {
+        return success();
+    }
+
+    /**
+     * 查询气象设备列表
+     */
+    @GetMapping("/weatherList")
+    public AjaxResult getWeatherList() {
+        return success();
+    }
+
+    /**
+     * 查询墒情设备列表
+     */
+    @GetMapping("/soilList")
+    public AjaxResult getSoilList() {
+        return success();
+    }
+    /**
+     * 查询杀虫灯设备列表
+     */
+    @GetMapping("/lightList")
+    public AjaxResult getLightList() {
+        return success();
+    }
+}
diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/renKe/RenKeUserDeviceOverviewController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/renKe/RenKeUserDeviceOverviewController.java
index b101136..cc47998 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/renKe/RenKeUserDeviceOverviewController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/renKe/RenKeUserDeviceOverviewController.java
@@ -16,11 +16,12 @@ public class RenKeUserDeviceOverviewController {
     private RenKeUserDeviceOverview renkeUserDeviceOverview;
 
     /**
-         * 统计全部设备数量，并且按照不同设备分类统计
+     * 统计全部设备数量，并且按照不同设备分类统计
      */
     @GetMapping (value = "/all/device")
     public AjaxResult getsysAllUserDevice(){
         return AjaxResult.success(renkeUserDeviceOverview.getsysAllUserDevice());
     }
 
+
 }
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/AlertLog.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/AlertLog.java
index d2f76bf..1d916e9 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/AlertLog.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/AlertLog.java
@@ -70,4 +70,6 @@ public class AlertLog extends BaseEntity
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
+
+    private String sort ;//排序类型1升序2降序根据时间
 }