From 079041267873a043486db99671326e5323934c57 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期日, 16 七月 2023 16:16:38 +0800
Subject: [PATCH] 增加融云业务上传用户头像接口
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index 445ba49..299c1d7 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/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);
+ }
}
--
Gitblit v1.9.3