From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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 4a0d232..b141d58 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
@@ -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) {// 鏍规嵁鏃ユ湡鏌ヨ鎶ヨ淇℃伅
// 灏唃et鏂规硶浼犺繃鏉ョ殑鍙傛暟涓�"#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);
- // }
}
--
Gitblit v1.8.0