From a120dc6724d90d80cf9adc7b02d11eaedc5ca021 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 17:40:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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..034beb9 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")
@@ -25,10 +26,32 @@
@GetMapping("/load")
public Result selectAll() {
- List<alarmmg> storageCagelist = alarmMapper.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) {
+ 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);
+ }
+
+ }
+
}
--
Gitblit v1.8.0