From 553523418b10f2db5a4f50e0614de4122338ab86 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 06 六月 2023 10:43:19 +0800
Subject: [PATCH] 修改根据时间查询Voc接口
---
src/main/java/com/yssh/entity/VocVals.java | 3 +++
src/main/resources/mapping/VocValsMapper.xml | 10 +++-------
src/main/java/com/yssh/service/VocValsService.java | 4 ++--
src/main/java/com/yssh/dao/VocValsMapper.java | 5 ++---
ys.sql | 24 ++++++++++++++++++++++++
5 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/yssh/dao/VocValsMapper.java b/src/main/java/com/yssh/dao/VocValsMapper.java
index 67b6b82..99be88f 100644
--- a/src/main/java/com/yssh/dao/VocValsMapper.java
+++ b/src/main/java/com/yssh/dao/VocValsMapper.java
@@ -16,11 +16,10 @@
/**
* 鏍规嵁鏃堕棿鏌ヨ
*
- * @param time 鏃堕棿锛堢ず渚嬶細2023060514锛�
- * @param startVal 璧峰鍊硷紙鍙负绌�)
+ * @param time 鏃堕棿锛堢ず渚嬶細2023060514锛�
* @return
*/
- public List<VocVals> selectByTime(@Param("time") String time, @Param("startVal") Double startVal);
+ public List<VocVals> selectByTime(@Param("time") String time);
/**
* 鏍规嵁鏃堕棿缁熻
diff --git a/src/main/java/com/yssh/entity/VocVals.java b/src/main/java/com/yssh/entity/VocVals.java
index 40c8db7..c7d6577 100644
--- a/src/main/java/com/yssh/entity/VocVals.java
+++ b/src/main/java/com/yssh/entity/VocVals.java
@@ -1,5 +1,6 @@
package com.yssh.entity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.github.biyanwen.annotation.CsvProperty;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@
public class VocVals implements Serializable {
private static final long serialVersionUID = -20230605145412000L;
+ @JsonIgnore
@ApiModelProperty(value = "涓婚敭")
private BigInteger id;
@@ -25,6 +27,7 @@
@ApiModelProperty(value = "鍊�")
private Double val;
+ @JsonIgnore
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
diff --git a/src/main/java/com/yssh/service/VocValsService.java b/src/main/java/com/yssh/service/VocValsService.java
index da96f6a..aa6a813 100644
--- a/src/main/java/com/yssh/service/VocValsService.java
+++ b/src/main/java/com/yssh/service/VocValsService.java
@@ -20,8 +20,8 @@
protected final Log logger = LogFactory.getLog(this.getClass());
@Override
- public List<VocVals> selectByTime(String time, Double startVal) {
- return vocValsMapper.selectByTime(time, startVal);
+ public List<VocVals> selectByTime(String time) {
+ return vocValsMapper.selectByTime(time);
}
@Override
diff --git a/src/main/resources/mapping/VocValsMapper.xml b/src/main/resources/mapping/VocValsMapper.xml
index 9f80f4c..2d937ad 100644
--- a/src/main/resources/mapping/VocValsMapper.xml
+++ b/src/main/resources/mapping/VocValsMapper.xml
@@ -10,14 +10,10 @@
</resultMap>
<select id="selectByTime" resultMap="selectMap">
- select *
+ select x, y, cast(val as decimal(12, 3)) "val"
from voc_vals
- <where>
- date_format(create_time, '%Y%m%d%H') = ${time}
- <if test="startVal != null">
- and val > ${startVal}
- </if>
- </where>
+ where date_format(create_time, '%Y%m%d%H') = ${time}
+ and val > (select jcyj from alert_config);
</select>
<select id="countByTime" resultType="java.lang.Integer">
diff --git a/ys.sql b/ys.sql
new file mode 100644
index 0000000..1a2d7ed
--- /dev/null
+++ b/ys.sql
@@ -0,0 +1,24 @@
+----------------------------------------------------------------------
+use yssh;
+show tables;
+
+SHOW BINARY LOGS;
+RESET MASTER;
+----------------------------------------------------------------------
+create table voc_vals (
+ id bigint not null primary key comment '涓婚敭',
+ x int comment 'X',
+ y int comment 'Y',
+ val double(25, 10) comment '鍊�',
+ create_time datetime comment '鍊�'
+);
+-- drop table voc_vals;
+create index voc_vals_val on voc_vals (val);
+create index voc_vals_time on voc_vals (create_time);
+----------------------------------------------------------------------
+/* select a.*, date_format(create_time, '%Y%m%d%H') "time" from voc_vals a where date_format(create_time, '%Y%m%d%H') = '2023060514';
+select * from voc_vals where create_time < date_sub(now(), interval 1 year);
+select date_sub(now(), interval 1 year) "time" from dual;
+select count(*) from voc_vals; */
+
+select * from voc_vals;
--
Gitblit v1.9.3