增加tyr-catch

liusuyi

2024-05-20 0ca308dba91ddbd3391285a2b566b0c958a164f2

 ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java

@@ -45,6 +45,13 @@
        List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
        return AjaxResult.success(result);
    }
    @GetMapping("/AllList")
    @ApiOperation(value = "实时报警聚合接口(all)",notes = "按报警刷新时间聚合查询")
    @ApiOperationSupport(includeParameters = {"command"},order = 1)
    public AjaxResult selectAlarmLogAll() {
        List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogsAll();
        return AjaxResult.success(result);
    }
    @PostMapping("/view")
    @ApiOperation(value = "查看报警接口",notes = "指定查看某个报警数据")
    @ApiOperationSupport(includeParameters = {"command","id"},order = 3)
@@ -62,15 +69,15 @@
    @GetMapping("/List")
    @ApiOperation(value = "历史报警聚合接口",notes = "通过command和时间查询历史数据")
    @ApiImplicitParams({
            @ApiImplicitParam(name="command",value="报警标识",dataType="integer",paramType="query",example="1001",required=true),
            @ApiImplicitParam(name="beginTime",value="开始时间",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true),
            @ApiImplicitParam(name="endTime",value="结束时间",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true),
            @ApiImplicitParam(name="pageNum",value="页码",dataType="integer",paramType="query",example="1",required=true),
            @ApiImplicitParam(name="pageSize",value="页数量",dataType="integer",paramType="query",example="10",required=true)
            @ApiImplicitParam(name="command",value="报警标识",dataType="integer",paramType="query",example="1001",required=true,dataTypeClass = Integer.class),
            @ApiImplicitParam(name="beginTime",value="开始时间",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true,dataTypeClass = String.class),
            @ApiImplicitParam(name="endTime",value="结束时间",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true,dataTypeClass = String.class),
            @ApiImplicitParam(name="pageNum",value="页码",dataType="integer",paramType="query",example="1",required=true,dataTypeClass = Integer.class),
            @ApiImplicitParam(name="pageSize",value="页数量",dataType="integer",paramType="query",example="10",required=true,dataTypeClass = Integer.class)
    })
    public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
    public TableDataInfo selectAlarmList(String name,Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
        startPage();
        Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
        Object alarmList = globalAlarmService.selectAlarmList(name,command,beginTime,endTime, pageNum, pageSize);
        return getDataTable((List)alarmList);
    }

@@ -80,4 +87,12 @@
        Map<String, PriorityBlockingQueue<GuideTask>> cameraQueueMap = GuidePriorityQueue.cameraQueueMap;
        return AjaxResult.success(cameraQueueMap);
    }

    @PostMapping("/ThermalMapList")
    @ApiOperation(value = "热力图接口",notes = "按报警刷新时间按报警类别聚合查询")
    @ApiOperationSupport(includeParameters = {"command","refreshTime"},order = 1)
    public AjaxResult selectThermalMap(@RequestBody GlobalAlarmCondition condition) {
        List<GlobalAlarmData> result = globalAlarmService.selectThermalMap(condition);
        return AjaxResult.success(result);
    }
}