diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java index d8dd0029..7f7542f2 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java @@ -1862,6 +1862,15 @@ private VideoController videoController; List list = dcDeviceService.selectDcDoorList(dcDoor); return getDataTable(list); } + //查询开门的设备列表 + @GetMapping("/dcDoorOpen") + public TableDataInfo dcDoorOpen(){ + startPage(); + Map redisCacheCacheMap = redisCache.getCacheMap(DOORSTATUS); + Set strings = redisCacheCacheMap.keySet(); + List list = dcDeviceService.selectDcDoorOpen(strings); + return getDataTable(list); + } //一体机柜空调定时调用,采数据 //@PostMapping("/integratedCabinetAir2") @Scheduled(cron = "0 7 * * * *") diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java index 173d07f4..07f601d5 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * 设备Mapper接口 @@ -50,4 +51,6 @@ public interface DcDeviceMapper extends BaseMapper { Integer insertDoorMonitor(DcDoor dcDoor); //查询电子门锁记录 List selectDcDoorList(DcDoor dcDoor); + //查询状态为开的设备 + List selectDcDoorOpen(@Param("iotIds")Set strings); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java b/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java index 28d8a681..19f87669 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * 设备Service接口 @@ -138,4 +139,6 @@ public interface IDcDeviceService extends IService { Integer insertDoorMonitor(DcDoor dcDoor); //查询电子门锁记录 List selectDcDoorList(DcDoor dcDoor); + //查询状态为开的设备 + List selectDcDoorOpen(Set strings); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java index 29eab03c..c837d3a4 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java @@ -682,5 +682,10 @@ public class DcDeviceServiceImpl extends ServiceImpl i return dcDeviceMapper.selectDcDoorList(dcDoor); } + @Override + public List selectDcDoorOpen(Set strings) { + return dcDeviceMapper.selectDcDoorOpen(strings); + } + } diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index c9554416..82c59493 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -237,4 +237,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc +