refactor(ems):重构ems模块分页查询功能

-为多个基础实体类添加 Lombok 注解简化代码
- 引入 MyBatis-Plus 注解优化数据库映射
- 统一调整 Controller 层请求路径前缀
- 实现基于 MPJLambdaWrapper 的分页查询方法
- 构建通用查询条件构造器支持动态筛选
- 移除冗余的 remark 字段序列化逻辑
hwmom-htk
zangch@mesnac.com 5 months ago
parent 864edab0ea
commit 502088b009

@ -0,0 +1,222 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hwmom-ems</artifactId>
<description>
hwmom-ems
</description>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-nacos</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sentinel</artifactId>
</dependency>
<!-- RuoYi Common Log -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dict</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-seata</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<!-- RuoYi Api System -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-resource</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.mysql</groupId>-->
<!-- <artifactId>mysql-connector-j</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>hwmom-api-pda</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.microsoft.sqlserver</groupId>-->
<!-- <artifactId>mssql-jdbc</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.github.jsqlparser</groupId>-->
<!-- <artifactId>jsqlparser</artifactId>-->
<!-- <version>1.4</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>hwmom-api-workflow</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
<exclusions>
<!-- 排除消息总线依赖QMS模块不需要,否则会一直引入本地的Kafka -->
<exclusion>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bus</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--通过 Dubbo 远程调用 workflow 服务的 completeTask 方法时。
原因分析:该调用是在一个由 CompletableFuture.runAsync() 创建的异步线程中执行的。在 ruoyi-cloud-plus (以及类似的微服务架构) 中,用户认证信息(如 Sa-Token通常是存储在 ThreadLocal 变量中的,它与当前请求线程绑定。当您创建一个新的子线程时,父线程的 ThreadLocal 变量默认不会传递给子线程。因此在异步线程中Sa-Token 的上下文丢失,导致 StpUtil.getTokenValue() 等方法无法获取到 token当 Dubbo 客户端过滤器尝试将 token 放入 RPC 上下文时失败,或者说,在 workflow 服务端Sa-Token 的服务端过滤器无法从 RPC 上下文中获取到 token最终导致依赖用户身份认证的 FlwTaskServiceImpl.completeTask 方法抛出 "未能读取到有效 token" 的业务异常。
解决方案ruoyi-cloud-plus 框架集成了阿里巴巴的 TransmittableThreadLocal (TTL) 库来解决此问题。TTL可以实现父子线程之间的 ThreadLocal 数据传递。为了让 CompletableFuture 与 TTL 协同工作,需要将提交给它的 Runnable 或 Callable 任务用 TtlRunnable 或 TtlCallable 进行包装。这样在任务执行前TTL 会捕获父线程的上下文(包括 Sa-Token 的信息),并在子线程中恢复它。-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.4</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
<dependency>
<groupId>net.dreamlu</groupId>
<artifactId>mica-net-utils</artifactId>
<version>1.0.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.dromara.easy-es</groupId>
<artifactId>easy-es-core</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>hwmom-common-mom</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${revision}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <!-- 确保使用兼容的插件版本 -->
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

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

@ -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("(♥◠‿◠)ノ゙ 能源模块启动成功 ლ(´ڡ`ლ)゙ ");
}
}

@ -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<EmsBaseCollectDeviceInfo> list = emsBaseCollectDeviceInfoService.selectEmsBaseCollectDeviceInfoList(emsBaseCollectDeviceInfo);
return TableDataInfo.build(list);
return emsBaseCollectDeviceInfoService.queryPageList( pageQuery ,emsBaseCollectDeviceInfo);
}
/**

@ -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<EmsBaseEnergyPrice> list = emsBaseEnergyPriceService.selectEmsBaseEnergyPriceList(emsBaseEnergyPrice);
return TableDataInfo.build(list);
return emsBaseEnergyPriceService.queryPageList( pageQuery ,emsBaseEnergyPrice);
}
/**

@ -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<EmsBaseEnergyType> list = emsBaseEnergyTypeService.selectEmsBaseEnergyTypeList(emsBaseEnergyType);
return TableDataInfo.build(list);
return emsBaseEnergyTypeService.queryPageList( pageQuery ,emsBaseEnergyType);
}
/**

@ -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<EmsBaseMonitorInfo> list = emsBaseMonitorInfoService.selectEmsBaseMonitorInfoList(emsBaseMonitorInfo);
return TableDataInfo.build(list);
TableDataInfo<EmsBaseMonitorInfo> list = emsBaseMonitorInfoService.queryPageList( pageQuery ,emsBaseMonitorInfo);
return list;
}
/**

@ -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<EmsBaseMonitorThreshold> list = emsBaseMonitorThresholdService.selectEmsBaseMonitorThresholdList(emsBaseMonitorThreshold);
return TableDataInfo.build(list);
TableDataInfo<EmsBaseMonitorThreshold> list = emsBaseMonitorThresholdService.queryPageList( pageQuery ,emsBaseMonitorThreshold);
return list;
}
/**

@ -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<EmsBaseMonitorWorkUnit> list = emsBaseMonitorWorkUnitService.selectEmsBaseMonitorWorkUnitList(emsBaseMonitorWorkUnit);
return TableDataInfo.build(list);
TableDataInfo<EmsBaseMonitorWorkUnit> list = emsBaseMonitorWorkUnitService.queryPageList( pageQuery ,emsBaseMonitorWorkUnit);
return list;
}
/**

@ -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<EmsBaseSharePrice> list = emsBaseSharePriceService.selectEmsBaseSharePriceList(emsBaseSharePrice);
return TableDataInfo.build(list);
TableDataInfo<EmsBaseSharePrice> list = emsBaseSharePriceService.queryPageList( pageQuery ,emsBaseSharePrice);
return list;
}
/**

@ -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<EmsBaseWorkUnit> list = emsBaseWorkUnitService.selectEmsBaseWorkUnitList(emsBaseWorkUnit);
return TableDataInfo.build(list);
TableDataInfo<EmsBaseWorkUnit> list = emsBaseWorkUnitService.queryPageList( pageQuery ,emsBaseWorkUnit);
return list;
}
/**

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

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

@ -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())

@ -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;
/** 计量设备编号 */

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

@ -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())

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

@ -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;
/** 统计单元编号 */

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

@ -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<EmsBaseCollectDeviceInfo> queryPageList(PageQuery pageQuery ,EmsBaseCollectDeviceInfo bo);
/**
*
*

@ -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<EmsBaseEnergyPrice> queryPageList(PageQuery pageQuery ,EmsBaseEnergyPrice bo);
/**
*
*

@ -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<EmsBaseEnergyType> queryPageList(PageQuery pageQuery ,EmsBaseEnergyType bo);
/**
*
*

@ -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<EmsBaseMonitorInfo> queryPageList(PageQuery pageQuery ,EmsBaseMonitorInfo bo);
/**
*
*

@ -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<EmsBaseMonitorThreshold> queryPageList(PageQuery pageQuery ,EmsBaseMonitorThreshold bo);
/**
*
*

@ -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<EmsBaseMonitorWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseMonitorWorkUnit bo);
/**
*
*

@ -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<EmsBaseSharePrice> queryPageList(PageQuery pageQuery ,EmsBaseSharePrice bo);
/**
*
*

@ -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<EmsBaseWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo);
/**
*
*

@ -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<EmsBaseCollectDeviceInfo> queryPageList(PageQuery pageQuery ,EmsBaseCollectDeviceInfo bo) {
MPJLambdaWrapper<EmsBaseCollectDeviceInfo> lqw = buildQueryWrapper(bo);
Page<EmsBaseCollectDeviceInfo> result = emsBaseCollectDeviceInfoMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseCollectDeviceInfo> buildQueryWrapper(EmsBaseCollectDeviceInfo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseCollectDeviceInfo> 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;
}
}

@ -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<EmsBaseEnergyPrice> queryPageList(PageQuery pageQuery ,EmsBaseEnergyPrice bo) {
MPJLambdaWrapper<EmsBaseEnergyPrice> lqw = buildQueryWrapper(bo);
Page<EmsBaseEnergyPrice> result = emsBaseEnergyPriceMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseEnergyPrice> buildQueryWrapper(EmsBaseEnergyPrice bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseEnergyPrice> 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;
}
}

@ -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<EmsBaseEnergyType> queryPageList(PageQuery pageQuery ,EmsBaseEnergyType bo) {
MPJLambdaWrapper<EmsBaseEnergyType> lqw = buildQueryWrapper(bo);
Page<EmsBaseEnergyType> result = emsBaseEnergyTypeMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseEnergyType> buildQueryWrapper(EmsBaseEnergyType bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseEnergyType> 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;
}
/**
*
*

@ -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<EmsBaseMonitorInfo> queryPageList(PageQuery pageQuery ,EmsBaseMonitorInfo bo) {
MPJLambdaWrapper<EmsBaseMonitorInfo> lqw = buildQueryWrapper(bo);
Page<EmsBaseMonitorInfo> result = emsBaseMonitorInfoMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseMonitorInfo> buildQueryWrapper(EmsBaseMonitorInfo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseMonitorInfo> 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;
}
/**
*
*

@ -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<EmsBaseMonitorThreshold> queryPageList(PageQuery pageQuery ,EmsBaseMonitorThreshold bo) {
MPJLambdaWrapper<EmsBaseMonitorThreshold> lqw = buildQueryWrapper(bo);
Page<EmsBaseMonitorThreshold> result = emsBaseMonitorThresholdMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseMonitorThreshold> buildQueryWrapper(EmsBaseMonitorThreshold bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseMonitorThreshold> 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;
}
/**
*
*

@ -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<EmsBaseMonitorWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseMonitorWorkUnit bo) {
MPJLambdaWrapper<EmsBaseMonitorWorkUnit> lqw = buildQueryWrapper(bo);
Page<EmsBaseMonitorWorkUnit> result = emsBaseMonitorWorkUnitMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseMonitorWorkUnit> buildQueryWrapper(EmsBaseMonitorWorkUnit bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseMonitorWorkUnit> 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;
}
/**
*
*

@ -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<EmsBaseSharePrice> queryPageList(PageQuery pageQuery ,EmsBaseSharePrice bo) {
MPJLambdaWrapper<EmsBaseSharePrice> lqw = buildQueryWrapper(bo);
Page<EmsBaseSharePrice> result = emsBaseSharePriceMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseSharePrice> buildQueryWrapper(EmsBaseSharePrice bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseSharePrice> 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;
}
/**
*
*

@ -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<EmsBaseWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo) {
MPJLambdaWrapper<EmsBaseWorkUnit> lqw = buildQueryWrapper(bo);
Page<EmsBaseWorkUnit> result = emsBaseWorkUnitMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsBaseWorkUnit> buildQueryWrapper(EmsBaseWorkUnit bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsBaseWorkUnit> 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;
}
/**
*
*

@ -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<EmsRecordAlarmData> list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData);
return TableDataInfo.build(list);
TableDataInfo<EmsRecordAlarmData> 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<EmsRecordAlarmData> list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData);
List<EmsRecordAlarmData> list = emsRecordAlarmDataService.selectEmsRecordAlarmDataList(emsRecordAlarmData);
//ExcelUtil<EmsRecordAlarmData> util = new //ExcelUtil<>(EmsRecordAlarmData.class);
ExcelUtil.exportExcelResponse(response, list, "报警实时数据数据",EmsRecordAlarmData.class);
}

@ -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<EmsRecordAlarmRule> list = emsRecordAlarmRuleService.selectEmsRecordAlarmRuleList(emsRecordAlarmRule);
return TableDataInfo.build(list);
TableDataInfo<EmsRecordAlarmRule> list = emsRecordAlarmRuleService.queryPageList(pageQuery,emsRecordAlarmRule);
return list;
}
/**

@ -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<EmsRecordDnbInstant> list = emsRecordDnbInstantService.selectEmsRecordDnbInstantList(emsRecordDnbInstant);
return TableDataInfo.build(list);
TableDataInfo<EmsRecordDnbInstant> list = emsRecordDnbInstantService.queryPageList(pageQuery,emsRecordDnbInstant);
return list;
}
/**

@ -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<EmsRecordSteamInstant> list = emsRecordSteamInstantService
.selectEmsRecordSteamInstantList(emsRecordSteamInstant);
return TableDataInfo.build(list);
TableDataInfo<EmsRecordSteamInstant> 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<EmsRecordSteamInstant> list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant);
List<EmsRecordSteamInstant> list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant);
//ExcelUtil<EmsRecordSteamInstant> 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<EmsRecordSteamInstant> list = emsRecordSteamInstantService
List<EmsRecordSteamInstant> 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<EmsRecordSteamInstant> list = emsRecordSteamInstantService
List<EmsRecordSteamInstant> list = emsRecordSteamInstantService
.selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant);
return R.ok(list);
}

@ -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<EmsRecordWaterInstant> list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant);
return TableDataInfo.build(list);
TableDataInfo<EmsRecordWaterInstant> 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<EmsRecordWaterInstant> list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant);
List<EmsRecordWaterInstant> list = emsRecordWaterInstantService.selectEmsRecordWaterInstantList(emsRecordWaterInstant);
//ExcelUtil<EmsRecordWaterInstant> util = new ExcelUtil<>(EmsRecordWaterInstant.class);
ExcelUtil.exportExcelResponse(response, list, "水实时数据数据",EmsRecordWaterInstant.class);
}

@ -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<EmsVibrationInstant> list = emsVibrationInstantService.selectEmsVibrationInstantList(emsVibrationInstant);
return TableDataInfo.build(list);
TableDataInfo<EmsVibrationInstant> list = emsVibrationInstantService.queryPageList(emsVibrationInstant, pageQuery);
return list;
}
/**

@ -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<TWTempertureData> list = tWTempertureDataService.selectTWTempertureDataList(tWTempertureData);
return TableDataInfo.build(list);
return tWTempertureDataService.queryPageList(pageQuery,tWTempertureData);
}
/**

@ -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;
/** 计量设备编号 */

@ -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;
/** 规则编号 */

@ -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;
/** 计量设备编号 */

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

@ -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;
/** 计量设备编号 */

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

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

@ -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<EmsRecordAlarmData> queryPageList(PageQuery pageQuery ,EmsRecordAlarmData bo);
/**
*
*

@ -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<EmsRecordAlarmRule> queryPageList(PageQuery pageQuery ,EmsRecordAlarmRule bo);
/**
*
*

@ -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<EmsRecordDnbInstant> queryPageList(PageQuery pageQuery ,EmsRecordDnbInstant bo);
/**
*
*

@ -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<EmsRecordSteamInstant> queryPageList(PageQuery pageQuery , EmsRecordSteamInstant bo);
/**
*
*

@ -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<EmsRecordWaterInstant> queryPageList(PageQuery pageQuery ,EmsRecordWaterInstant bo);
/**
*
*

@ -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<EmsVibrationInstant> queryPageList(EmsVibrationInstant bo, PageQuery pageQuery);
/**
*
*

@ -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<TWTempertureData> queryPageList(PageQuery pageQuery ,TWTempertureData bo);
/**
*
*

@ -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<EmsRecordAlarmData> queryPageList(PageQuery pageQuery ,EmsRecordAlarmData bo) {
MPJLambdaWrapper<EmsRecordAlarmData> lqw = buildQueryWrapper(bo);
Page<EmsRecordAlarmData> result = emsRecordAlarmDataMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsRecordAlarmData> buildQueryWrapper(EmsRecordAlarmData bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsRecordAlarmData> 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;

@ -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<EmsRecordAlarmRule> queryPageList(PageQuery pageQuery ,EmsRecordAlarmRule bo) {
MPJLambdaWrapper<EmsRecordAlarmRule> lqw = buildQueryWrapper(bo);
Page<EmsRecordAlarmRule> result = emsRecordAlarmRuleMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsRecordAlarmRule> buildQueryWrapper(EmsRecordAlarmRule bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsRecordAlarmRule> 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;
}
/**
*
*

@ -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<EmsRecordDnbInstant> queryPageList(PageQuery pageQuery ,EmsRecordDnbInstant bo) {
MPJLambdaWrapper<EmsRecordDnbInstant> lqw = buildQueryWrapper(bo);
Page<EmsRecordDnbInstant> result = emsRecordDnbInstantMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsRecordDnbInstant> buildQueryWrapper(EmsRecordDnbInstant bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsRecordDnbInstant> 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;
}
/**
*
*

@ -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<EmsRecordSteamInstant> queryPageList(PageQuery pageQuery ,EmsRecordSteamInstant bo) {
MPJLambdaWrapper<EmsRecordSteamInstant> lqw = buildQueryWrapper(bo);
Page<EmsRecordSteamInstant> result = emsRecordSteamInstantMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsRecordSteamInstant> buildQueryWrapper(EmsRecordSteamInstant bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsRecordSteamInstant> 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;
}
/**
*
*

@ -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<EmsRecordWaterInstant> queryPageList(PageQuery pageQuery ,EmsRecordWaterInstant bo) {
MPJLambdaWrapper<EmsRecordWaterInstant> lqw = buildQueryWrapper(bo);
Page<EmsRecordWaterInstant> result = emsRecordWaterInstantMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsRecordWaterInstant> buildQueryWrapper(EmsRecordWaterInstant bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsRecordWaterInstant> 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;
}
/**
*
*

@ -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<EmsVibrationInstant> queryPageList(EmsVibrationInstant bo, PageQuery pageQuery) {
MPJLambdaWrapper<EmsVibrationInstant> lqw = buildQueryWrapper(bo);
Page<EmsVibrationInstant> result = emsVibrationInstantMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsVibrationInstant> buildQueryWrapper(EmsVibrationInstant bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsVibrationInstant> 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;
}
/**
*
*

@ -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<TWTempertureData> queryPageList(PageQuery pageQuery ,TWTempertureData bo) {
MPJLambdaWrapper<TWTempertureData> lqw = buildQueryWrapper(bo);
Page<TWTempertureData> result = TWTempertureDataMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<TWTempertureData> buildQueryWrapper(TWTempertureData bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<TWTempertureData> 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<TWTempertureData> selectTWTempertureDataList(TWTempertureData tWTempertureData)
public List<TWTempertureData> 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<TWTempertureData> selectIotInstantList(TWTempertureData tWTempertureData) {
return tWTempertureDataMapper.selectIotInstantList(tWTempertureData);
public List<TWTempertureData> 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);
}
}

@ -27,7 +27,7 @@ import java.util.Map;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/ems/report")
@RequestMapping("/report")
public class EmsReportController extends BaseController {

@ -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<EmsReportPointDnb> list = emsReportPointDnbService.selectEmsReportPointDnbList(emsReportPointDnb);
return TableDataInfo.build(list);
TableDataInfo<EmsReportPointDnb> list = emsReportPointDnbService.queryPageList(pageQuery,emsReportPointDnb);
return list;
}
/**

@ -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<EmsReportPointSteam> list = emsReportPointSteamService.selectEmsReportPointSteamList(emsReportPointSteam);
return TableDataInfo.build(list);
TableDataInfo<EmsReportPointSteam> list = emsReportPointSteamService.queryPageList(pageQuery,emsReportPointSteam);
return list;
}
/**

@ -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<EmsReportPointWater> list = emsReportPointWaterService.selectEmsReportPointWaterList(emsReportPointWater);
return TableDataInfo.build(list);
TableDataInfo<EmsReportPointWater> list = emsReportPointWaterService.queryPageList(pageQuery,emsReportPointWater);
return list;
}
/**

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

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

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

@ -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 +
'}';
}
}

@ -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<EmsReport, EmsReport> {
public interface EmsReportMapper{
/**
*

@ -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<EmsReportPointDnb> queryPageList(PageQuery pageQuery ,EmsReportPointDnb bo) ;
/**
*
*

@ -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<EmsReportPointSteam> queryPageList(PageQuery pageQuery ,EmsReportPointSteam bo);
/**
*
*

@ -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<EmsReportPointWater> queryPageList(PageQuery pageQuery ,EmsReportPointWater bo);
/**
*
*

@ -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<EmsReportPointDnb> queryPageList(PageQuery pageQuery ,EmsReportPointDnb bo) {
MPJLambdaWrapper<EmsReportPointDnb> lqw = buildQueryWrapper(bo);
Page<EmsReportPointDnb> result = emsReportPointDnbMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsReportPointDnb> buildQueryWrapper(EmsReportPointDnb bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsReportPointDnb> 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;
}
/**
*
*

@ -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<EmsReportPointSteam> queryPageList(PageQuery pageQuery ,EmsReportPointSteam bo) {
MPJLambdaWrapper<EmsReportPointSteam> lqw = buildQueryWrapper(bo);
Page<EmsReportPointSteam> result = emsReportPointSteamMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsReportPointSteam> buildQueryWrapper(EmsReportPointSteam bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsReportPointSteam> 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;
}
/**
*
*

@ -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<EmsReportPointWater> queryPageList(PageQuery pageQuery ,EmsReportPointWater bo) {
MPJLambdaWrapper<EmsReportPointWater> lqw = buildQueryWrapper(bo);
Page<EmsReportPointWater> result = emsReportPointWaterMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private MPJLambdaWrapper<EmsReportPointWater> buildQueryWrapper(EmsReportPointWater bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<EmsReportPointWater> 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;
}
/**
*
*

@ -24,6 +24,7 @@
<module>hwmom-tsdb</module>
<module>hwmom-workflow</module>
<module>hwmom-ai</module>
<module>hwmom-ems</module>
<!-- <module>hwmom-test</module>-->
</modules>

Loading…
Cancel
Save