From 7bf4baf85f9704ba8977a6f751a43e1952f0ac53 Mon Sep 17 00:00:00 2001 From: mashili Date: Thu, 3 Jul 2025 15:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteConfigController.java | 25 +++++++ .../xzzn/ems/domain/vo/SiteDeviceListVo.java | 68 +++++++++++++++++++ .../ems/mapper/EmsDevicesSettingMapper.java | 8 ++- .../xzzn/ems/mapper/EmsSiteSettingMapper.java | 7 ++ .../ems/service/IEmsDeviceSettingService.java | 13 ++++ .../com/xzzn/ems/service/IEmsSiteService.java | 4 +- .../impl/EmsDeviceSettingServiceImpl.java | 28 ++++++++ .../ems/service/impl/EmsSiteServiceImpl.java | 11 +++ .../mapper/ems/EmsDevicesSettingMapper.xml | 6 ++ .../mapper/ems/EmsSiteSettingMapper.xml | 11 +++ 10 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java 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 5b5e480..be2e0e2 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 @@ -2,7 +2,10 @@ package com.xzzn.web.controller.ems; import com.xzzn.common.core.controller.BaseController; import com.xzzn.common.core.page.TableDataInfo; +import com.xzzn.ems.domain.EmsDevicesSetting; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.SiteDeviceListVo; +import com.xzzn.ems.service.IEmsDeviceSettingService; import com.xzzn.ems.service.IEmsSiteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -24,6 +27,9 @@ public class EmsSiteConfigController extends BaseController{ @Autowired private IEmsSiteService iEmsSiteService; + @Autowired + private IEmsDeviceSettingService iEmsDeviceSettingService; + /** * 获取站点列表 */ @@ -35,4 +41,23 @@ public class EmsSiteConfigController extends BaseController{ return getDataTable(list); } + /** + * 获取设备列表 + */ + @GetMapping("/getDeviceInfoList") + public TableDataInfo getDeviceInfoList(@RequestParam String siteId) + { + startPage(); + List list = iEmsSiteService.getAllDeviceList(siteId); + return getDataTable(list); + } + + /** + * 获取设备详细信息 + */ + @GetMapping("/getDeviceDetailInfo") + public EmsDevicesSetting getDeviceDetailInfo(@RequestParam String deviceId) + { + return iEmsDeviceSettingService.getDeviceDetailInfo(deviceId); + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java new file mode 100644 index 0000000..5dc4155 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java @@ -0,0 +1,68 @@ +package com.xzzn.ems.domain.vo; + +/** + * 站点管理-站点设备列表 + * + */ +public class SiteDeviceListVo { + /** 站点id */ + private String siteId; + /** 站点名称 */ + private String siteName; + /** 设备id */ + private String deviceId; + /** 设备名称 */ + private String deviceName; + /** 设备类型 */ + private String deviceType; + /** 通信状态 */ + private String communicationStatus; + + public String getSiteId() { + return siteId; + } + + public void setSiteId(String siteId) { + this.siteId = siteId; + } + + public String getSiteName() { + return siteName; + } + + public void setSiteName(String siteName) { + this.siteName = siteName; + } + + public String getDeviceId() { + return deviceId; + } + + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getCommunicationStatus() { + return communicationStatus; + } + + public void setCommunicationStatus(String communicationStatus) { + this.communicationStatus = communicationStatus; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java index 4d9ee15..9b6dd71 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java @@ -74,7 +74,6 @@ public interface EmsDevicesSettingMapper */ public List getAllBatteryDeviceBySiteId(String siteId); - /** * 根据site_id和device_category获取指定设备信息 * @param siteId @@ -82,4 +81,11 @@ public interface EmsDevicesSettingMapper * @return */ public List> getDeviceInfosBySiteIdAndCategory(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory); + + /** + * 获取该设备的详细数据 + * @param deviceId + * @return + */ + public EmsDevicesSetting getDeviceDetailInfo(String deviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java index 09bc548..abcc74a 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java @@ -2,6 +2,7 @@ package com.xzzn.ems.mapper; import java.util.List; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.SiteDeviceListVo; import com.xzzn.ems.domain.vo.SiteTotalInfoVo; import org.apache.ibatis.annotations.Param; @@ -83,4 +84,10 @@ public interface EmsSiteSettingMapper * @return */ public List getSiteInfoList(@Param("siteName")String siteName, @Param("startTime")String startTime, @Param("endTime")String endTime); + + /** + * 获取站点的设备列表 + * @return + */ + public List getAllSiteDeviceList(String siteId); } 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 new file mode 100644 index 0000000..970d040 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java @@ -0,0 +1,13 @@ +package com.xzzn.ems.service; + +import com.xzzn.ems.domain.EmsDevicesSetting; + +/** + * 设备信息 服务层 + * + */ +public interface IEmsDeviceSettingService +{ + + public EmsDevicesSetting getDeviceDetailInfo(String deviceId); +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java index a463947..8a742a7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java @@ -1,6 +1,7 @@ package com.xzzn.ems.service; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.SiteDeviceListVo; import com.xzzn.ems.domain.vo.SiteTotalInfoVo; import java.util.List; @@ -22,6 +23,7 @@ public interface IEmsSiteService public List> getAllClusterInfo(String stackDeviceId); - public List getAllSiteInfoList(String siteName, String startTime, String endTime); + + public List getAllDeviceList(String siteId); } 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 new file mode 100644 index 0000000..b8485a1 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java @@ -0,0 +1,28 @@ +package com.xzzn.ems.service.impl; + +import com.xzzn.ems.domain.EmsDevicesSetting; +import com.xzzn.ems.mapper.EmsDevicesSettingMapper; +import com.xzzn.ems.service.IEmsDeviceSettingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 站点信息 服务层实现 + * + */ +@Service +public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService +{ + @Autowired + private EmsDevicesSettingMapper emsDevicesMapper; + + /** + * 获取设备详细信息 + * @param deviceId + * @return + */ + @Override + public EmsDevicesSetting getDeviceDetailInfo(String deviceId) { + return emsDevicesMapper.getDeviceDetailInfo(deviceId); + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java index 9893d9f..f05f59b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java @@ -2,6 +2,7 @@ package com.xzzn.ems.service.impl; import com.xzzn.common.enums.DeviceCategory; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.SiteDeviceListVo; import com.xzzn.ems.domain.vo.SiteTotalInfoVo; import com.xzzn.ems.mapper.EmsDevicesSettingMapper; import com.xzzn.ems.mapper.EmsSiteSettingMapper; @@ -67,4 +68,14 @@ public class EmsSiteServiceImpl implements IEmsSiteService return emsSiteMapper.getSiteInfoList(siteName,startTime,endTime); } + /** + * 获取设备列表 + * + * @param siteId + * @return + */ + @Override + public List getAllDeviceList(String siteId) { + return emsSiteMapper.getAllSiteDeviceList(siteId); + } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index e5729ac..c227e2c 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -179,4 +179,10 @@ communication_status as communicationStatus from ems_devices_setting where site_id = #{siteId} and device_category = #{deviceCategory} + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml index 9c03318..e182b46 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml @@ -132,4 +132,15 @@ AND running_time < DATE_ADD(STR_TO_DATE( #{endTime}, '%Y-%m-%d'), INTERVAL 1 DAY) + + \ No newline at end of file