修改雷达管理业务 修改相机复选框接口状态

‘liusuyi’

2023-07-07 879f0f4ab74d6d6ee147ea41648b35d368045e6c

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

@@ -4,6 +4,8 @@
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
@@ -13,16 +15,11 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

import static com.ruoyi.common.utils.PageUtils.startPage;
import java.util.concurrent.PriorityBlockingQueue;

/**
 * @ClassName: globalAlarmController
@@ -59,7 +56,7 @@
    @ApiOperation(value = "查看报警点数量",notes = "查询刷新时间内报警的点位数量")
    @ApiOperationSupport(order = 2)
    public AjaxResult  countAlarmLog() {
        Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
        Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
        return AjaxResult.success(stringIntegerMap);
    }
    @GetMapping("/List")
@@ -76,4 +73,11 @@
        Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
        return getDataTable((List)alarmList);
    }

    @GetMapping("/getQueueList")
    @ApiOperation(value = "查询队列",notes = "查询所有相机的当前队列")
    public AjaxResult getQueueList() {
        Map<String, PriorityBlockingQueue<GuideTask>> cameraQueueMap = GuidePriorityQueue.cameraQueueMap;
        return AjaxResult.success(cameraQueueMap);
    }
}