测试堵塞

kaiyu

2020-12-21 78380a1efa78bd88f5d1be502971eae6fef07cd0

测试堵塞

 src/main/java/com/moral/config/WebSocketConfig.java

@@ -44,6 +44,7 @@
        BSAQIWebSocketServer.sensorService=sensorService;
        ElectronicSWebSocketServer.sensorService=sensorService;
        BSAQIWebSocketServerTest.sensorService=sensorService;
        ElectronicSWebSocketServer.sensorService=sensorService;
    }

}

 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));
    }
    }*/
}

 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);