From 24caf73263e8f4bd12b600a4c1edccda8604d285 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 5 Dec 2024 15:58:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E6=B7=BB=E5=8A=A0=E9=87=87?= =?UTF-8?q?=E9=9B=86=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E7=89=A9=E8=81=94=E7=BD=91=E5=AE=9E=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9B=91=E6=8E=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增采集设备信息管理页面，包括设备列表、新增、修改、删除等功能 - 在 TreeSelects 类中添加 monitorType 字段，用于存储监控类型 - 在 TWTempertureData 类中添加 monitorType 字段，用于存储能源类型- 更新 TWTempertureDataMapper.xml，添加 monitor_type 字段的映射 --- .../ruoyi/ems/base/domain/TreeSelects.java | 12 + .../ems/record/domain/TWTempertureData.java | 69 +-- .../ems/record/TWTempertureDataMapper.xml | 17 +- .../base/baseCollectDeviceInfoTemp/index.vue | 403 ++++++++++++++++++ 4 files changed, 468 insertions(+), 33 deletions(-) create mode 100644 ruoyi-ui/src/views/ems/base/baseCollectDeviceInfoTemp/index.vue diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/base/domain/TreeSelects.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/base/domain/TreeSelects.java index cc7fe19..bd01889 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/base/domain/TreeSelects.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/base/domain/TreeSelects.java @@ -25,6 +25,9 @@ public class TreeSelects implements Serializable private String code; + private Long monitorType; + + /** 子节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; @@ -46,6 +49,7 @@ public class TreeSelects implements Serializable this.label = baseMonitorInfo.getMonitorName(); this.code = baseMonitorInfo.getMonitorCode(); this.children = baseMonitorInfo.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); + this.monitorType = baseMonitorInfo.getMonitorType(); } public TreeSelects(EmsBaseWorkUnit baseWorkUnit){ @@ -99,4 +103,12 @@ public class TreeSelects implements Serializable { this.children = children; } + + public Long getMonitorType() { + return monitorType; + } + + public void setMonitorType(Long monitorType) { + this.monitorType = monitorType; + } } diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/domain/TWTempertureData.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/domain/TWTempertureData.java index 744be3e..b58f0db 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/domain/TWTempertureData.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/domain/TWTempertureData.java @@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 物联网实时数据对象 T_W_TempertureData - * + * * @author Caoql * @date 2024-08-21 */ @@ -76,52 +76,57 @@ public class TWTempertureData extends BaseEntity @Excel(name = " ") private Long confirmFlag; - public void setObjid(Long objid) + + /** 计量设备类型 */ + @Excel(name = "能源类型") + private Long monitorType; + + public void setObjid(Long objid) { this.objid = objid; } - public Long getObjid() + public Long getObjid() { return objid; } - public void setMonitorId(String monitorId) + public void setMonitorId(String monitorId) { this.monitorId = monitorId; } - public String getMonitorId() + public String getMonitorId() { return monitorId; } - public void setCollectTime(Date collectTime) + public void setCollectTime(Date collectTime) { this.collectTime = collectTime; } - public Date getCollectTime() + public Date getCollectTime() { return collectTime; } - public void setTempreture(BigDecimal tempreture) + public void setTempreture(BigDecimal tempreture) { this.tempreture = tempreture; } - public BigDecimal getTempreture() + public BigDecimal getTempreture() { return tempreture; } - public void setHumidity(BigDecimal humidity) + public void setHumidity(BigDecimal humidity) { this.humidity = humidity; } - public BigDecimal getHumidity() + public BigDecimal getHumidity() { return humidity; } - public void setIlluminance(BigDecimal illuminance) + public void setIlluminance(BigDecimal illuminance) { this.illuminance = illuminance; } @@ -134,74 +139,83 @@ public class TWTempertureData extends BaseEntity this.monitorName = monitorName; } - public BigDecimal getIlluminance() + public BigDecimal getIlluminance() { return illuminance; } - public void setNoise(BigDecimal noise) + public void setNoise(BigDecimal noise) { this.noise = noise; } - public BigDecimal getNoise() + public BigDecimal getNoise() { return noise; } - public void setConcentration(BigDecimal concentration) + public void setConcentration(BigDecimal concentration) { this.concentration = concentration; } - public BigDecimal getConcentration() + public BigDecimal getConcentration() { return concentration; } - public void setRecodeTime(Date recodeTime) + public void setRecodeTime(Date recodeTime) { this.recodeTime = recodeTime; } - public Date getRecodeTime() + public Date getRecodeTime() { return recodeTime; } - public void setAlarmType(Long alarmType) + public void setAlarmType(Long alarmType) { this.alarmType = alarmType; } - public Long getAlarmType() + public Long getAlarmType() { return alarmType; } - public void setConfirmPersonID(Long confirmPersonID) + public void setConfirmPersonID(Long confirmPersonID) { this.confirmPersonID = confirmPersonID; } - public Long getConfirmPersonID() + public Long getConfirmPersonID() { return confirmPersonID; } - public void setConfirmTime(Date confirmTime) + public void setConfirmTime(Date confirmTime) { this.confirmTime = confirmTime; } - public Date getConfirmTime() + public Date getConfirmTime() { return confirmTime; } - public void setConfirmFlag(Long confirmFlag) + public void setConfirmFlag(Long confirmFlag) { this.confirmFlag = confirmFlag; } - public Long getConfirmFlag() + public Long getConfirmFlag() { return confirmFlag; } + + public Long getMonitorType() { + return monitorType; + } + + public void setMonitorType(Long monitorType) { + this.monitorType = monitorType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -218,6 +232,7 @@ public class TWTempertureData extends BaseEntity .append("confirmPersonID", getConfirmPersonID()) .append("confirmTime", getConfirmTime()) .append("confirmFlag", getConfirmFlag()) + .append("monitorType", getMonitorType()) .toString(); } } diff --git a/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml index 3172e60..ac6e5fb 100644 --- a/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml +++ b/ruoyi-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,14 +36,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" twtd.confirmPersonID, twtd.confirmTime, twtd.confirmFlag, - ebmi.monitor_name + ebmi.monitor_name, + + ebmi.monitor_type + from T_W_TempertureData twtd left join ems_base_monitor_info ebmi on twtd.monitorId = ebmi.monitor_code - + - \ No newline at end of file + diff --git a/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfoTemp/index.vue b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfoTemp/index.vue new file mode 100644 index 0000000..d99e74a --- /dev/null +++ b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfoTemp/index.vue @@ -0,0 +1,403 @@ + + +