数据20250904优化-点位列表分页&点位查询

ems-system/src/main/java/com/xzzn/ems/domain/EmsPointMatch.java

@@ -9,7 +9,7 @@ import com.xzzn.common.annotation.Excel;
  * 点位匹配对象 ems_point_match
  *
  * @author xzzn
- * @date 2025-09-02
+ * @date 2025-09-13
  */
 public class EmsPointMatch extends BaseEntity
 {
@@ -38,6 +38,18 @@ public class EmsPointMatch extends BaseEntity
     @Excel(name = "设备类别，例如“STACK/CLUSTER/PCS等”")
     private String deviceCategory;
 
+    /** 数据点位 */
+    @Excel(name = "数据点位")
+    private String dataPoint;
+
+    /** 数据点位名称 */
+    @Excel(name = "数据点位名称")
+    private String dataPointName;
+
+    /** 数据点位来源设备 */
+    @Excel(name = "数据点位来源设备")
+    private String dataDevice;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -98,6 +110,36 @@ public class EmsPointMatch extends BaseEntity
         return deviceCategory;
     }
 
+    public void setDataPoint(String dataPoint)
+    {
+        this.dataPoint = dataPoint;
+    }
+
+    public String getDataPoint()
+    {
+        return dataPoint;
+    }
+
+    public void setDataPointName(String dataPointName)
+    {
+        this.dataPointName = dataPointName;
+    }
+
+    public String getDataPointName()
+    {
+        return dataPointName;
+    }
+
+    public void setDataDevice(String dataDevice)
+    {
+        this.dataDevice = dataDevice;
+    }
+
+    public String getDataDevice()
+    {
+        return dataDevice;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -107,6 +149,9 @@ public class EmsPointMatch extends BaseEntity
                 .append("matchField", getMatchField())
                 .append("siteId", getSiteId())
                 .append("deviceCategory", getDeviceCategory())
+                .append("dataPoint", getDataPoint())
+                .append("dataPointName", getDataPointName())
+                .append("dataDevice", getDataDevice())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterLoadDataVo.java

@@ -13,6 +13,9 @@ public class AmmeterLoadDataVo {
     /** 电表名称 */
     private String deviceName;
 
+    /** 设备id */
+    private String deviceId;
+
     /** 通信状态 */
     private String emsCommunicationStatus;
 
@@ -54,4 +57,12 @@ public class AmmeterLoadDataVo {
     public void setLoadDataDetailInfo(List<LoadDataDetailInfo> loadDataDetailInfo) {
         this.loadDataDetailInfo = loadDataDetailInfo;
     }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
 }

ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterMeteDataVo.java

@@ -12,7 +12,8 @@ public class AmmeterMeteDataVo {
 
     /** 电表名称 */
     private String deviceName;
-
+    /** 设备id */
+    private String deviceId;
     /** 通信状态 */
     private String emsCommunicationStatus;
 
@@ -54,4 +55,12 @@ public class AmmeterMeteDataVo {
     public void setMeteDataDetailInfo(List<MeteDataDetailInfo> meteDataDetailInfo) {
         this.meteDataDetailInfo = meteDataDetailInfo;
     }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
 }

ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java

@@ -116,4 +116,7 @@ public interface EmsPointMatchMapper
                                                               @Param("startDate")Date startDate,
                                                               @Param("endDate")Date endDate,
                                                               @Param("deviceId")String deviceId);
+
+    // 单个站点单个设备点位查询
+    public List<EmsPointMatch> getSingleSiteDevicePoints(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory);
 }

ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java

@@ -456,6 +456,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
                 if (AMMETER_DEVICE_LOAD.equals(ammeterId)) {
                     AmmeterLoadDataVo ammeterLoadDataVo = new AmmeterLoadDataVo();
                     ammeterLoadDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
+                    ammeterLoadDataVo.setDeviceId(ammeterDevice.get("id").toString());
                     ammeterLoadDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus") == null? "" :
                             ammeterDevice.get("communicationStatus").toString());
                     // 处理总表数据
@@ -464,6 +465,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
                 } else if (AMMETER_DEVICE_METE.equals(ammeterId)) {
                     AmmeterMeteDataVo ammeterMeteDataVo = new AmmeterMeteDataVo();
                     ammeterMeteDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
+                    ammeterMeteDataVo.setDeviceId(ammeterDevice.get("id").toString());
                     ammeterMeteDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus") == null? "" :
                             ammeterDevice.get("communicationStatus").toString());
                     // 处理储能表数据