From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
index dbed93d..2dde201 100644
--- a/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
+++ b/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
@@ -8,7 +8,7 @@
/**
* <p>
- * ���������
+ * ���������
* </p>
*
* @author moral
@@ -17,20 +17,31 @@
public interface GovMonitorPointService extends IService<GovMonitorPoint> {
/**
- * @Description: ���������������������������������������������������
- * @Param: [regionCode,sensorCode]
- * @return: java.util.List<com.moral.api.entity.GovMonitorPoint>
- * @Author: ���������
- * @Date: 2021/9/24
- */
- List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode,String sensorCode);
+ * @Description: ���������������������������������������������������
+ * @Param: [regionCode, sensorCode]
+ * @return: java.util.List<com.moral.api.entity.GovMonitorPoint>
+ * @Author: ���������
+ * @Date: 2021/9/24
+ */
+ List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode, String sensorCode);
/**
- *@Description: ������������id������������������������
- *@Param: [map]
- *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
- *@Author: lizijie
- *@Date: 2021/9/23 15:32
+ * @Description: ������������id������������������������
+ * @Param: [map]
+ * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+ * @Author: lizijie
+ * @Date: 2021/9/23 15:32
**/
List<GovMonitorPoint> selectGovMonitorPointsByOrgid(Map map);
+
+ /**
+ * @Description: ������guid���������id������������������������������������������
+ * @Param: [map]
+ * @return: java.util.Map<java.lang.String, java.lang.Object>
+ * @Author: lizijie
+ * @Date: 2021/9/24 11:22
+ **/
+ Map<String, Object> queryGovMonitorPointHoutlyDatyByGuidsAndOrgid(Map map);
+
+ List<Map<String, Object>> getGovMonitorPointsByOrganizationId(Integer organizationId);
}
--
Gitblit v1.8.0