feat(ems): 集成AutoMapper并优化实体类结构

- 调整实体继承关系，将部分记录类继承自EmsRecordEntity
- 新增EmsRecordEntity基类用于统一记录实体结构
- 为多个实体类添加@AutoMapper注解以支持自动映射
- 修改排序字段从createTime为recordTime
- 添加@TableField(exist = false)注解标记非数据库字段
- 移除冗余的getter/setter方法和toString实现
- 在查询逻辑中增加关联表字段选择和左连接操作
- 注释掉不必要的创建者和更新者设置逻辑
- 移除重复导入的分页相关包
- 更新实体类字段注解及访问控制策略

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java

@@ -7,8 +7,6 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.base.domain.EmsBaseEnergyPrice;

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java

@@ -2,6 +2,7 @@ package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -20,6 +21,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_collect_device_info")
+@AutoMapper(target = EmsBaseCollectDeviceInfo.class)
 public class EmsBaseCollectDeviceInfo extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyPrice.java

@@ -2,6 +2,7 @@ package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -21,6 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_energy_price")
+@AutoMapper(target = EmsBaseEnergyPrice.class)
 public class EmsBaseEnergyPrice extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyType.java

@@ -1,6 +1,7 @@
 package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -21,6 +22,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_energy_type")
+@AutoMapper(target = EmsBaseEnergyType.class)
 public class EmsBaseEnergyType extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
@@ -12,6 +13,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
+@AutoMapper(target = EmsBaseEntity.class)
 public class EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorInfo.java

@@ -1,6 +1,7 @@
 package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -20,6 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_monitor_info")
+@AutoMapper(target = EmsBaseMonitorInfo.class)
 public class EmsBaseMonitorInfo extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorThreshold.java

@@ -1,6 +1,8 @@
 package org.dromara.ems.base.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,6 +19,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_monitor_threshold")
+@AutoMapper(target = EmsBaseMonitorThreshold.class)
 public class EmsBaseMonitorThreshold extends EmsBaseEntity {
 
     @Serial
@@ -37,6 +40,7 @@ public class EmsBaseMonitorThreshold extends EmsBaseEntity {
      * 计量设备名称
      */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java

@@ -1,7 +1,9 @@
 package org.dromara.ems.base.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -21,6 +23,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_monitor_work_unit")
+@AutoMapper(target = EmsBaseMonitorWorkUnit.class)
 public class EmsBaseMonitorWorkUnit extends EmsBaseEntity {
 
     @Serial
@@ -41,6 +44,7 @@ public class EmsBaseMonitorWorkUnit extends EmsBaseEntity {
      * 计量设备名称
      */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseSharePrice.java

@@ -1,6 +1,7 @@
 package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -19,6 +20,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_share_price")
+@AutoMapper(target = EmsBaseSharePrice.class)
 public class EmsBaseSharePrice extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java

@@ -2,6 +2,7 @@ package org.dromara.ems.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -22,6 +23,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_base_work_unit")
+@AutoMapper(target = EmsBaseWorkUnit.class)
 public class EmsBaseWorkUnit extends EmsBaseEntity {
 
     @Serial

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorThresholdServiceImpl.java

@@ -55,6 +55,11 @@ public class EmsBaseMonitorThresholdServiceImpl implements IEmsBaseMonitorThresh
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsBaseMonitorThreshold> lqw = JoinWrappers.lambda(EmsBaseMonitorThreshold.class)
             .selectAll(EmsBaseMonitorThreshold.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsBaseMonitorThreshold::getMonitorCode)
+
             .eq(bo.getObjId() != null, EmsBaseMonitorThreshold::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorThreshold::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getMonitorType() != null, EmsBaseMonitorThreshold::getMonitorType, bo.getMonitorType())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java

@@ -9,6 +9,7 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.base.domain.EmsBaseMonitorWorkUnit;
 import org.dromara.ems.base.mapper.EmsBaseMonitorWorkUnitMapper;
 import org.dromara.ems.base.service.IEmsBaseMonitorWorkUnitService;
@@ -50,6 +51,13 @@ public class EmsBaseMonitorWorkUnitServiceImpl implements IEmsBaseMonitorWorkUni
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsBaseMonitorWorkUnit> lqw = JoinWrappers.lambda(EmsBaseMonitorWorkUnit.class)
             .selectAll(EmsBaseMonitorWorkUnit.class)
+
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsBaseMonitorWorkUnit::getMonitorCode)
+
+
             .eq(bo.getObjId() != null, EmsBaseMonitorWorkUnit::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorWorkUnit::getMonitorCode, bo.getMonitorCode())
             .eq(StringUtils.isNotBlank(bo.getWorkUnitCode()), EmsBaseMonitorWorkUnit::getWorkUnitCode, bo.getWorkUnitCode())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java

@@ -7,7 +7,6 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.record.domain.EmsRecordDnbInstant;
 import org.dromara.ems.record.service.IEmsRecordDnbInstantService;
@@ -79,7 +78,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     //@Log(title = "电实时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
-        emsRecordDnbInstant.setCreateBy(LoginHelper.getUsername());
+//        emsRecordDnbInstant.setCreateBy(LoginHelper.getUsername());
         return toAjax(emsRecordDnbInstantService.insertEmsRecordDnbInstant(emsRecordDnbInstant));
     }
 
@@ -90,7 +89,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     //@Log(title = "电实时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
-        emsRecordDnbInstant.setUpdateBy(LoginHelper.getUsername());
+    //    emsRecordDnbInstant.setUpdateBy(LoginHelper.getUsername());
         return toAjax(emsRecordDnbInstantService.updateEmsRecordDnbInstant(emsRecordDnbInstant));
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java

@@ -8,7 +8,6 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.record.domain.EmsRecordSteamInstant;
 import org.dromara.ems.record.service.IEmsRecordSteamInstantService;
@@ -72,7 +71,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
-        emsRecordSteamInstant.setCreateBy(LoginHelper.getUsername());
+//        emsRecordSteamInstant.setCreateBy(LoginHelper.getUsername());
         return toAjax(emsRecordSteamInstantService.insertEmsRecordSteamInstant(emsRecordSteamInstant));
     }
 
@@ -83,7 +82,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
-        emsRecordSteamInstant.setUpdateBy(LoginHelper.getUsername());
+//        emsRecordSteamInstant.setUpdateBy(LoginHelper.getUsername());
         return toAjax(emsRecordSteamInstantService.updateEmsRecordSteamInstant(emsRecordSteamInstant));
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java

@@ -8,7 +8,6 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.record.domain.EmsRecordWaterInstant;
 import org.dromara.ems.record.service.IEmsRecordWaterInstantService;
@@ -75,7 +74,7 @@ public class EmsRecordWaterInstantController extends BaseController
     @PostMapping
     public R add(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
     {
-        emsRecordWaterInstant.setCreateBy(LoginHelper.getUsername());
+//        emsRecordWaterInstant.setCreateBy(LoginHelper.getUsername());
         return toAjax(emsRecordWaterInstantService.insertEmsRecordWaterInstant(emsRecordWaterInstant));
     }
 
@@ -87,7 +86,7 @@ public class EmsRecordWaterInstantController extends BaseController
     @PutMapping
     public R edit(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
     {
-        emsRecordWaterInstant.setUpdateBy(LoginHelper.getUsername());
+//        emsRecordWaterInstant.setUpdateBy(LoginHelper.getUsername());
         return toAjax(emsRecordWaterInstantService.updateEmsRecordWaterInstant(emsRecordWaterInstant));
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java

@@ -8,7 +8,6 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.record.domain.EmsVibrationInstant;
 import org.dromara.ems.record.service.IEmsVibrationInstantService;
@@ -75,7 +74,7 @@ public class EmsVibrationInstantController extends BaseController
     @PostMapping
     public R add(@RequestBody EmsVibrationInstant emsVibrationInstant)
     {
-        emsVibrationInstant.setCreateBy(LoginHelper.getUsername());
+//        emsVibrationInstant.setCreateBy(LoginHelper.getUsername());
         return toAjax(emsVibrationInstantService.insertEmsVibrationInstant(emsVibrationInstant));
     }
 
@@ -87,7 +86,7 @@ public class EmsVibrationInstantController extends BaseController
     @PutMapping
     public R edit(@RequestBody EmsVibrationInstant emsVibrationInstant)
     {
-        emsVibrationInstant.setUpdateBy(LoginHelper.getUsername());
+//        emsVibrationInstant.setUpdateBy(LoginHelper.getUsername());
         return toAjax(emsVibrationInstantService.updateEmsVibrationInstant(emsVibrationInstant));
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java

@@ -9,7 +9,6 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.base.service.IEmsBaseEnergyTypeService;
 import org.dromara.ems.base.service.IEmsBaseMonitorInfoService;
@@ -151,7 +150,7 @@ public class TWTempertureDataController extends BaseController
     @PostMapping
     public R add(@RequestBody TWTempertureData tWTempertureData)
     {
-        tWTempertureData.setCreateBy(LoginHelper.getUsername());
+//        tWTempertureData.setCreateBy(LoginHelper.getUsername());
         return toAjax(tWTempertureDataService.insertTWTempertureData(tWTempertureData));
     }
 
@@ -163,7 +162,7 @@ public class TWTempertureDataController extends BaseController
     @PutMapping
     public R edit(@RequestBody TWTempertureData tWTempertureData)
     {
-        tWTempertureData.setUpdateBy(LoginHelper.getUsername());
+//        tWTempertureData.setUpdateBy(LoginHelper.getUsername());
         return toAjax(tWTempertureDataService.updateTWTempertureData(tWTempertureData));
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsIOTData.java

@@ -1,8 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 
+@Data
+@AutoMapper(target = EmsIOTData.class)
 public class EmsIOTData {
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsIOTInstantMonitorData.java

@@ -1,5 +1,10 @@
 package org.dromara.ems.record.domain;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+@Data
+@AutoMapper(target = EmsIOTInstantMonitorData.class)
 public class EmsIOTInstantMonitorData {
     private String monitorId;
     private org.dromara.ems.record.domain.TWTempertureData data;

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java

@@ -1,11 +1,11 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.io.Serial;
@@ -21,6 +21,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_record_alarm_data")
+@AutoMapper(target = EmsRecordAlarmData.class)
 public class EmsRecordAlarmData extends EmsBaseEntity {
 
     @Serial
@@ -37,6 +38,7 @@ public class EmsRecordAlarmData extends EmsBaseEntity {
 
     /** 计量设备名称 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /** 采集设备编号 */
@@ -45,6 +47,7 @@ public class EmsRecordAlarmData extends EmsBaseEntity {
 
     /** 采集设备名称 */
     //@ExcelProperty(value = "采集设备名称")
+    @TableField(exist = false)
     private String collectDeviceName;
 
     /** 记录时间 */
@@ -73,7 +76,9 @@ public class EmsRecordAlarmData extends EmsBaseEntity {
     //@ExcelProperty(value = "操作时间",   format = "yyyy-MM-dd HH:mm:ss")
     private Date operationTime;
 
+    @TableField(exist = false)
     private String beginOperationTime;
+    @TableField(exist = false)
     private String endOperationTime;
 
     /** 备注 */
@@ -85,166 +90,8 @@ public class EmsRecordAlarmData extends EmsBaseEntity {
     private String notifyUser;
 
     /** 统一设备名称 */
+    @TableField(exist = false)
     private String deviceName;
 
-    public String getBeginOperationTime() {
-        return beginOperationTime;
-    }
 
-    public void setBeginOperationTime(String beginOperationTime) {
-        this.beginOperationTime = beginOperationTime;
-    }
-
-    public String getEndOperationTime() {
-        return endOperationTime;
-    }
-
-    public void setEndOperationTime(String endOperationTime) {
-        this.endOperationTime = endOperationTime;
-    }
-
-    public String getMonitorName() {
-        return monitorName;
-    }
-
-    public void setMonitorName(String monitorName) {
-        this.monitorName = monitorName;
-    }
-
-    public String getCollectDeviceName() {
-        return collectDeviceName;
-    }
-
-    public void setCollectDeviceName(String collectDeviceName) {
-        this.collectDeviceName = collectDeviceName;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public void setObjId(Long objId)
-    {
-        this.objId = objId;
-    }
-
-    public Long getObjId()
-    {
-        return objId;
-    }
-    public void setMonitorId(String monitorId)
-    {
-        this.monitorId = monitorId;
-    }
-
-    public String getMonitorId()
-    {
-        return monitorId;
-    }
-    public void setCollectDeviceId(String collectDeviceId)
-    {
-        this.collectDeviceId = collectDeviceId;
-    }
-
-    public String getCollectDeviceId()
-    {
-        return collectDeviceId;
-    }
-    public void setCollectTime(Date collectTime)
-    {
-        this.collectTime = collectTime;
-    }
-
-    public Date getCollectTime()
-    {
-        return collectTime;
-    }
-    public void setAlarmType(Long alarmType)
-    {
-        this.alarmType = alarmType;
-    }
-
-    public Long getAlarmType()
-    {
-        return alarmType;
-    }
-    public void setAlarmStatus(Long alarmStatus)
-    {
-        this.alarmStatus = alarmStatus;
-    }
-
-    public Long getAlarmStatus()
-    {
-        return alarmStatus;
-    }
-    public void setAlarmData(String alarmData)
-    {
-        this.alarmData = alarmData;
-    }
-
-    public String getAlarmData()
-    {
-        return alarmData;
-    }
-    public void setOperationName(String operationName)
-    {
-        this.operationName = operationName;
-    }
-
-    public String getOperationName()
-    {
-        return operationName;
-    }
-    public void setOperationTime(Date operationTime)
-    {
-        this.operationTime = operationTime;
-    }
-
-    public Date getOperationTime()
-    {
-        return operationTime;
-    }
-    public void setCause(String cause)
-    {
-        this.cause = cause;
-    }
-
-    public String getCause()
-    {
-        return cause;
-    }
-    public void setNotifyUser(String notifyUser)
-    {
-        this.notifyUser = notifyUser;
-    }
-
-    public String getNotifyUser()
-    {
-        return notifyUser;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId", getObjId())
-            .append("monitorId", getMonitorId())
-            .append("collectDeviceId", getCollectDeviceId())
-            .append("collectTime", getCollectTime())
-            .append("alarmType", getAlarmType())
-            .append("alarmStatus", getAlarmStatus())
-            .append("alarmData", getAlarmData())
-            .append("operationName", getOperationName())
-            .append("operationTime", getOperationTime())
-            .append("cause", getCause())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("notifyUser", getNotifyUser())
-            .toString();
-    }
 }

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmRule.java

@@ -1,11 +1,11 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.io.Serial;
@@ -21,6 +21,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_record_alarm_rule")
+@AutoMapper(target = EmsRecordAlarmRule.class)
 public class EmsRecordAlarmRule extends EmsBaseEntity {
 
     @Serial
@@ -42,7 +43,9 @@ public class EmsRecordAlarmRule extends EmsBaseEntity {
     /** 计量设备编号 */
     //@ExcelProperty(value = "计量设备编号")
     private String monitorId;
+    @TableField(exist = false)
     private String monitorCode;
+    @TableField(exist = false)
     private String monitorName;
 
     /** 记录时间 */
@@ -78,160 +81,7 @@ public class EmsRecordAlarmRule extends EmsBaseEntity {
     //@ExcelProperty(value = "备注")
     private String cause;
 
+    @TableField(exist = false)
     private String nickName;
 
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getMonitorCode() {
-        return monitorCode;
-    }
-
-    public void setMonitorCode(String monitorCode) {
-        this.monitorCode = monitorCode;
-    }
-
-    public String getMonitorName() {
-        return monitorName;
-    }
-
-    public void setMonitorName(String monitorName) {
-        this.monitorName = monitorName;
-    }
-
-    public void setObjId(Long objId)
-    {
-        this.objId = objId;
-    }
-
-    public Long getObjId()
-    {
-        return objId;
-    }
-    public void setRuleId(String ruleId)
-    {
-        this.ruleId = ruleId;
-    }
-
-    public String getRuleId()
-    {
-        return ruleId;
-    }
-    public void setRuleName(String ruleName)
-    {
-        this.ruleName = ruleName;
-    }
-
-    public String getRuleName()
-    {
-        return ruleName;
-    }
-    public void setMonitorId(String monitorId)
-    {
-        this.monitorId = monitorId;
-    }
-
-    public String getMonitorId()
-    {
-        return monitorId;
-    }
-    public void setCollectTime(Date collectTime)
-    {
-        this.collectTime = collectTime;
-    }
-
-    public Date getCollectTime()
-    {
-        return collectTime;
-    }
-    public void setEnergyType(Long energyType)
-    {
-        this.energyType = energyType;
-    }
-
-    public Long getEnergyType()
-    {
-        return energyType;
-    }
-    public void setTriggerRule(Long triggerRule)
-    {
-        this.triggerRule = triggerRule;
-    }
-
-    public Long getTriggerRule()
-    {
-        return triggerRule;
-    }
-    public void setTriggerNumber(Long triggerNumber)
-    {
-        this.triggerNumber = triggerNumber;
-    }
-
-    public Long getTriggerNumber()
-    {
-        return triggerNumber;
-    }
-    public void setTimeRange(Long timeRange)
-    {
-        this.timeRange = timeRange;
-    }
-
-    public Long getTimeRange()
-    {
-        return timeRange;
-    }
-    public void setDeviceOfflineTime(Long deviceOfflineTime)
-    {
-        this.deviceOfflineTime = deviceOfflineTime;
-    }
-
-    public Long getDeviceOfflineTime()
-    {
-        return deviceOfflineTime;
-    }
-    public void setNotifyUser(String notifyUser)
-    {
-        this.notifyUser = notifyUser;
-    }
-
-    public String getNotifyUser()
-    {
-        return notifyUser;
-    }
-    public void setCause(String cause)
-    {
-        this.cause = cause;
-    }
-
-    public String getCause()
-    {
-        return cause;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId", getObjId())
-            .append("ruleId", getRuleId())
-            .append("ruleName", getRuleName())
-            .append("monitorId", getMonitorId())
-            .append("collectTime", getCollectTime())
-            .append("energyType", getEnergyType())
-            .append("triggerRule", getTriggerRule())
-            .append("triggerNumber", getTriggerNumber())
-            .append("timeRange", getTimeRange())
-            .append("deviceOfflineTime", getDeviceOfflineTime())
-            .append("notifyUser", getNotifyUser())
-            .append("cause", getCause())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java

@@ -1,12 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -22,7 +23,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_record_dnb_instant")
-public class EmsRecordDnbInstant extends EmsBaseEntity {
+@AutoMapper(target = EmsRecordDnbInstant.class)
+public class EmsRecordDnbInstant extends EmsRecordEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -38,6 +40,7 @@ public class EmsRecordDnbInstant extends EmsBaseEntity {
 
     /** 计量设备名称 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /** 采集时间 */

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordEntity.java

@@ -0,0 +1,35 @@
+package org.dromara.ems.record.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@AutoMapper(target = EmsRecordEntity.class)
+public class EmsRecordEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+
+}

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java

@@ -1,12 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -22,7 +23,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_record_steam_instant")
-public class EmsRecordSteamInstant extends EmsBaseEntity {
+@AutoMapper(target = EmsRecordSteamInstant.class)
+public class EmsRecordSteamInstant extends EmsRecordEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -40,6 +42,7 @@ public class EmsRecordSteamInstant extends EmsBaseEntity {
 
     /** 计量设备编号 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java

@@ -1,12 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -22,7 +23,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_record_water_instant")
-public class EmsRecordWaterInstant extends EmsBaseEntity {
+@AutoMapper(target = EmsRecordWaterInstant.class)
+public class EmsRecordWaterInstant extends EmsRecordEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -38,6 +40,7 @@ public class EmsRecordWaterInstant extends EmsBaseEntity {
 
     /** 计量设备编号 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /** 采集时间 */

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java

@@ -1,12 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -20,12 +21,14 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("T_VibrationSensor_Data")
-public class EmsVibrationInstant extends EmsBaseEntity
+@AutoMapper(target = EmsVibrationInstant.class)
+public class EmsVibrationInstant extends EmsRecordEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 计量设备名称 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     public String getMonitorName() {

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java

@@ -1,12 +1,13 @@
 package org.dromara.ems.record.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -20,7 +21,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("T_W_TempertureData")
-public class TWTempertureData extends EmsBaseEntity
+@AutoMapper(target = TWTempertureData.class)
+public class TWTempertureData extends EmsRecordEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -33,6 +35,7 @@ public class TWTempertureData extends EmsBaseEntity
 
     /**计量设备名称**/
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /** 采集时间 */

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java

@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.ems.base.domain.EmsBaseCollectDeviceInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.base.domain.EmsBaseMonitorThreshold;
 import org.dromara.ems.base.mapper.EmsBaseCollectDeviceInfoMapper;
 import org.dromara.ems.base.mapper.EmsBaseMonitorThresholdMapper;
@@ -80,6 +81,15 @@ public class EmsRecordAlarmDataServiceImpl implements IEmsRecordAlarmDataService
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsRecordAlarmData> lqw = JoinWrappers.lambda(EmsRecordAlarmData.class)
             .selectAll(EmsRecordAlarmData.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsRecordAlarmData::getMonitorId)
+
+            .select(EmsBaseCollectDeviceInfo::getCollectDeviceName)
+            .leftJoin(EmsBaseCollectDeviceInfo.class,EmsBaseCollectDeviceInfo::getCollectDeviceId, EmsRecordAlarmData::getCollectDeviceId)
+
+
             .eq(bo.getObjId() != null, EmsRecordAlarmData::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorId()), EmsRecordAlarmData::getMonitorId, bo.getMonitorId())
             .eq(StringUtils.isNotBlank(bo.getCollectDeviceId()), EmsRecordAlarmData::getCollectDeviceId, bo.getCollectDeviceId())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmRuleServiceImpl.java

@@ -9,6 +9,7 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.record.domain.EmsRecordAlarmRule;
 import org.dromara.ems.record.mapper.EmsRecordAlarmRuleMapper;
 import org.dromara.ems.record.service.IEmsRecordAlarmRuleService;
@@ -50,6 +51,12 @@ public class EmsRecordAlarmRuleServiceImpl implements IEmsRecordAlarmRuleService
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsRecordAlarmRule> lqw = JoinWrappers.lambda(EmsRecordAlarmRule.class)
             .selectAll(EmsRecordAlarmRule.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsRecordAlarmRule::getMonitorId)
+
+
             .eq(bo.getObjId() != null, EmsRecordAlarmRule::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getRuleId()), EmsRecordAlarmRule::getRuleId, bo.getRuleId())
             .like(StringUtils.isNotBlank(bo.getRuleName()), EmsRecordAlarmRule::getRuleName, bo.getRuleName())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.record.domain.EmsRecordDnbInstant;
 import org.dromara.ems.record.mapper.EmsRecordDnbInstantMapper;
 import org.dromara.ems.record.service.IEmsRecordDnbInstantService;
@@ -47,6 +48,13 @@ public class EmsRecordDnbInstantServiceImpl implements IEmsRecordDnbInstantServi
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsRecordDnbInstant> lqw = JoinWrappers.lambda(EmsRecordDnbInstant.class)
             .selectAll(EmsRecordDnbInstant.class)
+
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsRecordDnbInstant::getMonitorCode)
+
+
             .eq(bo.getObjId() != null, EmsRecordDnbInstant::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordDnbInstant::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getCollectTime() != null, EmsRecordDnbInstant::getCollectTime, bo.getCollectTime())
@@ -62,7 +70,7 @@ public class EmsRecordDnbInstantServiceImpl implements IEmsRecordDnbInstantServi
             .eq(bo.getActivePower() != null, EmsRecordDnbInstant::getActivePower, bo.getActivePower())
             .eq(bo.getReactivePower() != null, EmsRecordDnbInstant::getReactivePower, bo.getReactivePower())
             .eq(bo.getCollectType() != null, EmsRecordDnbInstant::getCollectType, bo.getCollectType())
-            .orderByDesc(EmsRecordDnbInstant::getCreateTime);
+            .orderByDesc(EmsRecordDnbInstant::getRecordTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.record.domain.EmsRecordSteamInstant;
 import org.dromara.ems.record.mapper.EmsRecordSteamInstantMapper;
 import org.dromara.ems.record.service.IEmsRecordSteamInstantService;
@@ -49,6 +50,12 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsRecordSteamInstant> lqw = JoinWrappers.lambda(EmsRecordSteamInstant.class)
             .selectAll(EmsRecordSteamInstant.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsRecordSteamInstant::getMonitorCode)
+
+
             .eq(bo.getObjId() != null, EmsRecordSteamInstant::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordSteamInstant::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getCollectTime() != null, EmsRecordSteamInstant::getCollectTime, bo.getCollectTime())
@@ -61,7 +68,7 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
             .eq(bo.getDensity() != null, EmsRecordSteamInstant::getDensity, bo.getDensity())
             .eq(bo.getDifferencePress() != null, EmsRecordSteamInstant::getDifferencePress, bo.getDifferencePress())
             .eq(bo.getRecordTime() != null, EmsRecordSteamInstant::getRecordTime, bo.getRecordTime())
-            .orderByDesc(EmsRecordSteamInstant::getCreateTime);
+            .orderByDesc(EmsRecordSteamInstant::getRecordTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.record.domain.EmsRecordWaterInstant;
 import org.dromara.ems.record.mapper.EmsRecordWaterInstantMapper;
 import org.dromara.ems.record.service.IEmsRecordWaterInstantService;
@@ -50,6 +51,12 @@ public class EmsRecordWaterInstantServiceImpl implements IEmsRecordWaterInstantS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsRecordWaterInstant> lqw = JoinWrappers.lambda(EmsRecordWaterInstant.class)
             .selectAll(EmsRecordWaterInstant.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsRecordWaterInstant::getMonitorCode)
+
+
             .eq(bo.getObjId() != null, EmsRecordWaterInstant::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordWaterInstant::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getCollectTime() != null, EmsRecordWaterInstant::getCollectTime, bo.getCollectTime())
@@ -57,7 +64,7 @@ public class EmsRecordWaterInstantServiceImpl implements IEmsRecordWaterInstantS
             .eq(bo.getWaterFlow() != null, EmsRecordWaterInstant::getWaterFlow, bo.getWaterFlow())
             .eq(bo.getRecordTime() != null, EmsRecordWaterInstant::getRecordTime, bo.getRecordTime())
             .eq(bo.getCollectType() != null, EmsRecordWaterInstant::getCollectType, bo.getCollectType())
-            .orderByDesc(EmsRecordWaterInstant::getCreateTime);
+            .orderByDesc(EmsRecordWaterInstant::getRecordTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java

@@ -55,7 +55,7 @@ public class EmsVibrationInstantServiceImpl implements IEmsVibrationInstantServi
             .eq(bo.getAcceleration() != null, EmsVibrationInstant::getAcceleration, bo.getAcceleration())
             .eq(bo.getTemperature() != null, EmsVibrationInstant::getTemperature, bo.getTemperature())
             .eq(bo.getRecodeTime() != null, EmsVibrationInstant::getRecodeTime, bo.getRecodeTime())
-            .orderByDesc(EmsVibrationInstant::getCreateTime);
+            .orderByDesc(EmsVibrationInstant::getRecodeTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/TWTempertureDataServiceImpl.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.record.domain.TWTempertureData;
 import org.dromara.ems.record.mapper.TWTempertureDataMapper;
 import org.dromara.ems.record.service.ITWTempertureDataService;
@@ -47,6 +48,13 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<TWTempertureData> lqw = JoinWrappers.lambda(TWTempertureData.class)
             .selectAll(TWTempertureData.class)
+
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, TWTempertureData::getMonitorId)
+
+
             .eq(bo.getObjid() != null, TWTempertureData::getObjid, bo.getObjid())
             .eq(StringUtils.isNotBlank(bo.getMonitorId()), TWTempertureData::getMonitorId, bo.getMonitorId())
             .eq(bo.getCollectTime() != null, TWTempertureData::getCollectTime, bo.getCollectTime())
@@ -60,7 +68,7 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService
             .eq(bo.getConfirmPersonID() != null, TWTempertureData::getConfirmPersonID, bo.getConfirmPersonID())
             .eq(bo.getConfirmTime() != null, TWTempertureData::getConfirmTime, bo.getConfirmTime())
             .eq(bo.getConfirmFlag() != null, TWTempertureData::getConfirmFlag, bo.getConfirmFlag())
-            .orderByDesc(TWTempertureData::getCreateTime);
+            .orderByDesc(TWTempertureData::getCollectTime);
         return lqw;
     }
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointDnb.java

@@ -1,9 +1,11 @@
 package org.dromara.ems.report.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -24,6 +26,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_report_point_dnb")
+@AutoMapper(target = EmsReportPointDnb.class)
 public class EmsReportPointDnb extends EmsBaseEntity {
 
     @Serial
@@ -45,6 +48,7 @@ public class EmsReportPointDnb extends EmsBaseEntity {
      * 计量设备名称
      */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointSteam.java

@@ -1,7 +1,9 @@
 package org.dromara.ems.report.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.ems.base.domain.EmsBaseEntity;
@@ -20,6 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_report_point_steam")
+@AutoMapper(target = EmsReportPointSteam.class)
 public class EmsReportPointSteam extends EmsBaseEntity {
 
     @Serial
@@ -79,6 +82,7 @@ public class EmsReportPointSteam extends EmsBaseEntity {
 
     /** 计量设备名称 */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointWater.java

@@ -1,7 +1,9 @@
 package org.dromara.ems.report.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -21,6 +23,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("ems_report_point_water")
+@AutoMapper(target = EmsReportPointWater.class)
 public class EmsReportPointWater extends EmsBaseEntity {
 
     @Serial
@@ -41,6 +44,7 @@ public class EmsReportPointWater extends EmsBaseEntity {
      * 计量设备名称
      */
     //@ExcelProperty(value = "计量设备名称")
+    @TableField(exist = false)
     private String monitorName;
 
     /**

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EnergyStatisticalReport.java

@@ -1,6 +1,8 @@
 package org.dromara.ems.report.domain;
 
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.math.BigDecimal;
@@ -12,6 +14,8 @@ import java.math.BigDecimal;
  * @author Yinq
  * @date 2023-10-12
  */
+@Data
+@AutoMapper(target = EnergyStatisticalReport.class)
 public class EnergyStatisticalReport extends EmsBaseEntity {
     private static final long serialVersionUID = 1L;
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java

@@ -1,6 +1,8 @@
 package org.dromara.ems.report.domain;
 
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
 import org.dromara.ems.base.domain.EmsBaseEntity;
 
 import java.math.BigDecimal;
@@ -12,6 +14,8 @@ import java.math.BigDecimal;
  * @author Yinq
  * @date 2023-10-12
  */
+@Data
+@AutoMapper(target = PeaksValleysConsumptionReport.class)
 public class PeaksValleysConsumptionReport extends EmsBaseEntity {
     private static final long serialVersionUID = 1L;
 

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointDnbServiceImpl.java

@@ -9,6 +9,7 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.report.domain.EmsReportPointDnb;
 import org.dromara.ems.report.mapper.EmsReportPointDnbMapper;
 import org.dromara.ems.report.service.IEmsReportPointDnbService;
@@ -50,6 +51,11 @@ public class EmsReportPointDnbServiceImpl implements IEmsReportPointDnbService {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsReportPointDnb> lqw = JoinWrappers.lambda(EmsReportPointDnb.class)
             .selectAll(EmsReportPointDnb.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsReportPointDnb::getMonitorCode)
+
             .eq(bo.getObjId() != null, EmsReportPointDnb::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointDnb::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getInstrumentValue() != null, EmsReportPointDnb::getInstrumentValue, bo.getInstrumentValue())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointSteamServiceImpl.java

@@ -9,6 +9,8 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
+import org.dromara.ems.report.domain.EmsReportPointDnb;
 import org.dromara.ems.report.domain.EmsReportPointSteam;
 import org.dromara.ems.report.mapper.EmsReportPointSteamMapper;
 import org.dromara.ems.report.service.IEmsReportPointSteamService;
@@ -51,6 +53,11 @@ public class EmsReportPointSteamServiceImpl implements IEmsReportPointSteamServi
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsReportPointSteam> lqw = JoinWrappers.lambda(EmsReportPointSteam.class)
             .selectAll(EmsReportPointSteam.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsReportPointDnb::getMonitorCode)
+
             .eq(bo.getObjId() != null, EmsReportPointSteam::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointSteam::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getInstrumentValue() != null, EmsReportPointSteam::getInstrumentValue, bo.getInstrumentValue())

ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointWaterServiceImpl.java

@@ -9,6 +9,8 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
+import org.dromara.ems.report.domain.EmsReportPointDnb;
 import org.dromara.ems.report.domain.EmsReportPointWater;
 import org.dromara.ems.report.mapper.EmsReportPointWaterMapper;
 import org.dromara.ems.report.service.IEmsReportPointWaterService;
@@ -50,6 +52,11 @@ public class EmsReportPointWaterServiceImpl implements IEmsReportPointWaterServi
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<EmsReportPointWater> lqw = JoinWrappers.lambda(EmsReportPointWater.class)
             .selectAll(EmsReportPointWater.class)
+
+            .select(EmsBaseMonitorInfo::getMonitorName)
+            // 使用计量设备编号查询计量设备名称
+            .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsReportPointDnb::getMonitorCode)
+
             .eq(bo.getObjId() != null, EmsReportPointWater::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointWater::getMonitorCode, bo.getMonitorCode())
             .eq(bo.getInstrumentValue() != null, EmsReportPointWater::getInstrumentValue, bo.getInstrumentValue())