From dc31792dc1b8ad1658e49ba8fce9a1be924e6fbb Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 30 十一月 2023 08:44:04 +0800 Subject: [PATCH] 理片笼测试修改 --- springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 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 new file mode 100644 index 0000000..b141d58 --- /dev/null +++ b/springboot-vue3/src/main/java/com/example/springboot/controller/AlarmController.java @@ -0,0 +1,48 @@ +package com.example.springboot.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.springboot.common.Result; +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") +public class AlarmController { + @Autowired + AlarmMapper alarmMapper; + + @Autowired + AlarmService alarmService; + + @GetMapping("/load") + 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