From d91b8db8c9fe50432677f61a081c9edb182559df Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 19 Apr 2024 13:11:45 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8D=87=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/model/ConditionModel.java       | 2 ++
 .../java/com/xydl/cac/service/impl/DataServiceImpl.java    | 7 ++++++-
 .../java/com/xydl/cac/service/impl/NSensorServiceImpl.java | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/model/ConditionModel.java b/src/main/java/com/xydl/cac/model/ConditionModel.java
index c1c2e1d..18fa576 100644
--- a/src/main/java/com/xydl/cac/model/ConditionModel.java
+++ b/src/main/java/com/xydl/cac/model/ConditionModel.java
@@ -33,5 +33,7 @@ public class ConditionModel {
     Integer numPerDay;
     @ApiModelProperty("处理状态")
     private String state;
+    @ApiModelProperty("时间升序")
+    Integer timeAsc;
 
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
index c9a531d..d367cc5 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -160,7 +160,12 @@ public class DataServiceImpl implements DataService {
         if (model.getEndTime() != null) {
             sqlWhere = sqlWhere + " AND " + timeField + " < '" + DateUtil.format(model.getEndTime()) + "'";
         }
-        String sqlOrder = " ORDER BY " + timeField + " DESC";
+        String sqlOrder = " ORDER BY " + timeField;
+        if (model.getTimeAsc() != null && model.getTimeAsc() == 1) {
+            sqlOrder = sqlOrder + " ASC";
+        } else {
+            sqlOrder = sqlOrder + " DESC";
+        }
         String sqlLimit = "";
         if (model.getPageNum() != null && model.getPageSize() != null) {
             result.setPageNum(model.getPageNum());
diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
index 9fdd1e1..9a1307c 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -139,6 +139,9 @@ public class NSensorServiceImpl implements NSensorService {
     @Override
     public SensorDetail<Map<String, Object>> getDetail(ConditionModel model) throws Exception {
         NSensor sensor;
+        if (model.getTimeAsc() == null) {
+            model.setTimeAsc(0);
+        }
         if (model.getId() != null) {
             Optional<NSensor> optional = repository.findById(model.getId());
             if (!optional.isPresent()) {