From 328d276bec3fa2d3b1fd9fec1965c11b4e45c1c7 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 15 九月 2023 16:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java
index 13238e9..c7f9ccc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java
@@ -8,7 +8,7 @@
@Mapper
public interface AlarmMapper {
- @Select("SELECT * FROM alarmmg")
+ @Select("SELECT * FROM alarmmg where endTime is not null and to_days(timeon)=to_days(now())")
List<alarmmg> selectAll();
@Select("SELECT count(*) FROM alarmmg where endTime is null and content=#{content}")
@@ -19,4 +19,7 @@
@Insert("UPDATE `canadames`.`alarmmg` set endTime= now() where endTime is null and content=#{content}")
void updatealarm(String content);
+
+ @Select("SELECT * FROM alarmmg where timeon between #{sj1} and #{sj2}")
+ List<alarmmg> selecttime(String sj1, String sj2);
}
--
Gitblit v1.8.0