diff --git a/ruoyi-modules/hwmom-ems/pom.xml b/ruoyi-modules/hwmom-ems/pom.xml new file mode 100644 index 00000000..4322110b --- /dev/null +++ b/ruoyi-modules/hwmom-ems/pom.xml @@ -0,0 +1,222 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + hwmom-ems + + + hwmom-ems + + + + + + org.dromara + ruoyi-common-nacos + + + + org.dromara + ruoyi-common-sentinel + + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-dict + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-dubbo + + + + org.dromara + ruoyi-common-seata + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-translation + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + + org.dromara + ruoyi-api-system + + + + org.dromara + ruoyi-api-resource + + + + + + + com.microsoft.sqlserver + mssql-jdbc + + + org.dromara + hwmom-api-pda + 2.2.2 + compile + + + + + + + + + + + + + + + + + org.dromara + hwmom-api-workflow + 2.2.2 + compile + + + + org.dromara + ruoyi-common-bus + + + + + + com.alibaba + transmittable-thread-local + 2.14.4 + + + org.dromara + ruoyi-system + 2.2.2 + compile + + + org.springframework.security + spring-security-core + + + net.dreamlu + mica-net-utils + 1.0.6 + compile + + + org.dromara.easy-es + easy-es-core + 2.0.0 + compile + + + org.dromara + hwmom-common-mom + 2.2.2 + compile + + + + org.dromara + ruoyi-system + ${revision} + compile + + + + + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/Main.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/Main.java new file mode 100644 index 00000000..fe542d46 --- /dev/null +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/Main.java @@ -0,0 +1,19 @@ +package org.dromara; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Alt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Shift+F10 or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Shift+F9 to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Ctrl+F8. + System.out.println("i = " + i); + } + } +} diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/HwMomEmsApplication.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/HwMomEmsApplication.java new file mode 100644 index 00000000..0d3b99ca --- /dev/null +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/HwMomEmsApplication.java @@ -0,0 +1,25 @@ +package org.dromara.ems; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.dromara.common.properties.MesProperties; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.boot.context.properties.EnableConfigurationProperties; + +/** + * 系统模块 + * + * @author ruoyi + */ +@EnableDubbo +@SpringBootApplication +@EnableConfigurationProperties(MesProperties.class) +public class HwMomEmsApplication { + public static void main(String[] args) { + SpringApplication application = new SpringApplication(HwMomEmsApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ 能源模块启动成功 ლ(´ڡ`ლ)ﾞ "); + } +} 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 e645b0d1..17102451 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 @@ -26,7 +26,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseCollectDeviceInfo") +@RequestMapping("/base/baseCollectDeviceInfo") public class EmsBaseCollectDeviceInfoController extends BaseController { private final IEmsBaseCollectDeviceInfoService emsBaseCollectDeviceInfoService; @@ -38,8 +38,8 @@ public class EmsBaseCollectDeviceInfoController extends BaseController { @GetMapping("/list") public TableDataInfo list(EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - List list = emsBaseCollectDeviceInfoService.selectEmsBaseCollectDeviceInfoList(emsBaseCollectDeviceInfo); - return TableDataInfo.build(list); + return emsBaseCollectDeviceInfoService.queryPageList( pageQuery ,emsBaseCollectDeviceInfo); + } /** diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java index c8b9767c..077da902 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java @@ -7,6 +7,8 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.ems.base.domain.EmsBaseEnergyPrice; @@ -25,7 +27,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseEnergyPrice") +@RequestMapping("/base/baseEnergyPrice") public class EmsBaseEnergyPriceController extends BaseController { @@ -39,8 +41,7 @@ public class EmsBaseEnergyPriceController extends BaseController public TableDataInfo list(EmsBaseEnergyPrice emsBaseEnergyPrice, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - List list = emsBaseEnergyPriceService.selectEmsBaseEnergyPriceList(emsBaseEnergyPrice); - return TableDataInfo.build(list); + return emsBaseEnergyPriceService.queryPageList( pageQuery ,emsBaseEnergyPrice); } /** diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java index accace5d..254cf0ff 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java @@ -25,7 +25,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseEnergyType") +@RequestMapping("/base/baseEnergyType") public class EmsBaseEnergyTypeController extends BaseController { @@ -38,9 +38,8 @@ public class EmsBaseEnergyTypeController extends BaseController @GetMapping("/list") public TableDataInfo list(EmsBaseEnergyType emsBaseEnergyType, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseEnergyTypeService.selectEmsBaseEnergyTypeList(emsBaseEnergyType); - return TableDataInfo.build(list); + return emsBaseEnergyTypeService.queryPageList( pageQuery ,emsBaseEnergyType); + } /** 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 bec536e6..a85ed343 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,6 +7,8 @@ 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; @@ -27,7 +29,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseMonitorInfo") +@RequestMapping("/base/baseMonitorInfo") public class EmsBaseMonitorInfoController extends BaseController { @@ -40,9 +42,8 @@ public class EmsBaseMonitorInfoController extends BaseController @GetMapping("/list") public TableDataInfo list(EmsBaseMonitorInfo emsBaseMonitorInfo, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseMonitorInfoService.selectEmsBaseMonitorInfoList(emsBaseMonitorInfo); - return TableDataInfo.build(list); + TableDataInfo list = emsBaseMonitorInfoService.queryPageList( pageQuery ,emsBaseMonitorInfo); + return list; } /** 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 02251cc7..9d2aa329 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,6 +7,8 @@ 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; @@ -26,7 +28,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseMonitorThreshold") +@RequestMapping("/base/baseMonitorThreshold") public class EmsBaseMonitorThresholdController extends BaseController { private final IEmsBaseMonitorThresholdService emsBaseMonitorThresholdService; @@ -37,9 +39,8 @@ public class EmsBaseMonitorThresholdController extends BaseController { @SaCheckPermission("ems:base:baseMonitorThreshold:list") @GetMapping("/list") public TableDataInfo list(EmsBaseMonitorThreshold emsBaseMonitorThreshold, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseMonitorThresholdService.selectEmsBaseMonitorThresholdList(emsBaseMonitorThreshold); - return TableDataInfo.build(list); + TableDataInfo list = emsBaseMonitorThresholdService.queryPageList( pageQuery ,emsBaseMonitorThreshold); + return list; } /** 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 4eb3bcdd..5b179b63 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,6 +6,8 @@ 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; @@ -25,7 +27,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseMonitorWorkUnit") +@RequestMapping("/base/baseMonitorWorkUnit") public class EmsBaseMonitorWorkUnitController extends BaseController { private final IEmsBaseMonitorWorkUnitService emsBaseMonitorWorkUnitService; @@ -36,9 +38,8 @@ public class EmsBaseMonitorWorkUnitController extends BaseController { @SaCheckPermission("ems:base:baseMonitorWorkUnit:list") @GetMapping("/list") public TableDataInfo list(EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseMonitorWorkUnitService.selectEmsBaseMonitorWorkUnitList(emsBaseMonitorWorkUnit); - return TableDataInfo.build(list); + TableDataInfo list = emsBaseMonitorWorkUnitService.queryPageList( pageQuery ,emsBaseMonitorWorkUnit); + return list; } /** 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 fbe10820..4338d2b1 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,6 +7,8 @@ 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; @@ -26,7 +28,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseSharePrice") +@RequestMapping("/base/baseSharePrice") public class EmsBaseSharePriceController extends BaseController { private final IEmsBaseSharePriceService emsBaseSharePriceService; @@ -37,9 +39,8 @@ public class EmsBaseSharePriceController extends BaseController { @SaCheckPermission("ems:base:baseSharePrice:list") @GetMapping("/list") public TableDataInfo list(EmsBaseSharePrice emsBaseSharePrice, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseSharePriceService.selectEmsBaseSharePriceList(emsBaseSharePrice); - return TableDataInfo.build(list); + TableDataInfo list = emsBaseSharePriceService.queryPageList( pageQuery ,emsBaseSharePrice); + return list; } /** 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 5e25bcc4..58983951 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,6 +7,8 @@ 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; @@ -27,7 +29,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/base/baseWorkUnit") +@RequestMapping("/base/baseWorkUnit") public class EmsBaseWorkUnitController extends BaseController { @@ -40,9 +42,8 @@ public class EmsBaseWorkUnitController extends BaseController @GetMapping("/list") public TableDataInfo list(EmsBaseWorkUnit emsBaseWorkUnit, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsBaseWorkUnitService.selectEmsBaseWorkUnitList(emsBaseWorkUnit); - return TableDataInfo.build(list); + TableDataInfo list = emsBaseWorkUnitService.queryPageList( pageQuery ,emsBaseWorkUnit); + return list; } /** 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 1a45753c..43a5b609 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 @@ -1,19 +1,29 @@ package org.dromara.ems.base.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; /** * 采集设备信息对象 ems_base_collect_device_info * - * @author Yinq - * @date 2024-05-20 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_collect_device_info") public class EmsBaseCollectDeviceInfo extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; /** @@ -187,7 +197,7 @@ public class EmsBaseCollectDeviceInfo extends BaseEntity { .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) +// .append("remark", getRemark()) .toString(); } } 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 cd0e0ff9..b0afef55 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 @@ -1,24 +1,35 @@ package org.dromara.ems.base.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** * 能源月份单价对象 ems_base_energy_price * - * @author Yinq - * @date 2024-05-08 + * @author zch + * @date 2025-10-22 */ -public class EmsBaseEnergyPrice extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_energy_price") +public class EmsBaseEnergyPrice extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 主键标识 */ + /** + * 主键标识 + */ private Long objId; /** 能源类型编号 */ @@ -154,7 +165,7 @@ public class EmsBaseEnergyPrice extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) +// .append("remark", getRemark()) .toString(); } } 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 874a6e2c..c414de75 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 @@ -1,23 +1,35 @@ package org.dromara.ems.base.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.TableName; +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; + + /** * 能源类型信息对象 ems_base_energy_type * - * @author Yinq - * @date 2024-05-08 + * @author zch + * @date 2025-10-22 */ -public class EmsBaseEnergyType extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_energy_type") +public class EmsBaseEnergyType extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 自增标识 */ + /** + * 自增标识 + */ private Long objId; /** 能源类型编号 */ @@ -84,7 +96,7 @@ public class EmsBaseEnergyType extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("objId", getObjId()) .append("energyTypeId", getEnergyTypeId()) .append("energyName", getEnergyName()) 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 9ca09c45..dbf80d08 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 @@ -1,24 +1,34 @@ package org.dromara.ems.base.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.TableName; +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; import java.util.List; /** * 计量设备信息对象 ems_base_monitor_info * - * @author Yinq - * @date 2024-05-08 + * @author zch + * @date 2025-10-22 */ -public class EmsBaseMonitorInfo extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_monitor_info") +public class EmsBaseMonitorInfo extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 自增标识 */ + /** + * 自增标识 + */ private Long objId; /** 计量设备编号 */ 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 fee17aad..e7d7381a 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 @@ -1,19 +1,26 @@ package org.dromara.ems.base.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; /** * 计量设备阈值维护对象 ems_base_monitor_threshold * - * @author Yinq - * @date 2024-07-09 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_monitor_threshold") public class EmsBaseMonitorThreshold extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; /** @@ -135,192 +142,4 @@ public class EmsBaseMonitorThreshold extends BaseEntity { //@ExcelProperty(value = "启用标识") private String isFlag; - public String getMonitorName() { - return monitorName; - } - - public void setMonitorName(String monitorName) { - this.monitorName = monitorName; - } - - public void setObjId(Long objId) { - this.objId = objId; - } - - public Long getObjId() { - return objId; - } - - public void setMonitorCode(String monitorCode) { - this.monitorCode = monitorCode; - } - - public String getMonitorCode() { - return monitorCode; - } - - public void setMonitorType(Long monitorType) { - this.monitorType = monitorType; - } - - public Long getMonitorType() { - return monitorType; - } - - public void setiAMax(BigDecimal iAMax) { - this.iAMax = iAMax; - } - - public BigDecimal getiAMax() { - return iAMax; - } - - public void setiAMin(BigDecimal iAMin) { - this.iAMin = iAMin; - } - - public BigDecimal getiAMin() { - return iAMin; - } - - public void setiBMax(BigDecimal iBMax) { - this.iBMax = iBMax; - } - - public BigDecimal getiBMax() { - return iBMax; - } - - public void setiBMin(BigDecimal iBMin) { - this.iBMin = iBMin; - } - - public BigDecimal getiBMin() { - return iBMin; - } - - public void setiCMax(BigDecimal iCMax) { - this.iCMax = iCMax; - } - - public BigDecimal getiCMax() { - return iCMax; - } - - public void setiCMin(BigDecimal iCMin) { - this.iCMin = iCMin; - } - - public BigDecimal getiCMin() { - return iCMin; - } - - public void setvAMax(BigDecimal vAMax) { - this.vAMax = vAMax; - } - - public BigDecimal getvAMax() { - return vAMax; - } - - public void setvAMin(BigDecimal vAMin) { - this.vAMin = vAMin; - } - - public BigDecimal getvAMin() { - return vAMin; - } - - public void setvBMax(BigDecimal vBMax) { - this.vBMax = vBMax; - } - - public BigDecimal getvBMax() { - return vBMax; - } - - public void setvBMin(BigDecimal vBMin) { - this.vBMin = vBMin; - } - - public BigDecimal getvBMin() { - return vBMin; - } - - public void setvCMax(BigDecimal vCMax) { - this.vCMax = vCMax; - } - - public BigDecimal getvCMax() { - return vCMax; - } - - public void setvCMin(BigDecimal vCMin) { - this.vCMin = vCMin; - } - - public BigDecimal getvCMin() { - return vCMin; - } - - public void setHourConsumption(BigDecimal hourConsumption) { - this.hourConsumption = hourConsumption; - } - - public BigDecimal getHourConsumption() { - return hourConsumption; - } - - public void setDayConsumption(BigDecimal dayConsumption) { - this.dayConsumption = dayConsumption; - } - - public BigDecimal getDayConsumption() { - return dayConsumption; - } - - public void setLineLossRate(BigDecimal lineLossRate) { - this.lineLossRate = lineLossRate; - } - - public BigDecimal getLineLossRate() { - return lineLossRate; - } - - public void setIsFlag(String isFlag) { - this.isFlag = isFlag; - } - - public String getIsFlag() { - return isFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("objId", getObjId()) - .append("monitorCode", getMonitorCode()) - .append("monitorType", getMonitorType()) - .append("iAMax", getiAMax()) - .append("iAMin", getiAMin()) - .append("iBMax", getiBMax()) - .append("iBMin", getiBMin()) - .append("iCMax", getiCMax()) - .append("iCMin", getiCMin()) - .append("vAMax", getvAMax()) - .append("vAMin", getvAMin()) - .append("vBMax", getvBMax()) - .append("vBMin", getvBMin()) - .append("vCMax", getvCMax()) - .append("vCMin", getvCMin()) - .append("hourConsumption", getHourConsumption()) - .append("dayConsumption", getDayConsumption()) - .append("lineLossRate", getLineLossRate()) - .append("isFlag", getIsFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } 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 40419a01..f11a086e 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 @@ -1,20 +1,30 @@ package org.dromara.ems.base.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** * 统计计量信息对象 ems_base_monitor_work_unit * - * @author Yinq - * @date 2024-05-09 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_monitor_work_unit") public class EmsBaseMonitorWorkUnit extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; /** @@ -224,7 +234,7 @@ public class EmsBaseMonitorWorkUnit extends BaseEntity { .append("monitorType" , getMonitorType()) .append("formulaMode" , getFormulaMode()) .append("proportion" , getProportion()) - .append("remark" , getRemark()) +// .append("remark" , getRemark()) .append("isFlag" , getIsFlag()) .append("createdBy" , getCreatedBy()) .append("createdTime" , getCreatedTime()) 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 6f25ade2..f1629160 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 @@ -1,19 +1,28 @@ package org.dromara.ems.base.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.TableName; +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; /** * 分时电价维护对象 ems_base_share_price * - * @author Yinq - * @date 2024-06-11 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_share_price") public class EmsBaseSharePrice extends BaseEntity { + + @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 9250d8de..fba8863e 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 @@ -1,10 +1,14 @@ package org.dromara.ems.base.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; import java.util.List; @@ -12,14 +16,21 @@ import java.util.List; /** * 统计单元信息对象 ems_base_work_unit * - * @author Yinq - * @date 2024-05-09 + * @author zch + * @date 2025-10-22 */ -public class EmsBaseWorkUnit extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_base_work_unit") +public class EmsBaseWorkUnit extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 主键标识 */ + /** + * 主键标识 + */ private Long objId; /** 统计单元编号 */ diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/TreeSelects.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/TreeSelects.java index b5e54bcf..c5ca6b20 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/TreeSelects.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/TreeSelects.java @@ -1,8 +1,6 @@ package org.dromara.ems.base.domain; import com.fasterxml.jackson.annotation.JsonInclude; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysMenu; import java.io.Serializable; import java.util.List; @@ -55,12 +53,12 @@ public class TreeSelects implements Serializable this.children = baseWorkUnit.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); } - public TreeSelects(SysMenu menu) +/* public TreeSelects(SysMenu menu) { this.id = menu.getMenuId(); this.label = menu.getMenuName(); this.children = menu.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList()); - } + }*/ public String getCode() { return code; 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 01b9d3e1..04331024 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,15 @@ import java.util.List; * @date 2024-05-20 */ public interface IEmsBaseCollectDeviceInfoService { + /** + * 分页查询采集设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 采集设备信息分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseCollectDeviceInfo bo); + /** * 查询采集设备信息 * 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 661b99bc..c33ed5f6 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,15 @@ import java.util.List; */ public interface IEmsBaseEnergyPriceService { + /** + * 分页查询能源月份单价列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 能源月份单价分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseEnergyPrice bo); + /** * 查询能源月份单价 * 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 fc1ad5d4..b9e50271 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,15 @@ import java.util.List; */ public interface IEmsBaseEnergyTypeService { + /** + * 分页查询能源类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 能源类型信息分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseEnergyType bo); + /** * 查询能源类型信息 * 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 f4aa9c97..dc8ab327 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,5 +1,9 @@ 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; @@ -13,6 +17,15 @@ import java.util.List; */ public interface IEmsBaseMonitorInfoService { + /** + * 分页查询计量设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 计量设备信息分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorInfo bo); + /** * 查询计量设备信息 * 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 3ced1d5b..475a08c3 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,15 @@ import java.util.List; * @date 2024-07-09 */ public interface IEmsBaseMonitorThresholdService { + /** + * 分页查询计量设备阈值维护列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 计量设备阈值维护分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorThreshold bo); + /** * 查询计量设备阈值维护 * 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 7685fb2e..3c4c695e 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,15 @@ import java.util.List; */ public interface IEmsBaseMonitorWorkUnitService { + /** + * 分页查询统计计量信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 统计计量信息分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorWorkUnit bo); + /** * 查询统计计量信息 * 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 01332c63..50e8ef31 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,15 @@ import java.util.List; * @date 2024-06-11 */ public interface IEmsBaseSharePriceService { + /** + * 分页查询分时电价维护列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分时电价维护分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseSharePrice bo); + /** * 查询分时电价维护 * 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 7181b9bf..40f3fc75 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,5 +1,9 @@ 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; @@ -13,6 +17,15 @@ import java.util.List; */ public interface IEmsBaseWorkUnitService { + /** + * 分页查询统计单元信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 统计单元信息分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo); + /** * 查询统计单元信息 * 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 a1800322..0e02b454 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 @@ -1,14 +1,24 @@ 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; import org.dromara.ems.base.service.IEmsBaseCollectDeviceInfoService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 采集设备信息Service业务层处理 @@ -89,4 +99,37 @@ public class EmsBaseCollectDeviceInfoServiceImpl implements IEmsBaseCollectDevic public int deleteEmsBaseCollectDeviceInfoByObjId(Long objId) { return emsBaseCollectDeviceInfoMapper.deleteEmsBaseCollectDeviceInfoByObjId(objId); } + + /** + * 分页查询采集设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 采集设备信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseCollectDeviceInfo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseCollectDeviceInfoMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseCollectDeviceInfo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseCollectDeviceInfo.class) + .selectAll(EmsBaseCollectDeviceInfo.class) + .eq(bo.getObjId() != null, EmsBaseCollectDeviceInfo::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getCollectDeviceId()), EmsBaseCollectDeviceInfo::getCollectDeviceId, bo.getCollectDeviceId()) + .like(StringUtils.isNotBlank(bo.getCollectDeviceName()), EmsBaseCollectDeviceInfo::getCollectDeviceName, bo.getCollectDeviceName()) + .eq(bo.getEnergyTypeId() != null, EmsBaseCollectDeviceInfo::getEnergyTypeId, bo.getEnergyTypeId()) + .eq(StringUtils.isNotBlank(bo.getModel()), EmsBaseCollectDeviceInfo::getModel, bo.getModel()) + .eq(StringUtils.isNotBlank(bo.getManufacturer()), EmsBaseCollectDeviceInfo::getManufacturer, bo.getManufacturer()) + .eq(StringUtils.isNotBlank(bo.getIpAddress()), EmsBaseCollectDeviceInfo::getIpAddress, bo.getIpAddress()) + .eq(bo.getProduceDate() != null, EmsBaseCollectDeviceInfo::getProduceDate, bo.getProduceDate()) + .eq(StringUtils.isNotBlank(bo.getSettingAddress()), EmsBaseCollectDeviceInfo::getSettingAddress, bo.getSettingAddress()) + .eq(StringUtils.isNotBlank(bo.getIsFlag()), EmsBaseCollectDeviceInfo::getIsFlag, bo.getIsFlag()) + .orderByDesc(EmsBaseCollectDeviceInfo::getCreateTime); + return lqw; + } } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyPriceServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyPriceServiceImpl.java index 62c8c78b..1bcec632 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyPriceServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseEnergyPriceServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.base.domain.EmsBaseEnergyPrice; import org.dromara.ems.base.mapper.EmsBaseEnergyPriceMapper; import org.dromara.ems.base.service.IEmsBaseEnergyPriceService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 能源月份单价Service业务层处理 @@ -101,4 +108,37 @@ public class EmsBaseEnergyPriceServiceImpl implements IEmsBaseEnergyPriceService { return emsBaseEnergyPriceMapper.deleteEmsBaseEnergyPriceByObjId(objId); } + + /** + * 分页查询能源月份单价列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 能源月份单价分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseEnergyPrice bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseEnergyPriceMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseEnergyPrice bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseEnergyPrice.class) + .selectAll(EmsBaseEnergyPrice.class) + .eq(bo.getObjId() != null, EmsBaseEnergyPrice::getObjId, bo.getObjId()) + .eq(bo.getEnergyId() != null, EmsBaseEnergyPrice::getEnergyId, bo.getEnergyId()) + .like(StringUtils.isNotBlank(bo.getEnergyName()), EmsBaseEnergyPrice::getEnergyName, bo.getEnergyName()) + .eq(StringUtils.isNotBlank(bo.getMeasureUnit()), EmsBaseEnergyPrice::getMeasureUnit, bo.getMeasureUnit()) + .eq(bo.getMonthDate() != null, EmsBaseEnergyPrice::getMonthDate, bo.getMonthDate()) + .eq(bo.getPrice() != null, EmsBaseEnergyPrice::getPrice, bo.getPrice()) + .eq(bo.getUnTaxPrice() != null, EmsBaseEnergyPrice::getUnTaxPrice, bo.getUnTaxPrice()) + .eq(bo.getStartDate() != null, EmsBaseEnergyPrice::getStartDate, bo.getStartDate()) + .eq(bo.getEndDate() != null, EmsBaseEnergyPrice::getEndDate, bo.getEndDate()) + .orderByDesc(EmsBaseEnergyPrice::getCreateTime); + return lqw; + } + } 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 06ad1860..dd9fdf53 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 @@ -1,14 +1,24 @@ 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; import org.dromara.ems.base.service.IEmsBaseEnergyTypeService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 能源类型信息Service业务层处理 @@ -23,6 +33,36 @@ public class EmsBaseEnergyTypeServiceImpl implements IEmsBaseEnergyTypeService private final EmsBaseEnergyTypeMapper emsBaseEnergyTypeMapper; + /** + * 分页查询能源类型信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 能源类型信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseEnergyType bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseEnergyTypeMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseEnergyType bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseEnergyType.class) + .selectAll(EmsBaseEnergyType.class) + .eq(bo.getObjId() != null, EmsBaseEnergyType::getObjId, bo.getObjId()) + .eq(bo.getEnergyTypeId() != null, EmsBaseEnergyType::getEnergyTypeId, bo.getEnergyTypeId()) + .like(StringUtils.isNotBlank(bo.getEnergyName()), EmsBaseEnergyType::getEnergyName, bo.getEnergyName()) + .eq(StringUtils.isNotBlank(bo.getMeasureUnit()), EmsBaseEnergyType::getMeasureUnit, bo.getMeasureUnit()) + .eq(bo.getPrice() != null, EmsBaseEnergyType::getPrice, bo.getPrice()) + .orderByDesc(EmsBaseEnergyType::getCreateTime); + return lqw; + } + + /** * 查询能源类型信息 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java index a8a5cb16..0287242d 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java @@ -1,9 +1,14 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.base.domain.EmsBaseMonitorInfo; import org.dromara.ems.base.domain.TreeSelects; import org.dromara.ems.base.mapper.EmsBaseMonitorInfoMapper; @@ -28,6 +33,49 @@ public class EmsBaseMonitorInfoServiceImpl implements IEmsBaseMonitorInfoService private final EmsBaseMonitorInfoMapper emsBaseMonitorInfoMapper; + /** + * 分页查询计量设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 计量设备信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorInfo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseMonitorInfoMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseMonitorInfo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseMonitorInfo.class) + .selectAll(EmsBaseMonitorInfo.class) + .eq(bo.getObjId() != null, EmsBaseMonitorInfo::getObjId, bo.getObjId()) + .eq(bo.getParentId() != null, EmsBaseMonitorInfo::getParentId, bo.getParentId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorInfo::getMonitorCode, bo.getMonitorCode()) + .like(StringUtils.isNotBlank(bo.getMonitorName()), EmsBaseMonitorInfo::getMonitorName, bo.getMonitorName()) + .eq(StringUtils.isNotBlank(bo.getMonitorAddr()), EmsBaseMonitorInfo::getMonitorAddr, bo.getMonitorAddr()) + .eq(bo.getMonitorType() != null, EmsBaseMonitorInfo::getMonitorType, bo.getMonitorType()) + .eq(bo.getMonitorStatus() != null, EmsBaseMonitorInfo::getMonitorStatus, bo.getMonitorStatus()) + .eq(StringUtils.isNotBlank(bo.getCollectDeviceId()), EmsBaseMonitorInfo::getCollectDeviceId, bo.getCollectDeviceId()) + .eq(StringUtils.isNotBlank(bo.getAncestors()), EmsBaseMonitorInfo::getAncestors, bo.getAncestors()) + .eq(bo.getGrade() != null, EmsBaseMonitorInfo::getGrade, bo.getGrade()) + .eq(StringUtils.isNotBlank(bo.getMeterTypeId()), EmsBaseMonitorInfo::getMeterTypeId, bo.getMeterTypeId()) + .eq(bo.getCorrectValue() != null, EmsBaseMonitorInfo::getCorrectValue, bo.getCorrectValue()) + .eq(bo.getPt() != null, EmsBaseMonitorInfo::getPt, bo.getPt()) + .eq(bo.getCt() != null, EmsBaseMonitorInfo::getCt, bo.getCt()) + .eq(StringUtils.isNotBlank(bo.getIsAmmeter()), EmsBaseMonitorInfo::getIsAmmeter, bo.getIsAmmeter()) + .eq(bo.getIsKeyMonitor() != null, EmsBaseMonitorInfo::getIsKeyMonitor, bo.getIsKeyMonitor()) + .eq(bo.getIsCircuit() != null, EmsBaseMonitorInfo::getIsCircuit, bo.getIsCircuit()) + .eq(bo.getPublicShareType() != null, EmsBaseMonitorInfo::getPublicShareType, bo.getPublicShareType()) + .eq(bo.getMonitorHierarchy() != null, EmsBaseMonitorInfo::getMonitorHierarchy, bo.getMonitorHierarchy()) + .orderByDesc(EmsBaseMonitorInfo::getCreateTime); + return lqw; + } + /** * 查询计量设备信息 * 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 9213c149..fba6bd16 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 @@ -1,9 +1,14 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.ems.base.domain.EmsBaseMonitorInfo; import org.dromara.ems.base.domain.EmsBaseMonitorThreshold; @@ -13,6 +18,7 @@ import org.dromara.ems.base.service.IEmsBaseMonitorThresholdService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 计量设备阈值维护Service业务层处理 @@ -26,9 +32,53 @@ public class EmsBaseMonitorThresholdServiceImpl implements IEmsBaseMonitorThresh private final EmsBaseMonitorThresholdMapper emsBaseMonitorThresholdMapper; - private final EmsBaseMonitorInfoMapper emsBaseMonitorInfoMapper; + + /** + * 分页查询计量设备阈值维护列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 计量设备阈值维护分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorThreshold bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseMonitorThresholdMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseMonitorThreshold bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseMonitorThreshold.class) + .selectAll(EmsBaseMonitorThreshold.class) + .eq(bo.getObjId() != null, EmsBaseMonitorThreshold::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorThreshold::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getMonitorType() != null, EmsBaseMonitorThreshold::getMonitorType, bo.getMonitorType()) + .eq(bo.getIAMax() != null, EmsBaseMonitorThreshold::getIAMax, bo.getIAMax()) + .eq(bo.getIAMin() != null, EmsBaseMonitorThreshold::getIAMin, bo.getIAMin()) + .eq(bo.getIBMax() != null, EmsBaseMonitorThreshold::getIBMax, bo.getIBMax()) + .eq(bo.getIBMin() != null, EmsBaseMonitorThreshold::getIBMin, bo.getIBMin()) + .eq(bo.getICMax() != null, EmsBaseMonitorThreshold::getICMax, bo.getICMax()) + .eq(bo.getICMin() != null, EmsBaseMonitorThreshold::getICMin, bo.getICMin()) + .eq(bo.getVAMax() != null, EmsBaseMonitorThreshold::getVAMax, bo.getVAMax()) + .eq(bo.getVAMin() != null, EmsBaseMonitorThreshold::getVAMin, bo.getVAMin()) + .eq(bo.getVBMax() != null, EmsBaseMonitorThreshold::getVBMax, bo.getVBMax()) + .eq(bo.getVBMin() != null, EmsBaseMonitorThreshold::getVBMin, bo.getVBMin()) + .eq(bo.getVCMax() != null, EmsBaseMonitorThreshold::getVCMax, bo.getVCMax()) + .eq(bo.getVCMin() != null, EmsBaseMonitorThreshold::getVCMin, bo.getVCMin()) + .eq(bo.getHourConsumption() != null, EmsBaseMonitorThreshold::getHourConsumption, bo.getHourConsumption()) + .eq(bo.getDayConsumption() != null, EmsBaseMonitorThreshold::getDayConsumption, bo.getDayConsumption()) + .eq(bo.getLineLossRate() != null, EmsBaseMonitorThreshold::getLineLossRate, bo.getLineLossRate()) + .eq(StringUtils.isNotBlank(bo.getIsFlag()), EmsBaseMonitorThreshold::getIsFlag, bo.getIsFlag()) + .orderByDesc(EmsBaseMonitorThreshold::getCreateTime); + return lqw; + } + + /** * 查询计量设备阈值维护 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java index 01c124e2..b80b7478 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.base.domain.EmsBaseMonitorWorkUnit; import org.dromara.ems.base.mapper.EmsBaseMonitorWorkUnitMapper; import org.dromara.ems.base.service.IEmsBaseMonitorWorkUnitService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 统计计量信息Service业务层处理 @@ -23,6 +30,43 @@ public class EmsBaseMonitorWorkUnitServiceImpl implements IEmsBaseMonitorWorkUni private final EmsBaseMonitorWorkUnitMapper emsBaseMonitorWorkUnitMapper; + /** + * 分页查询统计计量信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 统计计量信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseMonitorWorkUnit bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseMonitorWorkUnitMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseMonitorWorkUnit bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseMonitorWorkUnit.class) + .selectAll(EmsBaseMonitorWorkUnit.class) + .eq(bo.getObjId() != null, EmsBaseMonitorWorkUnit::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorWorkUnit::getMonitorCode, bo.getMonitorCode()) + .eq(StringUtils.isNotBlank(bo.getWorkUnitCode()), EmsBaseMonitorWorkUnit::getWorkUnitCode, bo.getWorkUnitCode()) + .eq(bo.getMonitorStatus() != null, EmsBaseMonitorWorkUnit::getMonitorStatus, bo.getMonitorStatus()) + .eq(bo.getMonitorType() != null, EmsBaseMonitorWorkUnit::getMonitorType, bo.getMonitorType()) + .eq(bo.getFormulaMode() != null, EmsBaseMonitorWorkUnit::getFormulaMode, bo.getFormulaMode()) + .eq(bo.getProportion() != null, EmsBaseMonitorWorkUnit::getProportion, bo.getProportion()) + .eq(StringUtils.isNotBlank(bo.getIsFlag()), EmsBaseMonitorWorkUnit::getIsFlag, bo.getIsFlag()) + .eq(StringUtils.isNotBlank(bo.getCreatedBy()), EmsBaseMonitorWorkUnit::getCreatedBy, bo.getCreatedBy()) + .eq(bo.getCreatedTime() != null, EmsBaseMonitorWorkUnit::getCreatedTime, bo.getCreatedTime()) + .eq(StringUtils.isNotBlank(bo.getUpdatedBy()), EmsBaseMonitorWorkUnit::getUpdatedBy, bo.getUpdatedBy()) + .eq(bo.getUpdatedTime() != null, EmsBaseMonitorWorkUnit::getUpdatedTime, bo.getUpdatedTime()) + .orderByDesc(EmsBaseMonitorWorkUnit::getCreateTime); + return lqw; + } + + /** * 查询统计计量信息 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseSharePriceServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseSharePriceServiceImpl.java index 435a151e..6bba7831 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseSharePriceServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseSharePriceServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.base.domain.EmsBaseSharePrice; import org.dromara.ems.base.mapper.EmsBaseSharePriceMapper; import org.dromara.ems.base.service.IEmsBaseSharePriceService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 分时电价维护Service业务层处理 @@ -22,6 +29,36 @@ public class EmsBaseSharePriceServiceImpl implements IEmsBaseSharePriceService { private final EmsBaseSharePriceMapper emsBaseSharePriceMapper; + /** + * 分页查询分时电价维护列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分时电价维护分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseSharePrice bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseSharePriceMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseSharePrice bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseSharePrice.class) + .selectAll(EmsBaseSharePrice.class) + .eq(bo.getObjId() != null, EmsBaseSharePrice::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getYearMonthDate()), EmsBaseSharePrice::getYearMonthDate, bo.getYearMonthDate()) + .eq(StringUtils.isNotBlank(bo.getPriceType()), EmsBaseSharePrice::getPriceType, bo.getPriceType()) + .eq(StringUtils.isNotBlank(bo.getStartHour()), EmsBaseSharePrice::getStartHour, bo.getStartHour()) + .eq(StringUtils.isNotBlank(bo.getEndHour()), EmsBaseSharePrice::getEndHour, bo.getEndHour()) + .eq(bo.getDnbPrice() != null, EmsBaseSharePrice::getDnbPrice, bo.getDnbPrice()) + .orderByDesc(EmsBaseSharePrice::getCreateTime); + return lqw; + } + /** * 查询分时电价维护 * 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 0def7657..8818cafb 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 @@ -1,9 +1,16 @@ 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; import org.dromara.ems.base.domain.TreeSelects; @@ -15,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -33,6 +41,46 @@ public class EmsBaseWorkUnitServiceImpl implements IEmsBaseWorkUnitService private final EmsBaseMonitorWorkUnitMapper emsBaseMonitorWorkUnitMapper; + + /** + * 分页查询统计单元信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 统计单元信息分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsBaseWorkUnitMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsBaseWorkUnit bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsBaseWorkUnit.class) + .selectAll(EmsBaseWorkUnit.class) + .eq(bo.getObjId() != null, EmsBaseWorkUnit::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getWorkUnitCode()), EmsBaseWorkUnit::getWorkUnitCode, bo.getWorkUnitCode()) + .eq(bo.getParentId() != null, EmsBaseWorkUnit::getParentId, bo.getParentId()) + .like(StringUtils.isNotBlank(bo.getWorkUnitName()), EmsBaseWorkUnit::getWorkUnitName, bo.getWorkUnitName()) + .eq(StringUtils.isNotBlank(bo.getWorkUnitAddress()), EmsBaseWorkUnit::getWorkUnitAddress, bo.getWorkUnitAddress()) + .eq(StringUtils.isNotBlank(bo.getAncestors()), EmsBaseWorkUnit::getAncestors, bo.getAncestors()) + .eq(bo.getWorkUnitSort() != null, EmsBaseWorkUnit::getWorkUnitSort, bo.getWorkUnitSort()) + .eq(StringUtils.isNotBlank(bo.getProductLineCode()), EmsBaseWorkUnit::getProductLineCode, bo.getProductLineCode()) + .eq(bo.getWorkUnitType() != null, EmsBaseWorkUnit::getWorkUnitType, bo.getWorkUnitType()) + .eq(StringUtils.isNotBlank(bo.getIsFlag()), EmsBaseWorkUnit::getIsFlag, bo.getIsFlag()) + .eq(StringUtils.isNotBlank(bo.getCreatedBy()), EmsBaseWorkUnit::getCreatedBy, bo.getCreatedBy()) + .eq(bo.getCreatedTime() != null, EmsBaseWorkUnit::getCreatedTime, bo.getCreatedTime()) + .eq(StringUtils.isNotBlank(bo.getUpdatedBy()), EmsBaseWorkUnit::getUpdatedBy, bo.getUpdatedBy()) + .eq(bo.getUpdatedTime() != null, EmsBaseWorkUnit::getUpdatedTime, bo.getUpdatedTime()) + .orderByDesc(EmsBaseWorkUnit::getCreateTime); + return lqw; + } + + /** * 查询统计单元信息 * 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 86c7ea32..0cc8d151 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 @@ -15,6 +15,8 @@ import org.dromara.ems.record.service.IEmsRecordAlarmDataService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 异常数据记录Controller * @@ -24,7 +26,7 @@ import org.springframework.web.bind.annotation.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordAlarmData") +@RequestMapping("/record/recordAlarmData") public class EmsRecordAlarmDataController extends BaseController { @@ -38,8 +40,8 @@ public class EmsRecordAlarmDataController extends BaseController public TableDataInfo list(EmsRecordAlarmData emsRecordAlarmData, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - java.util.List list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData); - return TableDataInfo.build(list); + TableDataInfo list = emsRecordAlarmDataService.queryPageList(pageQuery,emsRecordAlarmData); + return list; } /** @@ -50,7 +52,7 @@ public class EmsRecordAlarmDataController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, EmsRecordAlarmData emsRecordAlarmData) { - java.util.List list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData); + List list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData); //ExcelUtil util = new //ExcelUtil<>(EmsRecordAlarmData.class); ExcelUtil.exportExcelResponse(response, list, "报警实时数据数据",EmsRecordAlarmData.class); } 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 f5e9d4c7..46927105 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,6 +7,8 @@ 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; @@ -26,7 +28,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordAlarmRule") +@RequestMapping("/record/recordAlarmRule") public class EmsRecordAlarmRuleController extends BaseController { @@ -39,9 +41,8 @@ public class EmsRecordAlarmRuleController extends BaseController @GetMapping("/list") public TableDataInfo list(EmsRecordAlarmRule emsRecordAlarmRule, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsRecordAlarmRuleService.selectEmsRecordAlarmRuleList(emsRecordAlarmRule); - return TableDataInfo.build(list); + TableDataInfo list = emsRecordAlarmRuleService.queryPageList(pageQuery,emsRecordAlarmRule); + return list; } /** 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 aa944fad..63dab3a7 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,6 +6,8 @@ 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; @@ -25,7 +27,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordDnbInstant") +@RequestMapping("/record/recordDnbInstant") public class EmsRecordDnbInstantController extends BaseController { private final IEmsRecordDnbInstantService emsRecordDnbInstantService; @@ -36,9 +38,8 @@ public class EmsRecordDnbInstantController extends BaseController { @SaCheckPermission("ems:record:recordDnbInstant:list") @GetMapping("/list") public TableDataInfo list(EmsRecordDnbInstant emsRecordDnbInstant, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsRecordDnbInstantService.selectEmsRecordDnbInstantList(emsRecordDnbInstant); - return TableDataInfo.build(list); + TableDataInfo list = emsRecordDnbInstantService.queryPageList(pageQuery,emsRecordDnbInstant); + return list; } /** 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 86ee3316..d810c0ed 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,6 +7,8 @@ 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; @@ -27,7 +29,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordSteamInstant") +@RequestMapping("/record/recordSteamInstant") public class EmsRecordSteamInstantController extends BaseController { private final IEmsRecordSteamInstantService emsRecordSteamInstantService; @@ -39,9 +41,9 @@ public class EmsRecordSteamInstantController extends BaseController { @GetMapping("/list") public TableDataInfo list(EmsRecordSteamInstant emsRecordSteamInstant, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - java.util.List list = emsRecordSteamInstantService - .selectEmsRecordSteamInstantList(emsRecordSteamInstant); - return TableDataInfo.build(list); + TableDataInfo list = emsRecordSteamInstantService + .queryPageList(pageQuery,emsRecordSteamInstant); + return list; } /** @@ -51,7 +53,7 @@ public class EmsRecordSteamInstantController extends BaseController { //@Log(title = "蒸汽历史数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, EmsRecordSteamInstant emsRecordSteamInstant) { - java.util.List list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant); + List list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant); //ExcelUtil util = new //ExcelUtil<>(EmsRecordSteamInstant.class); ExcelUtil.exportExcelResponse(response, list, "蒸汽历史数据数据",EmsRecordSteamInstant.class); } @@ -105,7 +107,7 @@ public class EmsRecordSteamInstantController extends BaseController { @SaCheckPermission("ems:record:recordSteamInstant:list") @GetMapping("/steamInstantList") public R steamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) { - java.util.List list = emsRecordSteamInstantService + List list = emsRecordSteamInstantService .selectEmsRecordSteamInstantList(emsRecordSteamInstant); return R.ok(list); } @@ -118,7 +120,7 @@ public class EmsRecordSteamInstantController extends BaseController { @SaCheckPermission("ems:record:recordSteamInstant:list") @GetMapping("/latestSteamInstantList") public R latestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) { - java.util.List list = emsRecordSteamInstantService + List list = emsRecordSteamInstantService .selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant); return R.ok(list); } 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 4ce704a1..5a93e36e 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,6 +7,8 @@ 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; @@ -15,6 +17,8 @@ import org.dromara.ems.record.service.IEmsRecordWaterInstantService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 水实时数据Controller * @@ -24,7 +28,7 @@ import org.springframework.web.bind.annotation.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordWaterInstant") +@RequestMapping("/record/recordWaterInstant") public class EmsRecordWaterInstantController extends BaseController { @@ -38,8 +42,8 @@ public class EmsRecordWaterInstantController extends BaseController public TableDataInfo list(EmsRecordWaterInstant emsRecordWaterInstant, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - java.util.List list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant); - return TableDataInfo.build(list); + TableDataInfo list = emsRecordWaterInstantService.queryPageList(pageQuery,emsRecordWaterInstant); + return list; } /** @@ -50,7 +54,7 @@ public class EmsRecordWaterInstantController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, EmsRecordWaterInstant emsRecordWaterInstant) { - java.util.List list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant); + List list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant); //ExcelUtil util = new ExcelUtil<>(EmsRecordWaterInstant.class); ExcelUtil.exportExcelResponse(response, list, "水实时数据数据",EmsRecordWaterInstant.class); } 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 829a6456..7e854d40 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 @@ -26,7 +26,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordVibrationInstant") +@RequestMapping("/record/recordVibrationInstant") public class EmsVibrationInstantController extends BaseController { @@ -40,8 +40,8 @@ public class EmsVibrationInstantController extends BaseController public TableDataInfo list(EmsVibrationInstant emsVibrationInstant, PageQuery pageQuery) { // PageUtils.startPage(pageQuery); - List list = emsVibrationInstantService.selectEmsVibrationInstantList(emsVibrationInstant); - return TableDataInfo.build(list); + TableDataInfo list = emsVibrationInstantService.queryPageList(emsVibrationInstant, pageQuery); + return list; } /** 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 d434eaa0..c1635fba 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 @@ -7,6 +7,9 @@ import lombok.RequiredArgsConstructor; 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; @@ -30,7 +33,7 @@ import java.util.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/record/recordIOTInstant") +@RequestMapping("/record/recordIOTInstant") public class TWTempertureDataController extends BaseController { @@ -47,11 +50,11 @@ public class TWTempertureDataController extends BaseController */ @SaCheckPermission("ems/record:recordIOTInstant:list") @GetMapping("/list") - public TableDataInfo list(TWTempertureData tWTempertureData) + public TableDataInfo list(TWTempertureData tWTempertureData, PageQuery pageQuery) { - List list = tWTempertureDataService.selectTWTempertureDataList(tWTempertureData); - return TableDataInfo.build(list); + return tWTempertureDataService.queryPageList(pageQuery,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 103478fb..89a7cf73 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 @@ -1,23 +1,34 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; /** * 异常数据记录对象 ems_record_alarm_data * - * @author Yinq - * @date 2024-05-15 + * @author zch + * @date 2025-10-22 */ -public class EmsRecordAlarmData extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_record_alarm_data") +public class EmsRecordAlarmData extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 自增标识 */ + /** + * 自增标识 + */ private Long objId; /** 计量设备编号 */ 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 9fdb88ca..8a7e0b0b 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 @@ -1,23 +1,34 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; /** * 异常告警规则对象 ems_record_alarm_rule * - * @author Yinq - * @date 2024-05-15 + * @author zch + * @date 2025-10-22 */ -public class EmsRecordAlarmRule extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_record_alarm_rule") +public class EmsRecordAlarmRule extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 自增标识 */ + /** + * 自增标识 + */ private Long objId; /** 规则编号 */ 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 e2939c62..2b20f71b 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 @@ -1,24 +1,35 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** * 电实时数据对象 ems_record_dnb_instant * - * @author Yinq - * @date 2024-05-21 + * @author zch + * @date 2025-10-22 */ -public class EmsRecordDnbInstant extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_record_dnb_instant") +public class EmsRecordDnbInstant extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** 主键标识 */ + /** + * 主键标识 + */ private Long objId; /** 计量设备编号 */ 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 b2692ad5..c2a3f335 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 @@ -1,20 +1,30 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** - * 蒸汽历史数据对象 ems_record_steam_instant + * 蒸汽实时数据对象 ems_record_steam_instant * - * @author Yinq - * @date 2024-05-22 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_record_steam_instant") public class EmsRecordSteamInstant extends BaseEntity { + + @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 a5e4561a..276ed76a 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 @@ -1,24 +1,35 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** * 水实时数据对象 ems_record_water_instant * - * @author Yinq - * @date 2024-05-14 + * @author zch + * @date 2025-10-22 */ -public class EmsRecordWaterInstant extends BaseEntity -{ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_record_water_instant") +public class EmsRecordWaterInstant extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; - /** */ + /** + * 主键标识 + */ private Long objId; /** 计量设备编号 */ 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 eb741ff4..f0c5bc1e 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 @@ -1,8 +1,11 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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.math.BigDecimal; @@ -14,6 +17,9 @@ import java.util.Date; * @author ZangCH * @date 2024-08-22 */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("T_VibrationSensor_Data") public class EmsVibrationInstant extends BaseEntity { private static final long serialVersionUID = 1L; @@ -147,7 +153,7 @@ public class EmsVibrationInstant extends BaseEntity .append("acceleration", getAcceleration()) .append("temperature", getTemperature()) .append("recodeTime", getRecodeTime()) - .append("remark", getRemark()) +// .append("remark", getRemark()) .toString(); } } 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 f549df49..426e94e3 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 @@ -1,8 +1,11 @@ package org.dromara.ems.record.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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.math.BigDecimal; @@ -14,6 +17,9 @@ import java.util.Date; * @author Caoql * @date 2024-08-21 */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("T_W_TempertureData") public class TWTempertureData extends BaseEntity { 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 56011c80..b0d9936b 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,16 @@ import java.util.List; */ public interface IEmsRecordAlarmDataService { + + /** + * 分页查询异常数据记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 异常数据记录分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordAlarmData bo); + /** * 查询异常数据记录 * 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 7d4ad9dc..e9f77d4d 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,18 @@ import java.util.List; */ public interface IEmsRecordAlarmRuleService { + + /** + * 分页查询异常告警规则列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 异常告警规则分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordAlarmRule bo); + + + /** * 查询异常告警规则 * 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 425b1152..6b84f4b1 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,16 @@ import java.util.List; * @date 2024-05-11 */ public interface IEmsRecordDnbInstantService { + + /** + * 分页查询电实时数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 电实时数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordDnbInstant bo); + /** * 查询电实时数据 * 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 a3e36216..1f58e2c5 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,18 @@ import java.util.List; * @date 2024-05-22 */ public interface IEmsRecordSteamInstantService { + + /** + * 分页查询蒸汽历史数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 蒸汽历史数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery , EmsRecordSteamInstant bo); + + + /** * 查询蒸汽历史数据 * 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 dd26637f..9c3b48b5 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,15 @@ import java.util.List; */ public interface IEmsRecordWaterInstantService { + /** + * 分页查询水实时数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水实时数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordWaterInstant bo); + /** * 查询水实时数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsVibrationInstantService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsVibrationInstantService.java index 20baa965..2bb64c69 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsVibrationInstantService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/IEmsVibrationInstantService.java @@ -1,5 +1,7 @@ package org.dromara.ems.record.service; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.record.domain.EmsVibrationInstant; import java.util.List; @@ -12,6 +14,9 @@ import java.util.List; */ public interface IEmsVibrationInstantService { + + public TableDataInfo queryPageList(EmsVibrationInstant bo, PageQuery pageQuery); + /** * 查询震动实时数据 * 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 e7af15f8..207c3435 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,5 +1,9 @@ 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; import java.util.List; @@ -12,6 +16,10 @@ import java.util.List; */ public interface ITWTempertureDataService { + + public TableDataInfo queryPageList(PageQuery pageQuery ,TWTempertureData bo); + + /** * 查询物联网实时数据 * 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 d0ee22f6..cfbb5d39 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,9 +1,16 @@ package org.dromara.ems.record.service.impl; +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; import org.dromara.ems.base.domain.EmsBaseMonitorThreshold; @@ -54,6 +61,43 @@ public class EmsRecordAlarmDataServiceImpl implements IEmsRecordAlarmDataService private final EmsReportPointDnbMapper emsReportPointDnbMapper; + + /** + * 分页查询异常数据记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 异常数据记录分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordAlarmData bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsRecordAlarmDataMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsRecordAlarmData bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsRecordAlarmData.class) + .selectAll(EmsRecordAlarmData.class) + .eq(bo.getObjId() != null, EmsRecordAlarmData::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorId()), EmsRecordAlarmData::getMonitorId, bo.getMonitorId()) + .eq(StringUtils.isNotBlank(bo.getCollectDeviceId()), EmsRecordAlarmData::getCollectDeviceId, bo.getCollectDeviceId()) + .eq(bo.getCollectTime() != null, EmsRecordAlarmData::getCollectTime, bo.getCollectTime()) + .eq(bo.getAlarmType() != null, EmsRecordAlarmData::getAlarmType, bo.getAlarmType()) + .eq(bo.getAlarmStatus() != null, EmsRecordAlarmData::getAlarmStatus, bo.getAlarmStatus()) + .eq(StringUtils.isNotBlank(bo.getAlarmData()), EmsRecordAlarmData::getAlarmData, bo.getAlarmData()) + .like(StringUtils.isNotBlank(bo.getOperationName()), EmsRecordAlarmData::getOperationName, bo.getOperationName()) + .eq(bo.getOperationTime() != null, EmsRecordAlarmData::getOperationTime, bo.getOperationTime()) + .eq(StringUtils.isNotBlank(bo.getCause()), EmsRecordAlarmData::getCause, bo.getCause()) + .eq(StringUtils.isNotBlank(bo.getNotifyUser()), EmsRecordAlarmData::getNotifyUser, bo.getNotifyUser()) + .orderByDesc(EmsRecordAlarmData::getCreateTime); + return lqw; + } + + /** * 查询异常数据记录 * @@ -134,7 +178,7 @@ public class EmsRecordAlarmDataServiceImpl implements IEmsRecordAlarmDataService EmsRecordAlarmData alarmData = new EmsRecordAlarmData(); alarmData.setObjId(objId); alarmData.setAlarmStatus(0L); - alarmData.setOperationName(LoginHelper.getUserId()); + alarmData.setOperationName(LoginHelper.getUsername()); alarmData.setOperationTime(DateUtils.getNowDate()); emsRecordAlarmDataMapper.updateEmsRecordAlarmData(alarmData); } @@ -252,40 +296,40 @@ public class EmsRecordAlarmDataServiceImpl implements IEmsRecordAlarmDataService || recordDnbInstant.getVC().compareTo(zero) == 0) { return "缺项报警"; } - if (recordDnbInstant.getIA().compareTo(baseDnbThreshold.getiAMax()) > 0) { + if (recordDnbInstant.getIA().compareTo(baseDnbThreshold.getIBMin()) > 0) { return "超过A相电流最大值"; } - if (recordDnbInstant.getIB().compareTo(baseDnbThreshold.getiBMax()) > 0) { + if (recordDnbInstant.getIB().compareTo(baseDnbThreshold.getIBMax()) > 0) { return "超过B相电流最大值"; } - if (recordDnbInstant.getIC().compareTo(baseDnbThreshold.getiCMax()) > 0) { + if (recordDnbInstant.getIC().compareTo(baseDnbThreshold.getICMax()) > 0) { return "超过C相电流最大值"; } - if (recordDnbInstant.getVA().compareTo(baseDnbThreshold.getvAMax()) > 0) { + if (recordDnbInstant.getVA().compareTo(baseDnbThreshold.getVAMax()) > 0) { return "超过A相电压最大值"; } - if (recordDnbInstant.getVB().compareTo(baseDnbThreshold.getvBMax()) > 0) { + if (recordDnbInstant.getVB().compareTo(baseDnbThreshold.getVBMax()) > 0) { return "超过B相电压最大值"; } - if (recordDnbInstant.getVC().compareTo(baseDnbThreshold.getvCMax()) > 0) { + if (recordDnbInstant.getVC().compareTo(baseDnbThreshold.getVCMax()) > 0) { return "超过C相电压最大值"; } - if (recordDnbInstant.getIA().compareTo(baseDnbThreshold.getiAMin()) < 0) { + if (recordDnbInstant.getIA().compareTo(baseDnbThreshold.getIAMin()) < 0) { return "小于A相电流最小值"; } - if (recordDnbInstant.getIB().compareTo(baseDnbThreshold.getiBMin()) < 0) { + if (recordDnbInstant.getIB().compareTo(baseDnbThreshold.getIBMin()) < 0) { return "小于B相电流最小值"; } - if (recordDnbInstant.getIC().compareTo(baseDnbThreshold.getiCMin()) < 0) { + if (recordDnbInstant.getIC().compareTo(baseDnbThreshold.getICMin()) < 0) { return "小于C相电流最小值"; } - if (recordDnbInstant.getVA().compareTo(baseDnbThreshold.getvAMin()) < 0) { + if (recordDnbInstant.getVA().compareTo(baseDnbThreshold.getVAMin()) < 0) { return "小于A相电压最小值"; } - if (recordDnbInstant.getVB().compareTo(baseDnbThreshold.getvBMin()) < 0) { + if (recordDnbInstant.getVB().compareTo(baseDnbThreshold.getVBMin()) < 0) { return "小于B相电压最小值"; } - if (recordDnbInstant.getVC().compareTo(baseDnbThreshold.getvCMin()) < 0) { + if (recordDnbInstant.getVC().compareTo(baseDnbThreshold.getVCMin()) < 0) { return "小于C相电压最小值"; } return null; diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmRuleServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmRuleServiceImpl.java index 530fe6f4..2735d615 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmRuleServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordAlarmRuleServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.record.domain.EmsRecordAlarmRule; import org.dromara.ems.record.mapper.EmsRecordAlarmRuleMapper; import org.dromara.ems.record.service.IEmsRecordAlarmRuleService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 异常告警规则Service业务层处理 @@ -23,6 +30,42 @@ public class EmsRecordAlarmRuleServiceImpl implements IEmsRecordAlarmRuleService private final EmsRecordAlarmRuleMapper emsRecordAlarmRuleMapper; + /** + * 分页查询异常告警规则列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 异常告警规则分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordAlarmRule bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsRecordAlarmRuleMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsRecordAlarmRule bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsRecordAlarmRule.class) + .selectAll(EmsRecordAlarmRule.class) + .eq(bo.getObjId() != null, EmsRecordAlarmRule::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getRuleId()), EmsRecordAlarmRule::getRuleId, bo.getRuleId()) + .like(StringUtils.isNotBlank(bo.getRuleName()), EmsRecordAlarmRule::getRuleName, bo.getRuleName()) + .eq(StringUtils.isNotBlank(bo.getMonitorId()), EmsRecordAlarmRule::getMonitorId, bo.getMonitorId()) + .eq(bo.getCollectTime() != null, EmsRecordAlarmRule::getCollectTime, bo.getCollectTime()) + .eq(bo.getEnergyType() != null, EmsRecordAlarmRule::getEnergyType, bo.getEnergyType()) + .eq(bo.getTriggerRule() != null, EmsRecordAlarmRule::getTriggerRule, bo.getTriggerRule()) + .eq(bo.getTriggerNumber() != null, EmsRecordAlarmRule::getTriggerNumber, bo.getTriggerNumber()) + .eq(bo.getTimeRange() != null, EmsRecordAlarmRule::getTimeRange, bo.getTimeRange()) + .eq(bo.getDeviceOfflineTime() != null, EmsRecordAlarmRule::getDeviceOfflineTime, bo.getDeviceOfflineTime()) + .eq(StringUtils.isNotBlank(bo.getNotifyUser()), EmsRecordAlarmRule::getNotifyUser, bo.getNotifyUser()) + .eq(StringUtils.isNotBlank(bo.getCause()), EmsRecordAlarmRule::getCause, bo.getCause()) + .orderByDesc(EmsRecordAlarmRule::getCreateTime); + return lqw; + } + /** * 查询异常告警规则 * 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 b7a4cce1..34079752 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 @@ -1,6 +1,15 @@ 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; import org.dromara.ems.record.service.IEmsRecordDnbInstantService; @@ -8,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.Map; /** * 电实时数据Service业务层处理 @@ -21,6 +31,44 @@ public class EmsRecordDnbInstantServiceImpl implements IEmsRecordDnbInstantServi private final EmsRecordDnbInstantMapper emsRecordDnbInstantMapper; + /** + * 分页查询电实时数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 电实时数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordDnbInstant bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsRecordDnbInstantMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private MPJLambdaWrapper buildQueryWrapper(EmsRecordDnbInstant bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsRecordDnbInstant.class) + .selectAll(EmsRecordDnbInstant.class) + .eq(bo.getObjId() != null, EmsRecordDnbInstant::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordDnbInstant::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getCollectTime() != null, EmsRecordDnbInstant::getCollectTime, bo.getCollectTime()) + .eq(bo.getVA() != null, EmsRecordDnbInstant::getVA, bo.getVA()) + .eq(bo.getVB() != null, EmsRecordDnbInstant::getVB, bo.getVB()) + .eq(bo.getVC() != null, EmsRecordDnbInstant::getVC, bo.getVC()) + .eq(bo.getIA() != null, EmsRecordDnbInstant::getIA, bo.getIA()) + .eq(bo.getIB() != null, EmsRecordDnbInstant::getIB, bo.getIB()) + .eq(bo.getIC() != null, EmsRecordDnbInstant::getIC, bo.getIC()) + .eq(bo.getRecordTime() != null, EmsRecordDnbInstant::getRecordTime, bo.getRecordTime()) + .eq(bo.getGlys() != null, EmsRecordDnbInstant::getGlys, bo.getGlys()) + .eq(bo.getZxyg() != null, EmsRecordDnbInstant::getZxyg, bo.getZxyg()) + .eq(bo.getActivePower() != null, EmsRecordDnbInstant::getActivePower, bo.getActivePower()) + .eq(bo.getReactivePower() != null, EmsRecordDnbInstant::getReactivePower, bo.getReactivePower()) + .eq(bo.getCollectType() != null, EmsRecordDnbInstant::getCollectType, bo.getCollectType()) + .orderByDesc(EmsRecordDnbInstant::getCreateTime); + return lqw; + } + /** * 查询电实时数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java index 7baa4b72..440a12a9 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java @@ -1,6 +1,12 @@ 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 lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.record.domain.EmsRecordSteamInstant; import org.dromara.ems.record.mapper.EmsRecordSteamInstantMapper; import org.dromara.ems.record.service.IEmsRecordSteamInstantService; @@ -8,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 蒸汽历史数据Service业务层处理 @@ -21,6 +28,43 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS private final EmsRecordSteamInstantMapper emsRecordSteamInstantMapper; + + /** + * 分页查询蒸汽实时数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 蒸汽实时数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordSteamInstant bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsRecordSteamInstantMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsRecordSteamInstant bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsRecordSteamInstant.class) + .selectAll(EmsRecordSteamInstant.class) + .eq(bo.getObjId() != null, EmsRecordSteamInstant::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordSteamInstant::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getCollectTime() != null, EmsRecordSteamInstant::getCollectTime, bo.getCollectTime()) + .eq(bo.getFluxFlow() != null, EmsRecordSteamInstant::getFluxFlow, bo.getFluxFlow()) + .eq(bo.getSteamFlow() != null, EmsRecordSteamInstant::getSteamFlow, bo.getSteamFlow()) + .eq(bo.getHeatInstantValue() != null, EmsRecordSteamInstant::getHeatInstantValue, bo.getHeatInstantValue()) + .eq(bo.getHeatTotalValue() != null, EmsRecordSteamInstant::getHeatTotalValue, bo.getHeatTotalValue()) + .eq(bo.getTemperature() != null, EmsRecordSteamInstant::getTemperature, bo.getTemperature()) + .eq(bo.getPress() != null, EmsRecordSteamInstant::getPress, bo.getPress()) + .eq(bo.getDensity() != null, EmsRecordSteamInstant::getDensity, bo.getDensity()) + .eq(bo.getDifferencePress() != null, EmsRecordSteamInstant::getDifferencePress, bo.getDifferencePress()) + .eq(bo.getRecordTime() != null, EmsRecordSteamInstant::getRecordTime, bo.getRecordTime()) + .orderByDesc(EmsRecordSteamInstant::getCreateTime); + return lqw; + } + /** * 查询蒸汽历史数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java index 8962faee..e861ef3a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsRecordWaterInstantServiceImpl.java @@ -1,6 +1,12 @@ 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 lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.record.domain.EmsRecordWaterInstant; import org.dromara.ems.record.mapper.EmsRecordWaterInstantMapper; import org.dromara.ems.record.service.IEmsRecordWaterInstantService; @@ -8,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.Map; /** * 水实时数据Service业务层处理 @@ -22,6 +29,38 @@ public class EmsRecordWaterInstantServiceImpl implements IEmsRecordWaterInstantS private final EmsRecordWaterInstantMapper emsRecordWaterInstantMapper; + + /** + * 分页查询水实时数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水实时数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsRecordWaterInstant bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsRecordWaterInstantMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsRecordWaterInstant bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsRecordWaterInstant.class) + .selectAll(EmsRecordWaterInstant.class) + .eq(bo.getObjId() != null, EmsRecordWaterInstant::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsRecordWaterInstant::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getCollectTime() != null, EmsRecordWaterInstant::getCollectTime, bo.getCollectTime()) + .eq(bo.getFluxFlow() != null, EmsRecordWaterInstant::getFluxFlow, bo.getFluxFlow()) + .eq(bo.getWaterFlow() != null, EmsRecordWaterInstant::getWaterFlow, bo.getWaterFlow()) + .eq(bo.getRecordTime() != null, EmsRecordWaterInstant::getRecordTime, bo.getRecordTime()) + .eq(bo.getCollectType() != null, EmsRecordWaterInstant::getCollectType, bo.getCollectType()) + .orderByDesc(EmsRecordWaterInstant::getCreateTime); + return lqw; + } + /** * 查询水实时数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java index e3eb1b8e..aa4e4474 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java @@ -1,12 +1,19 @@ 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 lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.record.domain.EmsVibrationInstant; import org.dromara.ems.record.mapper.EmsVibrationInstantMapper; import org.dromara.ems.record.service.IEmsVibrationInstantService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 震动实时数据Service业务层处理 @@ -21,6 +28,38 @@ public class EmsVibrationInstantServiceImpl implements IEmsVibrationInstantServi private final EmsVibrationInstantMapper emsVibrationInstantMapper; + /** + * 分页查询振动传感器数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 振动传感器数据分页列表 + */ + @Override + public TableDataInfo queryPageList(EmsVibrationInstant bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsVibrationInstantMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private MPJLambdaWrapper buildQueryWrapper(EmsVibrationInstant bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsVibrationInstant.class) + .selectAll(EmsVibrationInstant.class) + .eq(bo.getObjId() != null, EmsVibrationInstant::getObjId, bo.getObjId()) + .eq(bo.getCollectTime() != null, EmsVibrationInstant::getCollectTime, bo.getCollectTime()) + .eq(StringUtils.isNotBlank(bo.getSensorId()), EmsVibrationInstant::getSensorId, bo.getSensorId()) + .eq(bo.getSpeed() != null, EmsVibrationInstant::getSpeed, bo.getSpeed()) + .eq(bo.getDisplacement() != null, EmsVibrationInstant::getDisplacement, bo.getDisplacement()) + .eq(bo.getAcceleration() != null, EmsVibrationInstant::getAcceleration, bo.getAcceleration()) + .eq(bo.getTemperature() != null, EmsVibrationInstant::getTemperature, bo.getTemperature()) + .eq(bo.getRecodeTime() != null, EmsVibrationInstant::getRecodeTime, bo.getRecodeTime()) + .orderByDesc(EmsVibrationInstant::getCreateTime); + return lqw; + } + + /** * 查询震动实时数据 * 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 56bff6b5..f8355fbd 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 @@ -1,12 +1,22 @@ 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; import org.dromara.ems.record.service.ITWTempertureDataService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 物联网实时数据Service业务层处理 @@ -19,7 +29,43 @@ import java.util.List; public class TWTempertureDataServiceImpl implements ITWTempertureDataService { - private final TWTempertureDataMapper tWTempertureDataMapper; + private final TWTempertureDataMapper TWTempertureDataMapper; + + /** + * 分页查询动力环境数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 动力环境数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,TWTempertureData bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = TWTempertureDataMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private MPJLambdaWrapper buildQueryWrapper(TWTempertureData bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(TWTempertureData.class) + .selectAll(TWTempertureData.class) + .eq(bo.getObjid() != null, TWTempertureData::getObjid, bo.getObjid()) + .eq(StringUtils.isNotBlank(bo.getMonitorId()), TWTempertureData::getMonitorId, bo.getMonitorId()) + .eq(bo.getCollectTime() != null, TWTempertureData::getCollectTime, bo.getCollectTime()) + .eq(bo.getTempreture() != null, TWTempertureData::getTempreture, bo.getTempreture()) + .eq(bo.getHumidity() != null, TWTempertureData::getHumidity, bo.getHumidity()) + .eq(bo.getIlluminance() != null, TWTempertureData::getIlluminance, bo.getIlluminance()) + .eq(bo.getNoise() != null, TWTempertureData::getNoise, bo.getNoise()) + .eq(bo.getConcentration() != null, TWTempertureData::getConcentration, bo.getConcentration()) + .eq(bo.getRecodeTime() != null, TWTempertureData::getRecodeTime, bo.getRecodeTime()) + .eq(bo.getAlarmType() != null, TWTempertureData::getAlarmType, bo.getAlarmType()) + .eq(bo.getConfirmPersonID() != null, TWTempertureData::getConfirmPersonID, bo.getConfirmPersonID()) + .eq(bo.getConfirmTime() != null, TWTempertureData::getConfirmTime, bo.getConfirmTime()) + .eq(bo.getConfirmFlag() != null, TWTempertureData::getConfirmFlag, bo.getConfirmFlag()) + .orderByDesc(TWTempertureData::getCreateTime); + return lqw; + } /** * 查询物联网实时数据 @@ -30,43 +76,43 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService @Override public TWTempertureData selectTWTempertureDataByObjid(Long objid) { - return tWTempertureDataMapper.selectTWTempertureDataByObjid(objid); + return TWTempertureDataMapper.selectTWTempertureDataByObjid(objid); } /** * 查询物联网实时数据列表 * - * @param tWTempertureData 物联网实时数据 + * @param TWTempertureData 物联网实时数据 * @return 物联网实时数据 */ @Override - public List selectTWTempertureDataList(TWTempertureData tWTempertureData) + public List selectTWTempertureDataList(TWTempertureData TWTempertureData) { - return tWTempertureDataMapper.selectTWTempertureDataList(tWTempertureData); + return TWTempertureDataMapper.selectTWTempertureDataList(TWTempertureData); } /** * 新增物联网实时数据 * - * @param tWTempertureData 物联网实时数据 + * @param TWTempertureData 物联网实时数据 * @return 结果 */ @Override - public int insertTWTempertureData(TWTempertureData tWTempertureData) + public int insertTWTempertureData(TWTempertureData TWTempertureData) { - return tWTempertureDataMapper.insertTWTempertureData(tWTempertureData); + return TWTempertureDataMapper.insertTWTempertureData(TWTempertureData); } /** * 修改物联网实时数据 * - * @param tWTempertureData 物联网实时数据 + * @param TWTempertureData 物联网实时数据 * @return 结果 */ @Override - public int updateTWTempertureData(TWTempertureData tWTempertureData) + public int updateTWTempertureData(TWTempertureData TWTempertureData) { - return tWTempertureDataMapper.updateTWTempertureData(tWTempertureData); + return TWTempertureDataMapper.updateTWTempertureData(TWTempertureData); } /** @@ -78,7 +124,7 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService @Override public int deleteTWTempertureDataByObjids(Long[] objids) { - return tWTempertureDataMapper.deleteTWTempertureDataByObjids(objids); + return TWTempertureDataMapper.deleteTWTempertureDataByObjids(objids); } /** @@ -90,17 +136,17 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService @Override public int deleteTWTempertureDataByObjid(Long objid) { - return tWTempertureDataMapper.deleteTWTempertureDataByObjid(objid); + return TWTempertureDataMapper.deleteTWTempertureDataByObjid(objid); } /** * 查询实时物联网数据 - * @param tWTempertureData + * @param TWTempertureData * @return */ @Override - public List selectIotInstantList(TWTempertureData tWTempertureData) { - return tWTempertureDataMapper.selectIotInstantList(tWTempertureData); + public List selectIotInstantList(TWTempertureData TWTempertureData) { + return TWTempertureDataMapper.selectIotInstantList(TWTempertureData); } /** @@ -110,6 +156,6 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService */ @Override public TWTempertureData selectIotInstantMinitoringData(String monitorId) { - return tWTempertureDataMapper.selectIotInstantMinitoringData(monitorId); + return TWTempertureDataMapper.selectIotInstantMinitoringData(monitorId); } } diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportController.java index d89ff427..9c9062ab 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/controller/EmsReportController.java @@ -27,7 +27,7 @@ import java.util.Map; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/report") +@RequestMapping("/report") public class EmsReportController extends BaseController { 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 0e925972..10585172 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 @@ -26,7 +26,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/report/reportPointDnb") +@RequestMapping("/report/reportPointDnb") public class EmsReportPointDnbController extends BaseController { private final IEmsReportPointDnbService emsReportPointDnbService; @@ -37,9 +37,8 @@ public class EmsReportPointDnbController extends BaseController { @SaCheckPermission("ems:report:reportPointDnb:list") @GetMapping("/list") public TableDataInfo list(EmsReportPointDnb emsReportPointDnb, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsReportPointDnbService.selectEmsReportPointDnbList(emsReportPointDnb); - return TableDataInfo.build(list); + TableDataInfo list = emsReportPointDnbService.queryPageList(pageQuery,emsReportPointDnb); + return list; } /** 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 03355b01..00c6e342 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 @@ -26,7 +26,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/report/reportPointSteam") +@RequestMapping("/report/reportPointSteam") public class EmsReportPointSteamController extends BaseController { private final IEmsReportPointSteamService emsReportPointSteamService; @@ -37,9 +37,8 @@ public class EmsReportPointSteamController extends BaseController { @SaCheckPermission("ems:report:reportPointSteam:list") @GetMapping("/list") public TableDataInfo list(EmsReportPointSteam emsReportPointSteam, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsReportPointSteamService.selectEmsReportPointSteamList(emsReportPointSteam); - return TableDataInfo.build(list); + TableDataInfo list = emsReportPointSteamService.queryPageList(pageQuery,emsReportPointSteam); + return list; } /** 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 a39ca044..25cde152 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,6 +7,8 @@ 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; @@ -26,7 +28,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/ems/report/reportPointWater") +@RequestMapping("/report/reportPointWater") public class EmsReportPointWaterController extends BaseController { private final IEmsReportPointWaterService emsReportPointWaterService; @@ -37,9 +39,8 @@ public class EmsReportPointWaterController extends BaseController { @SaCheckPermission("ems:report:reportPointWater:list") @GetMapping("/list") public TableDataInfo list(EmsReportPointWater emsReportPointWater, PageQuery pageQuery) { - // PageUtils.startPage(pageQuery); - List list = emsReportPointWaterService.selectEmsReportPointWaterList(emsReportPointWater); - return TableDataInfo.build(list); + TableDataInfo list = emsReportPointWaterService.queryPageList(pageQuery,emsReportPointWater); + return list; } /** 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 c1ec51c9..b71b2ec1 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 @@ -1,25 +1,38 @@ package org.dromara.ems.report.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; import java.util.Date; /** * 电整点数据对象 ems_report_point_dnb * - * @author Yinq - * @date 2024-05-22 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_report_point_dnb") public class EmsReportPointDnb extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; /** * 主键标识 */ + @TableId(value = "obj_id", type = IdType.AUTO) private Long objId; /** 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 1d371c73..57d032b8 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 @@ -1,25 +1,34 @@ package org.dromara.ems.report.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; +import java.io.Serial; import java.math.BigDecimal; import java.util.Date; /** * 蒸汽整点数据对象 ems_report_point_steam * - * @author Yinq - * @date 2024-06-11 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_report_point_steam") public class EmsReportPointSteam extends BaseEntity { + + @Serial private static final long serialVersionUID = 1L; /** * 主键标识 */ + private Long objId; /** @@ -73,95 +82,4 @@ public class EmsReportPointSteam extends BaseEntity { private String monitorName; - public void setObjId(Long objId) { - this.objId = objId; - } - - public Long getObjId() { - return objId; - } - - public void setMonitorCode(String monitorCode) { - this.monitorCode = monitorCode; - } - - public String getMonitorCode() { - return monitorCode; - } - - public void setInstrumentValue(BigDecimal instrumentValue) { - this.instrumentValue = instrumentValue; - } - - public BigDecimal getInstrumentValue() { - return instrumentValue; - } - - public void setExpend(BigDecimal expend) { - this.expend = expend; - } - - public BigDecimal getExpend() { - return expend; - } - - public void setRecordTime(Date recordTime) { - this.recordTime = recordTime; - } - - public Date getRecordTime() { - return recordTime; - } - - public void setBeginTime(Date beginTime) { - this.beginTime = beginTime; - } - - public Date getBeginTime() { - return beginTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setUpdateFlag(String updateFlag) { - this.updateFlag = updateFlag; - } - - public String getUpdateFlag() { - return updateFlag; - } - - - public String getMonitorName() { - return monitorName; - } - - public void setMonitorName(String monitorName) { - this.monitorName = monitorName; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("objId", getObjId()) - .append("monitorCode", getMonitorCode()) - .append("instrumentValue", getInstrumentValue()) - .append("expend", getExpend()) - .append("recordTime", getRecordTime()) - .append("beginTime", getBeginTime()) - .append("endTime", getEndTime()) - .append("updateFlag", getUpdateFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("monitorName", getMonitorName()) - .toString(); - } } 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 77f3d932..be652803 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 @@ -1,19 +1,29 @@ package org.dromara.ems.report.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +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; /** * 水整点数据对象 ems_report_point_water * - * @author Yinq - * @date 2024-05-22 + * @author zch + * @date 2025-10-22 */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ems_report_point_water") public class EmsReportPointWater extends BaseEntity { + + @Serial 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 new file mode 100644 index 00000000..6df33e87 --- /dev/null +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/domain/PeaksValleysConsumptionReport.java @@ -0,0 +1,112 @@ +package org.dromara.ems.report.domain; + + +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.math.BigDecimal; + + +/** + * 峰平谷耗量报表 + * + * @author Yinq + * @date 2023-10-12 + */ +public class PeaksValleysConsumptionReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 统计单元编号 + */ + //@ExcelProperty(value = "统计单元编号") + private String workUnitCode; + + /** + * 统计单元名称 + */ + //@ExcelProperty(value = "统计单元名称") + private String workUnitName; + + /** + * 统计日期 + */ + //@ExcelProperty(value = "统计日期") + private String pointTime; + + /** + * 分时类型 + */ + //@ExcelProperty(value = "分时类型") + private String priceType; + + /** + * 耗量(kwh) + */ + //@ExcelProperty(value = "耗量(kwh)") + private BigDecimal expend; + + /** + * 价格 + */ + //@ExcelProperty(value = "价格") + private BigDecimal price; + + public String getWorkUnitCode() { + return workUnitCode; + } + + public void setWorkUnitCode(String workUnitCode) { + this.workUnitCode = workUnitCode; + } + + public String getWorkUnitName() { + return workUnitName; + } + + public void setWorkUnitName(String workUnitName) { + this.workUnitName = workUnitName; + } + + public String getPointTime() { + return pointTime; + } + + public void setPointTime(String pointTime) { + this.pointTime = pointTime; + } + + public String getPriceType() { + return priceType; + } + + public void setPriceType(String priceType) { + this.priceType = priceType; + } + + public BigDecimal getExpend() { + return expend; + } + + public void setExpend(BigDecimal expend) { + this.expend = expend; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + @Override + public String toString() { + return "PeaksValleysConsumptionReport{" + + "workUnitCode='" + workUnitCode + '\'' + + ", workUnitName='" + workUnitName + '\'' + + ", pointTime='" + pointTime + '\'' + + ", priceType='" + priceType + '\'' + + ", expend=" + expend + + '}'; + } +} diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/mapper/EmsReportMapper.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/mapper/EmsReportMapper.java index 0726e51d..a7162489 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/mapper/EmsReportMapper.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/mapper/EmsReportMapper.java @@ -1,7 +1,6 @@ package org.dromara.ems.report.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.ems.report.domain.EnergyStatisticalReport; import org.dromara.ems.report.domain.PeaksValleysConsumptionReport; @@ -14,7 +13,7 @@ import java.util.Map; * @author Yinq * @date 2024-05-22 */ -public interface EmsReportMapper extends BaseMapperPlus { +public interface EmsReportMapper{ /** * 统计能耗电报表 diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointDnbService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointDnbService.java index 6ff3427d..c1b23951 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointDnbService.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/IEmsReportPointDnbService.java @@ -1,5 +1,7 @@ package org.dromara.ems.report.service; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.report.domain.EmsReportPointDnb; import java.util.List; @@ -11,6 +13,17 @@ import java.util.List; * @date 2024-05-22 */ public interface IEmsReportPointDnbService { + + /** + * 分页查询电整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 电整点数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointDnb bo) ; + + /** * 查询电整点数据 * 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 ee08fda1..e24c2895 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,17 @@ import java.util.List; * @date 2024-06-11 */ public interface IEmsReportPointSteamService { + + + /** + * 分页查询蒸汽整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 蒸汽整点数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointSteam bo); + /** * 查询蒸汽整点数据 * 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 08ecfac0..776f7c25 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,5 +1,9 @@ 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; import java.util.List; @@ -11,6 +15,16 @@ import java.util.List; * @date 2024-05-22 */ public interface IEmsReportPointWaterService { + + /** + * 分页查询水整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水整点数据分页列表 + */ + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointWater bo); + /** * 查询水整点数据 * 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 e24b5776..35651644 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,22 @@ package org.dromara.ems.report.service.impl; +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.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; import org.dromara.ems.report.service.IEmsReportPointDnbService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 电整点数据Service业务层处理 @@ -22,6 +30,40 @@ public class EmsReportPointDnbServiceImpl implements IEmsReportPointDnbService { private final EmsReportPointDnbMapper emsReportPointDnbMapper; + + /** + * 分页查询电整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 电整点数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointDnb bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsReportPointDnbMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsReportPointDnb bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsReportPointDnb.class) + .selectAll(EmsReportPointDnb.class) + .eq(bo.getObjId() != null, EmsReportPointDnb::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointDnb::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getInstrumentValue() != null, EmsReportPointDnb::getInstrumentValue, bo.getInstrumentValue()) + .eq(bo.getExpend() != null, EmsReportPointDnb::getExpend, bo.getExpend()) + .eq(bo.getRecordTime() != null, EmsReportPointDnb::getRecordTime, bo.getRecordTime()) + .eq(bo.getBeginTime() != null, EmsReportPointDnb::getBeginTime, bo.getBeginTime()) + .eq(bo.getEndTime() != null, EmsReportPointDnb::getEndTime, bo.getEndTime()) + .eq(StringUtils.isNotBlank(bo.getUpdateFlag()), EmsReportPointDnb::getUpdateFlag, bo.getUpdateFlag()) + .orderByDesc(EmsReportPointDnb::getCreateTime); + return lqw; + } + + /** * 查询电整点数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointSteamServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointSteamServiceImpl.java index a357c03c..3ec64b25 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointSteamServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointSteamServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.report.domain.EmsReportPointSteam; import org.dromara.ems.report.mapper.EmsReportPointSteamMapper; import org.dromara.ems.report.service.IEmsReportPointSteamService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 蒸汽整点数据Service业务层处理 @@ -23,6 +30,40 @@ public class EmsReportPointSteamServiceImpl implements IEmsReportPointSteamServi private final EmsReportPointSteamMapper emsReportPointSteamMapper; + + /** + * 分页查询蒸汽整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 蒸汽整点数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointSteam bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsReportPointSteamMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsReportPointSteam bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsReportPointSteam.class) + .selectAll(EmsReportPointSteam.class) + .eq(bo.getObjId() != null, EmsReportPointSteam::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointSteam::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getInstrumentValue() != null, EmsReportPointSteam::getInstrumentValue, bo.getInstrumentValue()) + .eq(bo.getExpend() != null, EmsReportPointSteam::getExpend, bo.getExpend()) + .eq(bo.getRecordTime() != null, EmsReportPointSteam::getRecordTime, bo.getRecordTime()) + .eq(bo.getBeginTime() != null, EmsReportPointSteam::getBeginTime, bo.getBeginTime()) + .eq(bo.getEndTime() != null, EmsReportPointSteam::getEndTime, bo.getEndTime()) + .eq(StringUtils.isNotBlank(bo.getUpdateFlag()), EmsReportPointSteam::getUpdateFlag, bo.getUpdateFlag()) + .orderByDesc(EmsReportPointSteam::getCreateTime); + return lqw; + } + + /** * 查询蒸汽整点数据 * diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointWaterServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointWaterServiceImpl.java index 9df6ba50..1b1042af 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointWaterServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/report/service/impl/EmsReportPointWaterServiceImpl.java @@ -1,14 +1,21 @@ 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 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 org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.ems.report.domain.EmsReportPointWater; import org.dromara.ems.report.mapper.EmsReportPointWaterMapper; import org.dromara.ems.report.service.IEmsReportPointWaterService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 水整点数据Service业务层处理 @@ -22,6 +29,40 @@ public class EmsReportPointWaterServiceImpl implements IEmsReportPointWaterServi private final EmsReportPointWaterMapper emsReportPointWaterMapper; + + /** + * 分页查询水整点数据列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 水整点数据分页列表 + */ + @Override + public TableDataInfo queryPageList(PageQuery pageQuery ,EmsReportPointWater bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = emsReportPointWaterMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + + private MPJLambdaWrapper buildQueryWrapper(EmsReportPointWater bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsReportPointWater.class) + .selectAll(EmsReportPointWater.class) + .eq(bo.getObjId() != null, EmsReportPointWater::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsReportPointWater::getMonitorCode, bo.getMonitorCode()) + .eq(bo.getInstrumentValue() != null, EmsReportPointWater::getInstrumentValue, bo.getInstrumentValue()) + .eq(bo.getExpend() != null, EmsReportPointWater::getExpend, bo.getExpend()) + .eq(bo.getRecordTime() != null, EmsReportPointWater::getRecordTime, bo.getRecordTime()) + .eq(bo.getBeginTime() != null, EmsReportPointWater::getBeginTime, bo.getBeginTime()) + .eq(bo.getEndTime() != null, EmsReportPointWater::getEndTime, bo.getEndTime()) + .eq(StringUtils.isNotBlank(bo.getUpdateFlag()), EmsReportPointWater::getUpdateFlag, bo.getUpdateFlag()) + .orderByDesc(EmsReportPointWater::getCreateTime); + return lqw; + } + + /** * 查询水整点数据 * diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 4e184f8a..397905a2 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -24,6 +24,7 @@ hwmom-tsdb hwmom-workflow hwmom-ai + hwmom-ems