From 78380a1efa78bd88f5d1be502971eae6fef07cd0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Dec 2020 16:31:17 +0800
Subject: [PATCH] 测试堵塞
---
src/main/java/com/moral/controller/AlarmController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmController.java b/src/main/java/com/moral/controller/AlarmController.java
index a76d137..3f9b7d3 100644
--- a/src/main/java/com/moral/controller/AlarmController.java
+++ b/src/main/java/com/moral/controller/AlarmController.java
@@ -18,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
+import java.text.ParseException;
import java.util.*;
@RestController
@@ -34,8 +35,8 @@
AlarmConfigService alarmConfigService;
@Resource
AlarmService alarmService;
- @RequestMapping(value = "/count-by-times", method = RequestMethod.GET)
- public ResultBean<List<Map>> countByTimes(Date start, Date end,@RequestParam(value = "timeUnits")Optional<TimeUnits> timeUnits){
- return new ResultBean<>(alarmService.countByTimes(start,end,timeUnits.isPresent()?timeUnits.get():null));
- }
+/* @RequestMapping(value = "/count-by-times", method = RequestMethod.GET)
+ public ResultBean<List<Map>> countByTimes(Date start, Date end,@RequestParam(value = "timeUnits")Optional<TimeUnits> timeUnits) throws ParseException {
+ return new ResultBean<>(alarmService.countByTimes(start,end,timeUnits.isPresent()?timeUnits.get():null));
+ }*/
}
--
Gitblit v1.8.0