From c194bfe56895e5271a13ef173f4d57f578f8131a Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期二, 27 六月 2023 14:07:17 +0800
Subject: [PATCH] 根据开始坐标点，角度，计算结束点坐标
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 8 +-------
1 files changed, 1 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..e62c2dd 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
@@ -13,16 +13,10 @@
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;
/**
* @ClassName: globalAlarmController
@@ -59,7 +53,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")
--
Gitblit v1.9.3