springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java
@@ -25,7 +25,7 @@ AlarmService alarmService; @GetMapping("/load") public Result selectAll() { public Result selectAll() {// 查询当天已结束的报警信息 Map<String, Object> map = new HashMap<>(); List<alarmmg> storageCagelist = alarmMapper.selectAll(); @@ -34,9 +34,7 @@ } @GetMapping("/stTime") public Result selecttime(String shijian1, String shijian2) { // if (shijian1 != "" || shijian2 != "") { public Result selecttime(String shijian1, String shijian2) {// 根据日期查询报警信息 // 将get方法传过来的参数中"#20"替换为" " String sj1 = shijian1.replace("#20", " "); String sj2 = shijian2.replace("#20", " "); @@ -44,12 +42,6 @@ Map<String, Object> map = new HashMap<>(); map.put("list", storageCagelist); return Result.success(map); // } else { // List<alarmmg> storageCagelist = alarmMapper.selectAll(); // Map<String, Object> map = new HashMap<>(); // map.put("list", storageCagelist); // return Result.success(map); // } } springboot-vue3/src/main/java/com/example/springboot/mapper/AlarmMapper.java
@@ -9,17 +9,17 @@ @Mapper public interface AlarmMapper { @Select("SELECT * FROM alarmmg where endTime is not null and to_days(timeon)=to_days(now())") List<alarmmg> selectAll(); List<alarmmg> selectAll();// 查询当天所有已结束报警信息 @Select("SELECT count(*) FROM alarmmg where endTime is null and content=#{content}") short selectnullti(String content); short selectnullti(String content);// 根据报警内容查询结束时间为null的 @Insert("INSERT INTO `canadames`.`alarmmg`( `content`,`timeon`) VALUES ( #{content},now())") void Insertalarm(String content); void Insertalarm(String content);// 添加一条报警数据 @Insert("UPDATE `canadames`.`alarmmg` set endTime= now() where endTime is null and content=#{content}") void updatealarm(String content); void updatealarm(String content);// 修改对应报警内容的结束时间 @Select("SELECT * FROM alarmmg where timeon between #{sj1} and #{sj2}") List<alarmmg> selecttime(String sj1, String sj2); List<alarmmg> selecttime(String sj1, String sj2);// 根据日期查询报警信息 }