From 19ed689f694c6be2ebfd153b646d2e6e73507971 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 23 Apr 2024 15:42:09 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E6=98=AF=E5=90=A6=E5=8C=85=E5=90=AB=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/model/ConditionModel.java  | 16 ++++++++++------
 .../xydl/cac/service/impl/DataServiceImpl.java   | 12 ++++++++----
 .../cac/service/impl/NSensorServiceImpl.java     |  4 +---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/xydl/cac/model/ConditionModel.java b/src/main/java/com/xydl/cac/model/ConditionModel.java
index 18fa576..32e09a1 100644
--- a/src/main/java/com/xydl/cac/model/ConditionModel.java
+++ b/src/main/java/com/xydl/cac/model/ConditionModel.java
@@ -17,10 +17,6 @@ import java.util.Date;
 @ApiModel("查询条件")
 public class ConditionModel {
 
-    @ApiModelProperty("开始时间")
-    private Date startTime;
-    @ApiModelProperty("结束时间")
-    private Date endTime;
     @ApiModelProperty("id")
     private Integer id;
     @ApiModelProperty("装置ID")
@@ -31,9 +27,17 @@ public class ConditionModel {
     Integer pageSize;
     @ApiModelProperty("每天最大数量")
     Integer numPerDay;
+
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+    @ApiModelProperty("时间升序")
+    boolean timeAsc;
+    @ApiModelProperty("不包含开始时间")
+    boolean excludeStartTime;
+
     @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 257d741..98dc90a 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -101,7 +101,7 @@ public class DataServiceImpl implements DataService {
                     dayPerPage = 1;
                 }
                 ConditionModel newmodel = new ConditionModel();
-                newmodel.setTimeAsc(model.getTimeAsc());
+                newmodel.setTimeAsc(model.isTimeAsc());
 
                 // 结束时间和总天数
                 Date end = model.getEndTime();
@@ -115,7 +115,7 @@ public class DataServiceImpl implements DataService {
                     totalDays = DateUtil.getDifferenceInDays(model.getStartTime(), end);
                 }
 
-                if (model.getTimeAsc() != null && model.getTimeAsc() > 0) {
+                if (model.isTimeAsc()) {
                     // 升序
                     Date start = model.getStartTime();
                     if (model.getPageNum() > 1) {
@@ -175,13 +175,17 @@ public class DataServiceImpl implements DataService {
         String sqlFrom = " FROM " + sensor.getTableName();
         String sqlWhere = " WHERE " + devField + "=" + sensor.getDevId();
         if (model.getStartTime() != null) {
-            sqlWhere = sqlWhere + " AND " + timeField + " >= '" + DateUtil.format(model.getStartTime()) + "'";
+            if (model.isExcludeStartTime()) {
+                sqlWhere = sqlWhere + " AND " + timeField + " > '" + DateUtil.format(model.getStartTime()) + "'";
+            } else {
+                sqlWhere = sqlWhere + " AND " + timeField + " >= '" + DateUtil.format(model.getStartTime()) + "'";
+            }
         }
         if (model.getEndTime() != null) {
             sqlWhere = sqlWhere + " AND " + timeField + " < '" + DateUtil.format(model.getEndTime()) + "'";
         }
         String sqlOrder = " ORDER BY " + timeField;
-        if (model.getTimeAsc() != null && model.getTimeAsc() > 0) {
+        if (model.isTimeAsc()) {
             sqlOrder = sqlOrder + " ASC";
         } else {
             sqlOrder = sqlOrder + " DESC";
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 60004db..e9ff25d 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -139,9 +139,7 @@ public class NSensorServiceImpl implements NSensorService {
     @Override
     public SensorDetail<Map<String, Object>> getDetail(ConditionModel model) throws Exception {
         NSensor sensor;
-        if (model.getTimeAsc() == null) {
-            model.setTimeAsc(Constants.FALSE);
-        } else if (model.getTimeAsc() > 0 && model.getStartTime() == null) {
+        if (model.isTimeAsc() && model.getStartTime() == null) {
             throw new BusinessException("升序情况下开始时间不能为空");
         }
         if (model.getId() != null) {