From d223cac432d16984fb51befc15cf95c3b8e13d9d Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 23 Oct 2025 18:15:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor(base):=20=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8EmsBaseEntity=E6=9B=BF=E4=BB=A3BaseEntity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建EmsBaseEntity基类，包含创建者、创建时间、更新者、更新时间等通用字段 - 将所有实体类继承关系从BaseEntity改为EmsBaseEntity - 更新控制器中设置创建者和更新者的方法，使用用户名替代用户ID - 移除重复导入的Page类和BaseEntity类 - 修复EmsRecordAlarmRuleController中重复设置创建者的错误 --- .../EmsBaseCollectDeviceInfoController.java | 4 +- .../EmsBaseMonitorInfoController.java | 13 ++-- .../EmsBaseMonitorThresholdController.java | 6 +- .../EmsBaseMonitorWorkUnitController.java | 6 +- .../EmsBaseSharePriceController.java | 6 +- .../controller/EmsBaseWorkUnitController.java | 6 +- .../base/domain/EmsBaseCollectDeviceInfo.java | 3 +- .../ems/base/domain/EmsBaseEnergyPrice.java | 3 +- .../ems/base/domain/EmsBaseEnergyType.java | 3 +- .../ems/base/domain/EmsBaseEntity.java | 59 +++++++++++++++++++ .../ems/base/domain/EmsBaseMonitorInfo.java | 3 +- .../base/domain/EmsBaseMonitorThreshold.java | 3 +- .../base/domain/EmsBaseMonitorWorkUnit.java | 3 +- .../ems/base/domain/EmsBaseSharePrice.java | 3 +- .../ems/base/domain/EmsBaseWorkUnit.java | 3 +- .../IEmsBaseCollectDeviceInfoService.java | 2 - .../service/IEmsBaseEnergyPriceService.java | 2 - .../service/IEmsBaseEnergyTypeService.java | 2 - .../service/IEmsBaseMonitorInfoService.java | 2 - .../IEmsBaseMonitorThresholdService.java | 2 - .../IEmsBaseMonitorWorkUnitService.java | 2 - .../service/IEmsBaseSharePriceService.java | 2 - .../base/service/IEmsBaseWorkUnitService.java | 2 - .../EmsBaseCollectDeviceInfoServiceImpl.java | 3 - .../impl/EmsBaseEnergyTypeServiceImpl.java | 3 - .../EmsBaseMonitorThresholdServiceImpl.java | 2 +- .../impl/EmsBaseWorkUnitServiceImpl.java | 2 - .../EmsRecordAlarmDataController.java | 4 +- .../EmsRecordAlarmRuleController.java | 7 +-- .../EmsRecordDnbInstantController.java | 6 +- .../EmsRecordSteamInstantController.java | 6 +- .../EmsRecordWaterInstantController.java | 6 +- .../EmsVibrationInstantController.java | 4 +- .../TWTempertureDataController.java | 6 +- .../ems/record/domain/EmsRecordAlarmData.java | 4 +- .../ems/record/domain/EmsRecordAlarmRule.java | 4 +- .../record/domain/EmsRecordDnbInstant.java | 4 +- .../record/domain/EmsRecordSteamInstant.java | 4 +- .../record/domain/EmsRecordWaterInstant.java | 4 +- .../record/domain/EmsVibrationInstant.java | 4 +- .../ems/record/domain/TWTempertureData.java | 4 +- .../service/IEmsRecordAlarmDataService.java | 2 - .../service/IEmsRecordAlarmRuleService.java | 2 - .../service/IEmsRecordDnbInstantService.java | 2 - .../IEmsRecordSteamInstantService.java | 2 - .../IEmsRecordWaterInstantService.java | 2 - .../service/ITWTempertureDataService.java | 2 - .../impl/EmsRecordAlarmDataServiceImpl.java | 4 +- .../impl/EmsRecordDnbInstantServiceImpl.java | 3 - .../impl/TWTempertureDataServiceImpl.java | 3 - .../EmsReportPointDnbController.java | 2 +- .../EmsReportPointSteamController.java | 4 +- .../EmsReportPointWaterController.java | 4 +- .../ems/report/domain/EmsReportPointDnb.java | 4 +- .../report/domain/EmsReportPointSteam.java | 4 +- .../report/domain/EmsReportPointWater.java | 4 +- .../domain/EnergyStatisticalReport.java | 4 +- .../domain/PeaksValleysConsumptionReport.java | 4 +- .../service/IEmsReportPointSteamService.java | 2 - .../service/IEmsReportPointWaterService.java | 2 - .../impl/EmsReportPointDnbServiceImpl.java | 5 +- 61 files changed, 129 insertions(+), 149 deletions(-) create mode 100644 ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEntity.java diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java index 17102451..cc9a45d4 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java @@ -79,7 +79,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController { //@Log(title = "采集设备信息", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) { - emsBaseCollectDeviceInfo.setCreateBy(LoginHelper.getUserId()); + emsBaseCollectDeviceInfo.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseCollectDeviceInfoService.insertEmsBaseCollectDeviceInfo(emsBaseCollectDeviceInfo)); } @@ -90,7 +90,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController { //@Log(title = "采集设备信息", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) { - emsBaseCollectDeviceInfo.setUpdateBy(LoginHelper.getUserId()); + emsBaseCollectDeviceInfo.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseCollectDeviceInfoService.updateEmsBaseCollectDeviceInfo(emsBaseCollectDeviceInfo)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java index a85ed343..d26fc64a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java @@ -7,9 +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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.ems.base.domain.EmsBaseMonitorInfo; @@ -40,10 +37,10 @@ public class EmsBaseMonitorInfoController extends BaseController */ @SaCheckPermission("ems:base:baseMonitorInfo:list") @GetMapping("/list") - public TableDataInfo list(EmsBaseMonitorInfo emsBaseMonitorInfo, PageQuery pageQuery) + public R list(EmsBaseMonitorInfo emsBaseMonitorInfo, PageQuery pageQuery) { - TableDataInfo list = emsBaseMonitorInfoService.queryPageList( pageQuery ,emsBaseMonitorInfo); - return list; + List list = emsBaseMonitorInfoService.selectEmsBaseMonitorInfoList(emsBaseMonitorInfo); + return R.ok(list); } /** @@ -87,7 +84,7 @@ public class EmsBaseMonitorInfoController extends BaseController @PostMapping public R add(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo) { - emsBaseMonitorInfo.setCreateBy(LoginHelper.getUserId()); + emsBaseMonitorInfo.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorInfoService.insertEmsBaseMonitorInfo(emsBaseMonitorInfo)); } @@ -99,7 +96,7 @@ public class EmsBaseMonitorInfoController extends BaseController @PutMapping public R edit(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo) { - emsBaseMonitorInfo.setUpdateBy(LoginHelper.getUserId()); + emsBaseMonitorInfo.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorInfoService.updateEmsBaseMonitorInfo(emsBaseMonitorInfo)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java index 9d2aa329..6766748e 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -71,7 +69,7 @@ public class EmsBaseMonitorThresholdController extends BaseController { //@Log(title = "计量设备阈值维护", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) { - emsBaseMonitorThreshold.setCreateBy(LoginHelper.getUserId()); + emsBaseMonitorThreshold.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorThresholdService.insertEmsBaseMonitorThreshold(emsBaseMonitorThreshold)); } @@ -82,7 +80,7 @@ public class EmsBaseMonitorThresholdController extends BaseController { //@Log(title = "计量设备阈值维护", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) { - emsBaseMonitorThreshold.setUpdateBy(LoginHelper.getUserId()); + emsBaseMonitorThreshold.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorThresholdService.updateEmsBaseMonitorThreshold(emsBaseMonitorThreshold)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java index 5b179b63..3e23ee34 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java @@ -6,8 +6,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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -70,7 +68,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController { //@Log(title = "统计计量信息" , businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) { - emsBaseMonitorWorkUnit.setCreateBy(LoginHelper.getUserId()); + emsBaseMonitorWorkUnit.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorWorkUnitService.insertEmsBaseMonitorWorkUnit(emsBaseMonitorWorkUnit)); } @@ -81,7 +79,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController { //@Log(title = "统计计量信息" , businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) { - emsBaseMonitorWorkUnit.setUpdateBy(LoginHelper.getUserId()); + emsBaseMonitorWorkUnit.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseMonitorWorkUnitService.updateEmsBaseMonitorWorkUnit(emsBaseMonitorWorkUnit)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java index 4338d2b1..aed1734a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -71,7 +69,7 @@ public class EmsBaseSharePriceController extends BaseController { //@Log(title = "分时电价维护", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsBaseSharePrice emsBaseSharePrice) { - emsBaseSharePrice.setCreateBy(LoginHelper.getUserId()); + emsBaseSharePrice.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseSharePriceService.insertEmsBaseSharePrice(emsBaseSharePrice)); } @@ -82,7 +80,7 @@ public class EmsBaseSharePriceController extends BaseController { //@Log(title = "分时电价维护", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsBaseSharePrice emsBaseSharePrice) { - emsBaseSharePrice.setUpdateBy(LoginHelper.getUserId()); + emsBaseSharePrice.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseSharePriceService.updateEmsBaseSharePrice(emsBaseSharePrice)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java index 58983951..b0f735ef 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -86,7 +84,7 @@ public class EmsBaseWorkUnitController extends BaseController @PostMapping public R add(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit) { - emsBaseWorkUnit.setCreateBy(LoginHelper.getUserId()); + emsBaseWorkUnit.setCreateBy(LoginHelper.getUsername()); return toAjax(emsBaseWorkUnitService.insertEmsBaseWorkUnit(emsBaseWorkUnit)); } @@ -98,7 +96,7 @@ public class EmsBaseWorkUnitController extends BaseController @PutMapping public R edit(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit) { - emsBaseWorkUnit.setUpdateBy(LoginHelper.getUserId()); + emsBaseWorkUnit.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsBaseWorkUnitService.updateEmsBaseWorkUnit(emsBaseWorkUnit)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java index 43a5b609..d278ead6 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseCollectDeviceInfo.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.Date; @@ -21,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_collect_device_info") -public class EmsBaseCollectDeviceInfo extends BaseEntity { +public class EmsBaseCollectDeviceInfo extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyPrice.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyPrice.java index b0afef55..17f9d75e 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyPrice.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyPrice.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_energy_price") -public class EmsBaseEnergyPrice extends BaseEntity { +public class EmsBaseEnergyPrice extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyType.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyType.java index c414de75..be4f93ea 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyType.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEnergyType.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +21,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_energy_type") -public class EmsBaseEnergyType extends BaseEntity { +public class EmsBaseEnergyType extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEntity.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEntity.java new file mode 100644 index 00000000..1ecd46df --- /dev/null +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseEntity.java @@ -0,0 +1,59 @@ +package org.dromara.ems.base.domain; + +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 lombok.Data; + +import java.io.Serial; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Data +public class EmsBaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 搜索值 + */ + @JsonIgnore + @TableField(exist = false) + private String searchValue; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorInfo.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorInfo.java index dbf80d08..c4b4ed4c 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorInfo.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorInfo.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.ArrayList; @@ -21,7 +20,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_monitor_info") -public class EmsBaseMonitorInfo extends BaseEntity { +public class EmsBaseMonitorInfo extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorThreshold.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorThreshold.java index e7d7381a..603737cb 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorThreshold.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorThreshold.java @@ -3,7 +3,6 @@ package org.dromara.ems.base.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -18,7 +17,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_monitor_threshold") -public class EmsBaseMonitorThreshold extends BaseEntity { +public class EmsBaseMonitorThreshold extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java index f11a086e..76273082 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_monitor_work_unit") -public class EmsBaseMonitorWorkUnit extends BaseEntity { +public class EmsBaseMonitorWorkUnit extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseSharePrice.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseSharePrice.java index f1629160..6b53a91e 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseSharePrice.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseSharePrice.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -20,7 +19,7 @@ import java.math.BigDecimal; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_share_price") -public class EmsBaseSharePrice extends BaseEntity { +public class EmsBaseSharePrice extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java index fba8863e..e752c744 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.ArrayList; @@ -23,7 +22,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_base_work_unit") -public class EmsBaseWorkUnit extends BaseEntity { +public class EmsBaseWorkUnit extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseCollectDeviceInfoService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseCollectDeviceInfoService.java index 04331024..92cd2aaf 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseCollectDeviceInfoService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseCollectDeviceInfoService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseCollectDeviceInfo; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyPriceService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyPriceService.java index c33ed5f6..bb90f19c 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyPriceService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyPriceService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseEnergyPrice; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyTypeService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyTypeService.java index b9e50271..1ae67b2c 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyTypeService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseEnergyTypeService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseEnergyType; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorInfoService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorInfoService.java index dc8ab327..0bf23116 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorInfoService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorInfoService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseMonitorInfo; import org.dromara.ems.base.domain.TreeSelects; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorThresholdService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorThresholdService.java index 475a08c3..131eba1a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorThresholdService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorThresholdService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseMonitorThreshold; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorWorkUnitService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorWorkUnitService.java index 3c4c695e..8d472bc2 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorWorkUnitService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseMonitorWorkUnitService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseMonitorWorkUnit; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseSharePriceService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseSharePriceService.java index 50e8ef31..abc02396 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseSharePriceService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseSharePriceService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseSharePrice; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java index 40f3fc75..04136735 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.service; 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.ems.base.domain.EmsBaseWorkUnit; import org.dromara.ems.base.domain.TreeSelects; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseCollectDeviceInfoServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseCollectDeviceInfoServiceImpl.java index 0e02b454..de83e090 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseCollectDeviceInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseCollectDeviceInfoServiceImpl.java @@ -4,13 +4,10 @@ package org.dromara.ems.base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; 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.ems.base.domain.EmsBaseCollectDeviceInfo; import org.dromara.ems.base.mapper.EmsBaseCollectDeviceInfoMapper; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyTypeServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyTypeServiceImpl.java index dd9fdf53..44bf5a13 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyTypeServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyTypeServiceImpl.java @@ -4,13 +4,10 @@ package org.dromara.ems.base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; 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.ems.base.domain.EmsBaseEnergyType; import org.dromara.ems.base.mapper.EmsBaseEnergyTypeMapper; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorThresholdServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorThresholdServiceImpl.java index fba6bd16..ab22aca6 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorThresholdServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorThresholdServiceImpl.java @@ -106,7 +106,7 @@ public class EmsBaseMonitorThresholdServiceImpl implements IEmsBaseMonitorThresh List monitorInfoList = emsBaseMonitorInfoMapper.selectEmsBaseMonitorInfoList(monitorInfo); if (monitorInfoList.size() > 0 && monitorInfoList.get(0).getIsAmmeter().equals("1")) { EmsBaseMonitorInfo emsBaseMonitorInfo = monitorInfoList.get(0); - emsBaseMonitorThreshold.setCreateBy(LoginHelper.getUserId()); + emsBaseMonitorThreshold.setCreateBy(LoginHelper.getUsername()); emsBaseMonitorThreshold.setMonitorType(emsBaseMonitorInfo.getMonitorType()); emsBaseMonitorThreshold.setMonitorName(emsBaseMonitorInfo.getMonitorName()); this.insertEmsBaseMonitorThreshold(emsBaseMonitorThreshold); diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java index 8818cafb..abfdab0f 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java @@ -3,13 +3,11 @@ package org.dromara.ems.base.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.base.domain.EmsBaseMonitorWorkUnit; import org.dromara.ems.base.domain.EmsBaseWorkUnit; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java index 0cc8d151..8f1a4bf7 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java @@ -75,7 +75,7 @@ public class EmsRecordAlarmDataController extends BaseController @PostMapping public R add(@RequestBody EmsRecordAlarmData emsRecordAlarmData) { - emsRecordAlarmData.setCreateBy(LoginHelper.getUserId()); + emsRecordAlarmData.setCreateBy(LoginHelper.getUsername()); return toAjax(emsRecordAlarmDataService.insertEmsRecordAlarmData(emsRecordAlarmData)); } @@ -87,7 +87,7 @@ public class EmsRecordAlarmDataController extends BaseController @PutMapping public R edit(@RequestBody EmsRecordAlarmData emsRecordAlarmData) { - emsRecordAlarmData.setUpdateBy(LoginHelper.getUserId()); + emsRecordAlarmData.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsRecordAlarmDataService.updateEmsRecordAlarmData(emsRecordAlarmData)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java index 46927105..1b6934e6 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -78,7 +76,8 @@ public class EmsRecordAlarmRuleController extends BaseController @PostMapping public R add(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule) { - emsRecordAlarmRule.setCreateBy(LoginHelper.getUserId()); + emsRecordAlarmRule.setCreateBy(LoginHelper.getUsername()); + emsRecordAlarmRule.setCreateBy(LoginHelper.getUsername()); return toAjax(emsRecordAlarmRuleService.insertEmsRecordAlarmRule(emsRecordAlarmRule)); } @@ -91,7 +90,7 @@ public class EmsRecordAlarmRuleController extends BaseController @PutMapping public R edit(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule) { - emsRecordAlarmRule.setUpdateBy(LoginHelper.getUserId()); + emsRecordAlarmRule.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsRecordAlarmRuleService.updateEmsRecordAlarmRule(emsRecordAlarmRule)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java index 63dab3a7..c66c18e6 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java @@ -6,8 +6,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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -81,7 +79,7 @@ public class EmsRecordDnbInstantController extends BaseController { //@Log(title = "电实时数据", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) { - emsRecordDnbInstant.setCreateBy(LoginHelper.getUserId()); + emsRecordDnbInstant.setCreateBy(LoginHelper.getUsername()); return toAjax(emsRecordDnbInstantService.insertEmsRecordDnbInstant(emsRecordDnbInstant)); } @@ -92,7 +90,7 @@ public class EmsRecordDnbInstantController extends BaseController { //@Log(title = "电实时数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) { - emsRecordDnbInstant.setUpdateBy(LoginHelper.getUserId()); + emsRecordDnbInstant.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsRecordDnbInstantService.updateEmsRecordDnbInstant(emsRecordDnbInstant)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java index d810c0ed..05beccfe 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -74,7 +72,7 @@ public class EmsRecordSteamInstantController extends BaseController { //@Log(title = "蒸汽历史数据", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) { - emsRecordSteamInstant.setCreateBy(LoginHelper.getUserId()); + emsRecordSteamInstant.setCreateBy(LoginHelper.getUsername()); return toAjax(emsRecordSteamInstantService.insertEmsRecordSteamInstant(emsRecordSteamInstant)); } @@ -85,7 +83,7 @@ public class EmsRecordSteamInstantController extends BaseController { //@Log(title = "蒸汽历史数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) { - emsRecordSteamInstant.setUpdateBy(LoginHelper.getUserId()); + emsRecordSteamInstant.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsRecordSteamInstantService.updateEmsRecordSteamInstant(emsRecordSteamInstant)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java index 5a93e36e..4e0ad430 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -77,7 +75,7 @@ public class EmsRecordWaterInstantController extends BaseController @PostMapping public R add(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant) { - emsRecordWaterInstant.setCreateBy(LoginHelper.getUserId()); + emsRecordWaterInstant.setCreateBy(LoginHelper.getUsername()); return toAjax(emsRecordWaterInstantService.insertEmsRecordWaterInstant(emsRecordWaterInstant)); } @@ -89,7 +87,7 @@ public class EmsRecordWaterInstantController extends BaseController @PutMapping public R edit(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant) { - emsRecordWaterInstant.setUpdateBy(LoginHelper.getUserId()); + emsRecordWaterInstant.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsRecordWaterInstantService.updateEmsRecordWaterInstant(emsRecordWaterInstant)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java index 7e854d40..be94fc36 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java @@ -75,7 +75,7 @@ public class EmsVibrationInstantController extends BaseController @PostMapping public R add(@RequestBody EmsVibrationInstant emsVibrationInstant) { - emsVibrationInstant.setCreateBy(LoginHelper.getUserId()); + emsVibrationInstant.setCreateBy(LoginHelper.getUsername()); return toAjax(emsVibrationInstantService.insertEmsVibrationInstant(emsVibrationInstant)); } @@ -87,7 +87,7 @@ public class EmsVibrationInstantController extends BaseController @PutMapping public R edit(@RequestBody EmsVibrationInstant emsVibrationInstant) { - emsVibrationInstant.setUpdateBy(LoginHelper.getUserId()); + emsVibrationInstant.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsVibrationInstantService.updateEmsVibrationInstant(emsVibrationInstant)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java index c1635fba..a97f7615 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java @@ -8,8 +8,6 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; 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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -153,7 +151,7 @@ public class TWTempertureDataController extends BaseController @PostMapping public R add(@RequestBody TWTempertureData tWTempertureData) { - tWTempertureData.setCreateBy(LoginHelper.getUserId()); + tWTempertureData.setCreateBy(LoginHelper.getUsername()); return toAjax(tWTempertureDataService.insertTWTempertureData(tWTempertureData)); } @@ -165,7 +163,7 @@ public class TWTempertureDataController extends BaseController @PutMapping public R edit(@RequestBody TWTempertureData tWTempertureData) { - tWTempertureData.setUpdateBy(LoginHelper.getUserId()); + tWTempertureData.setUpdateBy(LoginHelper.getUsername()); return toAjax(tWTempertureDataService.updateTWTempertureData(tWTempertureData)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java index 89a7cf73..d1cfed4d 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmData.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.util.Date; @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_record_alarm_data") -public class EmsRecordAlarmData extends BaseEntity { +public class EmsRecordAlarmData extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmRule.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmRule.java index 8a7e0b0b..01a3f177 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmRule.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordAlarmRule.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.util.Date; @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_record_alarm_rule") -public class EmsRecordAlarmRule extends BaseEntity { +public class EmsRecordAlarmRule extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java index 2b20f71b..34f6ad18 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordDnbInstant.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_record_dnb_instant") -public class EmsRecordDnbInstant extends BaseEntity { +public class EmsRecordDnbInstant extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java index c2a3f335..ae6c7458 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordSteamInstant.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_record_steam_instant") -public class EmsRecordSteamInstant extends BaseEntity { +public class EmsRecordSteamInstant extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java index 276ed76a..1d2d89eb 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsRecordWaterInstant.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -22,7 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_record_water_instant") -public class EmsRecordWaterInstant extends BaseEntity { +public class EmsRecordWaterInstant extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java index f0c5bc1e..12a16fab 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/EmsVibrationInstant.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.math.BigDecimal; import java.util.Date; @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("T_VibrationSensor_Data") -public class EmsVibrationInstant extends BaseEntity +public class EmsVibrationInstant extends EmsBaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java index 426e94e3..e66e3b76 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/domain/TWTempertureData.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.math.BigDecimal; import java.util.Date; @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("T_W_TempertureData") -public class TWTempertureData extends BaseEntity +public class TWTempertureData extends EmsBaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmDataService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmDataService.java index b0d9936b..7ff4ad47 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmDataService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmDataService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.EmsRecordAlarmData; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmRuleService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmRuleService.java index e9f77d4d..4d41ad42 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmRuleService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordAlarmRuleService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.EmsRecordAlarmRule; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordDnbInstantService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordDnbInstantService.java index 6b84f4b1..a7452e27 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordDnbInstantService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordDnbInstantService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.EmsRecordDnbInstant; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordSteamInstantService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordSteamInstantService.java index 1f58e2c5..b2d1c8a9 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordSteamInstantService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordSteamInstantService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.EmsRecordSteamInstant; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordWaterInstantService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordWaterInstantService.java index 9c3b48b5..a9edfcdc 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordWaterInstantService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsRecordWaterInstantService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.EmsRecordWaterInstant; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/ITWTempertureDataService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/ITWTempertureDataService.java index 207c3435..37c6c3ce 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/ITWTempertureDataService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/ITWTempertureDataService.java @@ -1,8 +1,6 @@ package org.dromara.ems.record.service; 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.ems.record.domain.TWTempertureData; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java index cfbb5d39..16962f5a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java @@ -1,15 +1,13 @@ package org.dromara.ems.record.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; 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.satoken.utils.LoginHelper; import org.dromara.ems.base.domain.EmsBaseCollectDeviceInfo; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java index 34079752..39cfb695 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java @@ -3,12 +3,9 @@ package org.dromara.ems.record.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; 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.ems.record.domain.EmsRecordDnbInstant; import org.dromara.ems.record.mapper.EmsRecordDnbInstantMapper; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/TWTempertureDataServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/TWTempertureDataServiceImpl.java index f8355fbd..debd3883 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/TWTempertureDataServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/TWTempertureDataServiceImpl.java @@ -3,12 +3,9 @@ package org.dromara.ems.record.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; 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.ems.record.domain.TWTempertureData; import org.dromara.ems.record.mapper.TWTempertureDataMapper; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java index 10585172..a58b4af7 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointDnbController.java @@ -78,7 +78,7 @@ public class EmsReportPointDnbController extends BaseController { //@Log(title = "电整点数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsReportPointDnb emsReportPointDnb) { - emsReportPointDnb.setUpdateBy(LoginHelper.getUserId()); + emsReportPointDnb.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsReportPointDnbService.updateEmsReportPointDnb(emsReportPointDnb)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java index 00c6e342..116a746a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointSteamController.java @@ -68,7 +68,7 @@ public class EmsReportPointSteamController extends BaseController { //@Log(title = "蒸汽整点数据", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody EmsReportPointSteam emsReportPointSteam) { - emsReportPointSteam.setCreateBy(LoginHelper.getUserId()); + emsReportPointSteam.setCreateBy(LoginHelper.getUsername()); return toAjax(emsReportPointSteamService.insertEmsReportPointSteam(emsReportPointSteam)); } @@ -79,7 +79,7 @@ public class EmsReportPointSteamController extends BaseController { //@Log(title = "蒸汽整点数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsReportPointSteam emsReportPointSteam) { - emsReportPointSteam.setUpdateBy(LoginHelper.getUserId()); + emsReportPointSteam.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsReportPointSteamService.updateEmsReportPointSteam(emsReportPointSteam)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java index 25cde152..532af50e 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportPointWaterController.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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -80,7 +78,7 @@ public class EmsReportPointWaterController extends BaseController { //@Log(title = "水整点数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody EmsReportPointWater emsReportPointWater) { - emsReportPointWater.setUpdateBy(LoginHelper.getUserId()); + emsReportPointWater.setUpdateBy(LoginHelper.getUsername()); return toAjax(emsReportPointWaterService.updateEmsReportPointWater(emsReportPointWater)); } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointDnb.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointDnb.java index b71b2ec1..2d40efd3 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointDnb.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointDnb.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -24,7 +24,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_report_point_dnb") -public class EmsReportPointDnb extends BaseEntity { +public class EmsReportPointDnb extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointSteam.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointSteam.java index 57d032b8..78d3c8da 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointSteam.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointSteam.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.math.BigDecimal; @@ -20,7 +20,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_report_point_steam") -public class EmsReportPointSteam extends BaseEntity { +public class EmsReportPointSteam extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointWater.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointWater.java index be652803..b1f9ee94 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointWater.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EmsReportPointWater.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.io.Serial; import java.util.Date; @@ -21,7 +21,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("ems_report_point_water") -public class EmsReportPointWater extends BaseEntity { +public class EmsReportPointWater extends EmsBaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EnergyStatisticalReport.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EnergyStatisticalReport.java index a3cef8a7..dec291fa 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EnergyStatisticalReport.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/EnergyStatisticalReport.java @@ -1,7 +1,7 @@ package org.dromara.ems.report.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.math.BigDecimal; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @author Yinq * @date 2023-10-12 */ -public class EnergyStatisticalReport extends BaseEntity { +public class EnergyStatisticalReport extends EmsBaseEntity { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java index 6df33e87..f92e35d9 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java @@ -1,7 +1,7 @@ package org.dromara.ems.report.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.ems.base.domain.EmsBaseEntity; import java.math.BigDecimal; @@ -12,7 +12,7 @@ import java.math.BigDecimal; * @author Yinq * @date 2023-10-12 */ -public class PeaksValleysConsumptionReport extends BaseEntity { +public class PeaksValleysConsumptionReport extends EmsBaseEntity { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointSteamService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointSteamService.java index e24c2895..51ad0bdc 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointSteamService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointSteamService.java @@ -1,8 +1,6 @@ package org.dromara.ems.report.service; 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.ems.report.domain.EmsReportPointSteam; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointWaterService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointWaterService.java index 776f7c25..c8b8d386 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointWaterService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointWaterService.java @@ -1,8 +1,6 @@ package org.dromara.ems.report.service; 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.ems.report.domain.EmsReportPointWater; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointDnbServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointDnbServiceImpl.java index 35651644..839d74f9 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointDnbServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointDnbServiceImpl.java @@ -1,14 +1,13 @@ package org.dromara.ems.report.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import org.dromara.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.StringUtils; 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.ems.report.domain.EmsReportPointDnb; import org.dromara.ems.report.mapper.EmsReportPointDnbMapper;