From e60bad3640cdade446b8d7ba3ab13ee22fb79b05 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 10 Jan 2024 08:49:01 +0800
Subject: [PATCH] fix：立行立改经纬度必填
---
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
index a40f6ba..7492170 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -1,10 +1,13 @@
package com.moral.api.mapper;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.dto.dataDisplay.HeatMapDTO;
+import com.moral.api.pojo.vo.device.AppDeviceVo;
import io.lettuce.core.dynamic.annotation.Param;
/**
@@ -20,6 +23,26 @@
/*���������������������������*/
List<Map<String, Object>> getTrendChartData(Map<String, Object> params);
- List<Device> deviceList(@Param("organizationId") int organizationId,@Param("regionCode") int regionCode,@Param("region") String region);
+ List<Map<String, Object>> deviceList(@Param("organizationId") int organizationId,
+ @Param("regionCode") int regionCode,
+ @Param("region") String region,
+ @Param("type") String type,
+ @Param("sensorCode") String sensorCode,
+ @Param("times") String times,
+ @Param("endHourlyTime") String endHourlyTime);
+
+ List<Integer> deviceIdList(@Param("organizationId") int organizationId);
+
+ List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId);
+
+ List<String> deviceMacs(@Param("organizationId") int organizationId);
+
+ List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);
+
+
+ List<HeatMapDTO> getHeatMap(HashMap<String,Object> params);
+
+
+ List<HeatMapDTO> getHeatMapV1(HashMap<String,Object> params);
}
--
Gitblit v1.8.0