From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +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 | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 43aeeb4..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
@@ -13,6 +13,7 @@
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.service.AlarmService;
+import com.microsoft.schemas.office.office.STInsetMode;
@RestController
@RequestMapping("/alarm")
@@ -24,11 +25,24 @@
AlarmService alarmService;
@GetMapping("/load")
- public Result selectAll() {
+ public Result selectAll() {// 鏌ヨ褰撳ぉ宸茬粨鏉熺殑鎶ヨ淇℃伅
+
+ Map<String, Object> map = new HashMap<>();
List<alarmmg> storageCagelist = alarmMapper.selectAll();
+ map.put("list", storageCagelist);
+ return Result.success(map);
+ }
+
+ @GetMapping("/stTime")
+ 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