fix: 修复[DEFECT-1194]事件查询

@@ -15,7 +15,6 @@ import org.thingsboard.server.common.data.yunteng.dto.TkEventKvDto;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
 
 
 import java.util.UUID;
 import java.util.UUID;
@@ -30,29 +29,37 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"设备事件"})
 @Api(tags = {"设备事件"})
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class TkEventController extends BaseController {
 public class TkEventController extends BaseController {
-    private final TkEventsService eventsService;
+  private final TkEventsService eventsService;
 
 
-    @GetMapping(params = {PAGE_SIZE, PAGE})
-    @ApiOperation("分页")
-    public PageData<TkEventKvDto> pageAlarmProfile(
-            @RequestParam(PAGE_SIZE) int pageSize,
-            @RequestParam(PAGE) int page,
-            @RequestParam(value = "eventIdentifier", required = false) String eventIdentifier,
-            @RequestParam(value = "eventType", required = false) DeviceEventTypeEnum eventType,
-            @RequestParam(value = "tbDeviceId", required = true) String tbDeviceId,
-            @RequestParam(required = false) Long startTime,
-            @RequestParam(required = false) Long endTime,
-            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
-            throws ThingsboardException {
-        checkParameter("tbDeviceId", tbDeviceId);
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public PageData<TkEventKvDto> pageAlarmProfile(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "eventIdentifier", required = false) String eventIdentifier,
+      @RequestParam(value = "eventType", required = false) DeviceEventTypeEnum eventType,
+      @RequestParam(value = "tbDeviceId") String tbDeviceId,
+      @RequestParam(required = false) Long startTime,
+      @RequestParam(required = false) Long endTime,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    checkParameter("tbDeviceId", tbDeviceId);
 
 
-        if (orderBy == null || orderBy.isEmpty()) {
-            orderBy = ModelConstants.EVENT_TIME_COLUMN;
-        }
-        TimePageLink pageLink = createTimePageLink(pageSize, page, null, orderBy, orderType==null?"":orderType.name(), startTime, endTime);
-        return checkNotNull(eventsService.findEvents(new DeviceId(UUID.fromString(tbDeviceId)),eventIdentifier,eventType, pageLink));
+    if (orderBy == null || orderBy.isEmpty()) {
+      orderBy = "id.eventTime";
     }
     }
-
-
+    TimePageLink pageLink =
+        createTimePageLink(
+            pageSize,
+            page,
+            null,
+            orderBy,
+            orderType != null ? orderType.name():OrderTypeEnum.DESC.name(),
+            startTime,
+            endTime);
+    return checkNotNull(
+        eventsService.findEvents(
+            new DeviceId(UUID.fromString(tbDeviceId)), eventIdentifier, eventType, pageLink));
+  }
 }
 }