From 75375a0f68c8b91799482dc1cd2ec7d7f211167f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 09:28:06 +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 | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 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..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,23 +34,14 @@
}
@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);
- }
+ public Result selecttime(String shijian1, String 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);
}
--
Gitblit v1.8.0