whycxzp
2025-03-24 7d139f20b602fa6d5722d6ba3d8520f1f6d91d29
src/main/java/com/whyc/controller/BattAlarmController.java
@@ -15,8 +15,8 @@
@RestController
@Api(tags = "电池实时告警")
@RequestMapping("battalarm")
@Api(tags = "电池告警")
@RequestMapping("battAlarm")
public class BattAlarmController {
    @Autowired
    private BattAlarmService service;
@@ -24,39 +24,35 @@
    @Autowired
    private BattAlarmHisService hisService;
    @ApiOperation("在用电池组实时推送告警信息")
    /*@ApiOperation("在用电池组实时推送告警信息")
    @GetMapping("getResBattAlm")
    public Response getResBattAlm(@RequestParam(required = false) int binfId){
        Response res=service.getResBattAlm(binfId);
    public Response getResBattAlm(@RequestParam(required = false) int battGroupId){
        Response res=service.getResBattAlm(battGroupId);
        return res;
    }
    }*/
    @ApiOperation("查询电池告警")
    @GetMapping("getBattAlarm")
    public Response getBattAlarm(@RequestParam(required = false) int almLevel,@RequestParam String startTime,@RequestParam String endTime
    @ApiOperation("查询-分页")
    @GetMapping("getPage")
    public Response getPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
                                ,@RequestParam int pageNum,@RequestParam int pageSize){
        Response res=service.getBattAlarm(almLevel,startTime,endTime,pageNum,pageSize);
        return res;
        return service.getPage(almLevel,startTime,endTime,pageNum,pageSize);
    }
    @ApiOperation("确认告警")
    @GetMapping("confirmAlarm")
    public Response confirmAlarm(@RequestParam int num){
        Response res=service.confirmAlarm(num);
        return res;
        return service.confirmAlarm(num);
    }
    @ApiOperation("取消告警")
    @GetMapping("cancleAlarm")
    public Response cancleAlarm(@RequestParam int num){
        Response res=service.cancleAlarm(num);
        return res;
    @ApiOperation("告警确认取消")
    @GetMapping("cancelAlarm")
    public Response cancelAlarm(@RequestParam int num){
        return service.cancelAlarm(num);
    }
    @ApiOperation("查询电池组历史时间告警")
    @GetMapping("getHisAlarm")
    public Response getHisAlarm(@RequestParam int binfId,@RequestParam String startTime,@RequestParam String endTime
    @ApiOperation("查询历史-分页")
    @GetMapping("getHistoryPage")
    public Response getHistoryPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
            , @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
        Response res=hisService.getHisAlarm(binfId,startTime,endTime,pageNum,pageSize);
        return res;
        return hisService.getHistoryPage(almLevel,startTime,endTime,pageNum,pageSize);
    }
}