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/DeviceController.java | 4 ++-- src/main/java/com/moral/controller/AlarmController.java | 4 ++-- src/main/java/com/moral/config/WebSocketConfig.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java index 824d0d3..e558ec9 100644 --- a/src/main/java/com/moral/config/WebSocketConfig.java +++ b/src/main/java/com/moral/config/WebSocketConfig.java @@ -44,6 +44,7 @@ BSAQIWebSocketServer.sensorService=sensorService; ElectronicSWebSocketServer.sensorService=sensorService; BSAQIWebSocketServerTest.sensorService=sensorService; + ElectronicSWebSocketServer.sensorService=sensorService; } } diff --git a/src/main/java/com/moral/controller/AlarmController.java b/src/main/java/com/moral/controller/AlarmController.java index bb5a793..3f9b7d3 100644 --- a/src/main/java/com/moral/controller/AlarmController.java +++ b/src/main/java/com/moral/controller/AlarmController.java @@ -35,8 +35,8 @@ AlarmConfigService alarmConfigService; @Resource AlarmService alarmService; - @RequestMapping(value = "/count-by-times", method = RequestMethod.GET) +/* @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)); - } + }*/ } diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java index d02ddd8..9c27858 100644 --- a/src/main/java/com/moral/controller/DeviceController.java +++ b/src/main/java/com/moral/controller/DeviceController.java @@ -37,10 +37,10 @@ public ResultBean<Integer> countByExample(PageBean pageBean){ return new ResultBean<Integer>(deviceService.countByExample(pageBean)); } - @GetMapping("count-by-times") +/* @GetMapping("count-by-times") public ResultBean<List<Map>> countByTimes(Date start, Date end){ return new ResultBean<List<Map>>(deviceService.countByTimes(start,end,"%Y-%m")); - } + }*/ @GetMapping("page-list") public PageBean pageList(PageBean pageBean) { return deviceService.queryByPageBean(pageBean); -- Gitblit v1.8.0