liusuyi
2024-08-08 57c673aa3e83677bcf5d30b4b45d06bae6609db8
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
@@ -75,9 +75,9 @@
            @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);
    }
@@ -87,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);
    }
}