From 09c655782b6f9996bc084e6f0c9721d0f2574aa8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 九月 2023 16:32:11 +0800
Subject: [PATCH] 1、解决vuex切换页面样式混乱 2、修改plc地址

---
 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