From b134ac3690e6d31d40ee6def5c65fb778050a556 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java
index 034beb9..4a0d232 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java
@@ -35,22 +35,21 @@
@GetMapping("/stTime")
public Result selecttime(String shijian1, String shijian2) {
- System.out.println("++++++");
- System.out.println(shijian1);
- if (shijian1 != "" || shijian2 != "") {
- String sj1 = shijian1.replace("#20", " ");
- String sj2 = shijian2.replace("#20", " ");
- List<alarmmg> storageCagelist = alarmMapper.selecttime(sj1, sj2);
- 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);
- }
+ // if (shijian1 != "" || shijian2 != "") {
+ // 灏唃et鏂规硶浼犺繃鏉ョ殑鍙傛暟涓�"#20"鏇挎崲涓�" "
+ String sj1 = shijian1.replace("#20", " ");
+ String sj2 = shijian2.replace("#20", " ");
+ List<alarmmg> storageCagelist = alarmMapper.selecttime(sj1, sj2);
+ 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);
+ // }
}
--
Gitblit v1.8.0