From 4055311830c7beed4dcdf74d5a65adb66ebdbc30 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 19 May 2023 19:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IcEventController.java    | 5 ++---
 .../src/main/java/com/epmet/service/IcEventService.java      | 2 +-
 .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
index cafbb65e49..d845583434 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
@@ -589,9 +589,8 @@ public class IcEventController {
      */
     @GetMapping("getEventRate")
     public Result<EventRateResultDTO> getEventRate(@RequestParam("orgId") String orgId,
-                                                   @RequestParam("orgType") String orgType,
-                                                   @RequestParam("eventType") String eventType) {
-        return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId, orgType, eventType));
+                                                   @RequestParam("orgType") String orgType) {
+        return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId, orgType));
     }
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
index bc7baf4b78..9d2875974f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
@@ -257,7 +257,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      *
      * @return
      */
-    EventRateResultDTO getEventRate(String orgId, String orgType, String eventType);
+    EventRateResultDTO getEventRate(String orgId, String orgType);
 
     /**
      * 事件分析数据获取
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index cc7397f80a..e9220b4cbb 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1925,7 +1925,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     }
 
     @Override
-    public EventRateResultDTO getEventRate(String orgId, String orgType, String eventType) {
+    public EventRateResultDTO getEventRate(String orgId, String orgType) {
         EventRateResultDTO erDto = baseDao.getEventCount(getOrgPath(orgId, orgType));//事件总量和灯数量,占比
         List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量
         Map<String, Integer> temp = new HashMap<>();