From 793d633513ad4d09d3398921ae73dca3bb2d9971 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 13 Dec 2023 17:14:00 +0800 Subject: [PATCH] chore:测试提交 --- screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 21 ++++++++++++++++++++- 1 files changed, 20 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..c25f0a9 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,12 @@ 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.vo.device.AppDeviceVo; import io.lettuce.core.dynamic.annotation.Param; /** @@ -20,6 +22,23 @@ /*���������������������������*/ 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<Map<String, Object>> getHeatMap(HashMap<String,Object> params); } -- Gitblit v1.8.0