From d83af112e7d8a48a8bdc74f93bcfa0a090c4d4a2 Mon Sep 17 00:00:00 2001 From: mashili Date: Tue, 28 Oct 2025 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E4=B8=8B=E7=9A=84=E6=8C=87=E5=AE=9A=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/web/controller/ems/EmsSiteConfigController.java | 9 +++++++++ .../com/xzzn/ems/service/IEmsDeviceSettingService.java | 2 ++ .../ems/service/impl/EmsDeviceSettingServiceImpl.java | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java index fc37793..3ba4110 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java @@ -168,4 +168,13 @@ public class EmsSiteConfigController extends BaseController{ { return success(iEmsSiteService.getParentCategoryDeviceId(siteId, deviceCategory)); } + + /** + * 获取指定站点下的指定设备类型的设备 + */ + @GetMapping("/getDeviceListBySiteAndCategory") + public AjaxResult getDeviceListBySiteAndCategory(String siteId,String deviceCategory) + { + return success(iEmsDeviceSettingService.getDeviceListBySiteAndCategory(siteId, deviceCategory)); + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java index 9540a9b..60aca5e 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java @@ -31,4 +31,6 @@ public interface IEmsDeviceSettingService public List getSiteAllDeviceCategory(String siteId); // 初始化设备信息 public Map> initDeviceInfo(); + + public List> getDeviceListBySiteAndCategory(String siteId, String deviceCategory); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java index dc02593..5d3d2a9 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java @@ -445,4 +445,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService redisCache.setCacheObject(RedisKeyConstants.INIT_DEVICE_INFO, map, 30, TimeUnit.DAYS); return map; } + + @Override + public List> getDeviceListBySiteAndCategory(String siteId, String deviceCategory) { + return emsDevicesMapper.getDeviceInfosBySiteIdAndCategory(siteId, deviceCategory); + } }