task63-点位清单增加单位列

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-13
+ * @date 2025-10-14
  */
 public class EmsPointMatch extends BaseEntity
 {
@@ -18,8 +18,8 @@ public class EmsPointMatch extends BaseEntity
     /** 设备ID，主键自增长 */
     private Long id;
 
-    /** 点位名称 */
-    @Excel(name = "点位名称")
+    /** 存储点位名称 */
+    @Excel(name = "存储点位名称")
     private String pointName;
 
     /** 点位所在表 */
@@ -50,6 +50,18 @@ public class EmsPointMatch extends BaseEntity
     @Excel(name = "数据点位来源设备")
     private String dataDevice;
 
+    /** 数据单位 */
+    @Excel(name = "数据单位")
+    private String dataUnit;
+
+    /** 数据类型：1-瞬时值 2-增量 */
+    @Excel(name = "数据类型：1-瞬时值 2-增量")
+    private Long dataType;
+
+    /** 点位是否需要区分多设备：0-不需要 1-需要 */
+    @Excel(name = "点位是否需要区分多设备：0-不需要 1-需要")
+    private Long needDiffDeviceId;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -140,6 +152,36 @@ public class EmsPointMatch extends BaseEntity
         return dataDevice;
     }
 
+    public void setDataUnit(String dataUnit)
+    {
+        this.dataUnit = dataUnit;
+    }
+
+    public String getDataUnit()
+    {
+        return dataUnit;
+    }
+
+    public void setDataType(Long dataType)
+    {
+        this.dataType = dataType;
+    }
+
+    public Long getDataType()
+    {
+        return dataType;
+    }
+
+    public void setNeedDiffDeviceId(Long needDiffDeviceId)
+    {
+        this.needDiffDeviceId = needDiffDeviceId;
+    }
+
+    public Long getNeedDiffDeviceId()
+    {
+        return needDiffDeviceId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -152,6 +194,9 @@ public class EmsPointMatch extends BaseEntity
                 .append("dataPoint", getDataPoint())
                 .append("dataPointName", getDataPointName())
                 .append("dataDevice", getDataDevice())
+                .append("dataUnit", getDataUnit())
+                .append("dataType", getDataType())
+                .append("needDiffDeviceId", getNeedDiffDeviceId())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

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

@@ -38,6 +38,18 @@ public class PointQueryResponse
     @Excel(name = "点位最新数据")
     private int isNeedDeviceId;
 
+    /** 数据单位 */
+    @Excel(name = "数据单位")
+    private String dataUnit;
+
+    public String getDataUnit() {
+        return dataUnit;
+    }
+
+    public void setDataUnit(String dataUnit) {
+        this.dataUnit = dataUnit;
+    }
+
     public int getIsNeedDeviceId() {
         return isNeedDeviceId;
     }

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

@@ -115,7 +115,6 @@ public class FXXDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
                 batteryStackDataProcess(deviceId, jsonData);
 
             } else if (deviceId.contains("BMSC")) {
-                log.info("BMSC data:"+ jsonData);
                 batteryClusterDataProcess(deviceId, jsonData);
                 batteryDataProcess(deviceId, jsonData,dataUpdateTime);