refactor(base): 统一使用EmsBaseEntity替代BaseEntity

- 创建EmsBaseEntity基类,包含创建者、创建时间、更新者、更新时间等通用字段
- 将所有实体类继承关系从BaseEntity改为EmsBaseEntity
- 更新控制器中设置创建者和更新者的方法,使用用户名替代用户ID
- 移除重复导入的Page类和BaseEntity类
- 修复EmsRecordAlarmRuleController中重复设置创建者的错误
hwmom-htk
zangch@mesnac.com 3 months ago
parent 67cf29c640
commit d223cac432

@ -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));
}

@ -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<EmsBaseMonitorInfo> list = emsBaseMonitorInfoService.queryPageList( pageQuery ,emsBaseMonitorInfo);
return list;
List<EmsBaseMonitorInfo> 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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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;

@ -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;

@ -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;

@ -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<String, Object> params = new HashMap<>();
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -106,7 +106,7 @@ public class EmsBaseMonitorThresholdServiceImpl implements IEmsBaseMonitorThresh
List<EmsBaseMonitorInfo> 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);

@ -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;

@ -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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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));
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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));
}

@ -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));
}

@ -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));
}

@ -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;

@ -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;

@ -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;

@ -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;
/**

@ -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;
/**

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save