From 62340387bb3da95c260ae8608a89f2b429b9e4f6 Mon Sep 17 00:00:00 2001 From: zq Date: Fri, 5 Dec 2025 17:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=8120251120-=E4=BC=98=E5=8C=96=E7=82=B9=E4=BD=8D=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsPointMatchController.java | 5 +- .../domain/vo/DevicePointMatchExportVo.java | 97 +++++++++++++++++++ .../ems/domain/vo/DevicePointMatchVo.java | 25 +++-- .../xzzn/ems/mapper/EmsPointMatchMapper.java | 4 + .../ems/service/IEmsPointMatchService.java | 3 +- .../impl/EmsPointMatchServiceImpl.java | 8 +- .../mapper/ems/EmsPointMatchMapper.xml | 18 ++++ 7 files changed, 139 insertions(+), 21 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchExportVo.java diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java index 75b1ca9..8441650 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsPointMatchController.java @@ -16,6 +16,7 @@ import com.xzzn.common.core.controller.BaseController; import com.xzzn.common.core.domain.AjaxResult; import com.xzzn.common.enums.BusinessType; import com.xzzn.ems.domain.EmsPointMatch; +import com.xzzn.ems.domain.vo.DevicePointMatchExportVo; import com.xzzn.ems.domain.vo.DevicePointMatchVo; import com.xzzn.ems.domain.vo.ImportPointDataRequest; import com.xzzn.ems.service.IEmsPointMatchService; @@ -43,8 +44,8 @@ public class EmsPointMatchController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, EmsPointMatch emsPointMatch) { - List list = emsPointMatchService.selectEmsPointMatchList(emsPointMatch); - ExcelUtil util = new ExcelUtil(EmsPointMatch.class); + List list = emsPointMatchService.selectEmsPointMatchList(emsPointMatch); + ExcelUtil util = new ExcelUtil<>(DevicePointMatchExportVo.class); util.exportExcel(response, list, "点位匹配数据"); } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchExportVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchExportVo.java new file mode 100644 index 0000000..cdaff1a --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchExportVo.java @@ -0,0 +1,97 @@ +package com.xzzn.ems.domain.vo; + +import com.xzzn.common.annotation.Excel; + +import java.io.Serializable; + +/** + * 点位清单导出参数 + */ +public class DevicePointMatchExportVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** 点位匹配字段 */ + @Excel(name = "点位匹配字段") + private String matchField; + + /** 存储点位名称 */ + @Excel(name = "点位匹配字段名称") + private String pointName; + + /** 数据点位 */ + @Excel(name = "数据点位") + private String dataPoint; + + /** 数据点位名称 */ + @Excel(name = "数据点位名称") + private String dataPointName; + + /** 数据单位 */ + @Excel(name = "数据单位") + private String dataUnit; + + /** 是否告警点位 */ + @Excel(name = "是否告警点位", readConverterExp = "0=否,1=是") + private String isAlarm; + + /** 寄存器地址 */ + @Excel(name = "寄存器地址") + private String ipAddress; + + public String getPointName() { + return pointName; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + + public String getMatchField() { + return matchField; + } + + public void setMatchField(String matchField) { + this.matchField = matchField; + } + + public String getDataPoint() { + return dataPoint; + } + + public void setDataPoint(String dataPoint) { + this.dataPoint = dataPoint; + } + + public String getDataPointName() { + return dataPointName; + } + + public void setDataPointName(String dataPointName) { + this.dataPointName = dataPointName; + } + + public String getDataUnit() { + return dataUnit; + } + + public void setDataUnit(String dataUnit) { + this.dataUnit = dataUnit; + } + + public String getIsAlarm() { + return isAlarm; + } + + public void setIsAlarm(String isAlarm) { + this.isAlarm = isAlarm; + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchVo.java index b69fdb7..a333f89 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/DevicePointMatchVo.java @@ -14,6 +14,10 @@ public class DevicePointMatchVo implements Serializable { @Excel(name = "点位匹配字段") private String matchField; + /** 存储点位名称 */ + @Excel(name = "点位匹配字段名称") + private String pointName; + /** 数据点位 */ @Excel(name = "数据点位") private String dataPoint; @@ -29,10 +33,6 @@ public class DevicePointMatchVo implements Serializable { /** 是否告警点位 */ @Excel(name = "是否告警点位", readConverterExp = "0=否,1=是") private String isAlarm; -// -// /** 数据点位来源设备 */ -// @Excel(name = "数据点位来源设备") -// private String dataDevice; /** 寄存器地址 */ @Excel(name = "寄存器地址") @@ -42,6 +42,14 @@ public class DevicePointMatchVo implements Serializable { @Excel(name = "错误信息") private String errorMsg; + public String getPointName() { + return pointName; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + public String getMatchField() { return matchField; } @@ -74,15 +82,6 @@ public class DevicePointMatchVo implements Serializable { this.dataUnit = dataUnit; } -// public String getDataDevice() { -// return dataDevice; -// } -// -// public void setDataDevice(String dataDevice) { -// this.dataDevice = dataDevice; -// } - - public String getIsAlarm() { return isAlarm; } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java index 077bc8f..b799df3 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map; import com.xzzn.ems.domain.EmsPointMatch; +import com.xzzn.ems.domain.vo.DevicePointMatchExportVo; +import com.xzzn.ems.domain.vo.DevicePointMatchVo; import com.xzzn.ems.domain.vo.GeneralQueryDataVo; import com.xzzn.ems.domain.vo.PointQueryResponse; import org.apache.ibatis.annotations.Param; @@ -146,4 +148,6 @@ public interface EmsPointMatchMapper EmsPointMatch getOnePointMatch(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory, @Param("dataPoint") String dataPoint); List getDevicePointMatchList(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory); + + List selectEmsPointMatchExportList(EmsPointMatch emsPointMatch); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsPointMatchService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsPointMatchService.java index 675da0d..121ec50 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsPointMatchService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsPointMatchService.java @@ -3,6 +3,7 @@ package com.xzzn.ems.service; import java.util.List; import com.xzzn.ems.domain.EmsPointMatch; +import com.xzzn.ems.domain.vo.DevicePointMatchExportVo; import com.xzzn.ems.domain.vo.DevicePointMatchVo; import com.xzzn.ems.domain.vo.ImportPointDataRequest; @@ -20,7 +21,7 @@ public interface IEmsPointMatchService * @param emsPointMatch 点位匹配 * @return 点位匹配集合 */ - public List selectEmsPointMatchList(EmsPointMatch emsPointMatch); + public List selectEmsPointMatchList(EmsPointMatch emsPointMatch); /** diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java index ff625e5..0e9d660 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import com.xzzn.common.utils.poi.ExcelUtil; +import com.xzzn.ems.domain.vo.DevicePointMatchExportVo; import com.xzzn.ems.domain.vo.DevicePointMatchVo; import com.xzzn.ems.domain.vo.ImportPointDataRequest; import com.xzzn.ems.enums.DeviceMatchTable; @@ -62,9 +63,9 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService * @return 点位匹配 */ @Override - public List selectEmsPointMatchList(EmsPointMatch emsPointMatch) + public List selectEmsPointMatchList(EmsPointMatch emsPointMatch) { - return emsPointMatchMapper.selectEmsPointMatchList(emsPointMatch); + return emsPointMatchMapper.selectEmsPointMatchExportList(emsPointMatch); } /** @@ -196,9 +197,6 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService if (StringUtils.isBlank(pointMatch.getDataPointName())) { errorMsg.append("数据点位名称不能为空;"); } -// if (StringUtils.isBlank(pointMatch.getDataDevice())) { -// errorMsg.append("数据点位来源设备不能为空;"); -// } if (errorMsg.length() > 0) { pointMatch.setErrorMsg(errorMsg.toString()); errorList.add(pointMatch); diff --git a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml index c3e4db8..29f9581 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml @@ -450,4 +450,22 @@ where site_id = #{siteId} and device_category = #{deviceCategory} + + + \ No newline at end of file