From ee03f78ceb74f81afff6f5dbcc0398b5d021fe37 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 15:41:19 +0800
Subject: [PATCH] 倾斜度
---
src/main/java/com/zy/asrs/entity/CrnTiltRecord.java | 24 +-----------------------
src/main/webapp/views/crnTiltRecord/crnTiltRecord.html | 6 ------
src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java | 8 ++------
3 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java b/src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java
index fea8912..7cc45ff 100644
--- a/src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnTiltRecordController.java
@@ -56,8 +56,7 @@
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
- // 榛樿鎸夎褰曟棩鏈熷�掑簭
- wrapper.orderBy("record_date", false);
+ // 榛樿鎸夎褰曟椂闂村�掑簭
wrapper.orderBy("record_time", false);
}
@@ -109,7 +108,6 @@
EntityWrapper<CrnTiltRecord> wrapper = new EntityWrapper<>();
wrapper.eq("crn_no", crnNo);
- wrapper.orderBy("record_date", false);
wrapper.orderBy("record_time", false);
wrapper.last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY");
@@ -137,8 +135,7 @@
convert(param, wrapper);
allLike(CrnTiltRecord.class, param.keySet(), wrapper, condition);
- // 鎺掑簭锛氶粯璁ゆ寜璁板綍鏃ユ湡鍊掑簭
- wrapper.orderBy("record_date", false);
+ // 鎺掑簭锛氶粯璁ゆ寜璁板綍鏃堕棿鍊掑簭
wrapper.orderBy("record_time", false);
// 鏌ヨ鎵�鏈夋暟鎹紙涓嶅垎椤碉級
@@ -152,7 +149,6 @@
fields.add("tiltX");
fields.add("tiltY");
fields.add("tiltZ");
- fields.add("recordDate");
fields.add("recordTime");
fields.add("prevTiltValue");
fields.add("tiltChange");
diff --git a/src/main/java/com/zy/asrs/entity/CrnTiltRecord.java b/src/main/java/com/zy/asrs/entity/CrnTiltRecord.java
index 324635f..9f3bee7 100644
--- a/src/main/java/com/zy/asrs/entity/CrnTiltRecord.java
+++ b/src/main/java/com/zy/asrs/entity/CrnTiltRecord.java
@@ -62,14 +62,7 @@
private Float tiltZ;
/**
- * 璁板綍鏃ユ湡锛堟瘡鍛ㄨ褰曚竴娆★級
- */
- @ApiModelProperty(value = "璁板綍鏃ユ湡")
- @TableField("record_date")
- private Date recordDate;
-
- /**
- * 璁板綍鏃堕棿
+ * 璁板綍鏃堕棿锛堝寘鍚畬鏁寸殑鏃ユ湡鏃堕棿淇℃伅锛�
*/
@ApiModelProperty(value = "璁板綍鏃堕棿")
@TableField("record_time")
@@ -142,21 +135,6 @@
public void setTiltZ(Float tiltZ) {
this.tiltZ = tiltZ;
- }
-
- public Date getRecordDate() {
- return recordDate;
- }
-
- public void setRecordDate(Date recordDate) {
- this.recordDate = recordDate;
- }
-
- public String getRecordDate$() {
- if (recordDate == null) {
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd").format(recordDate);
}
public Date getRecordTime() {
diff --git a/src/main/webapp/views/crnTiltRecord/crnTiltRecord.html b/src/main/webapp/views/crnTiltRecord/crnTiltRecord.html
index c5e6c2f..3e9addf 100644
--- a/src/main/webapp/views/crnTiltRecord/crnTiltRecord.html
+++ b/src/main/webapp/views/crnTiltRecord/crnTiltRecord.html
@@ -21,12 +21,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁板綍鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input id="recordDate" class="layui-input" name="recordDate" type="text" placeholder="璇烽�夋嫨鏃ユ湡鑼冨洿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">璁板綍鏃堕棿锛�</label>
<div class="layui-input-inline">
<input id="recordTime" class="layui-input" name="recordTime" type="text" placeholder="璇烽�夋嫨鏃堕棿鑼冨洿" autocomplete="off">
--
Gitblit v1.9.1