From c3e0779b053191efd55c4d62c77f696ba71e469f Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Tue, 27 Jan 2026 10:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E6=8F=90=E9=86=92=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/device/pojo/vo/MeteringRemindSetVO.java |  7 +++++++
 .../service/IMeteringRemindSetService.java       |  2 +-
 .../impl/MeteringRemindSetServiceImpl.java       | 16 ++++++++++++++--
 .../device/wrapper/MeteringRemindSetWrapper.java |  3 ++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeteringRemindSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeteringRemindSetVO.java
index e558239c..8fced2ba 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeteringRemindSetVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeteringRemindSetVO.java
@@ -2,6 +2,7 @@ package org.springblade.desk.device.pojo.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springblade.desk.device.pojo.entity.MeteringRemindSetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,4 +25,10 @@ public class MeteringRemindSetVO extends MeteringRemindSetEntity {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
+
+    @Schema(description = "类别名称")
+    String categoryName;
+
+    @Schema(description = "颜色名称")
+    String colorName;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeteringRemindSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeteringRemindSetService.java
index 3c45a154..a27e6168 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeteringRemindSetService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeteringRemindSetService.java
@@ -23,7 +23,7 @@ public interface IMeteringRemindSetService extends BaseService<MeteringRemindSet
      * @param mesMeteringRemindSet 查询参数
      * @return IPage<MeteringRemindSetVO>
      */
-    IPage<MeteringRemindSetEntity> selectMeteringRemindSetPage(IPage<MeteringRemindSetEntity> page, MeteringRemindSetVO mesMeteringRemindSet);
+    IPage<MeteringRemindSetEntity> selectMeteringRemindSetPage(IPage<MeteringRemindSetEntity> page, MeteringRemindSetEntity mesMeteringRemindSet);
 
 
     /**
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeteringRemindSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeteringRemindSetServiceImpl.java
index 029c0f08..94354485 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeteringRemindSetServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeteringRemindSetServiceImpl.java
@@ -1,5 +1,7 @@
 package org.springblade.desk.device.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.desk.device.pojo.entity.MeteringRemindSetEntity;
 import org.springblade.desk.device.pojo.excel.MeteringRemindSetExcel;
 import org.springblade.desk.device.pojo.vo.MeteringRemindSetVO;
@@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 计量提醒设置 服务实现类
@@ -22,8 +25,17 @@ import java.util.List;
 public class MeteringRemindSetServiceImpl extends BaseServiceImpl<MeteringRemindSetMapper, MeteringRemindSetEntity> implements IMeteringRemindSetService {
 
     @Override
-    public IPage<MeteringRemindSetEntity> selectMeteringRemindSetPage(IPage<MeteringRemindSetEntity> page, MeteringRemindSetVO meteringRemindSet) {
-        return page.setRecords(baseMapper.selectMeteringRemindSetPage(page, meteringRemindSet));
+    public IPage<MeteringRemindSetEntity> selectMeteringRemindSetPage(IPage<MeteringRemindSetEntity> page, MeteringRemindSetEntity meteringRemindSet) {
+        // 1. 创建条件构造器
+        LambdaQueryWrapper<MeteringRemindSetEntity> wrapper = Wrappers.<MeteringRemindSetEntity>lambdaQuery();
+
+        // 2. 动态添加条件（核心！）
+        // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
+        wrapper.eq(Objects.nonNull(meteringRemindSet.getCategory()), MeteringRemindSetEntity::getCategory, meteringRemindSet.getCategory())
+                .eq(Objects.nonNull(meteringRemindSet.getColor()), MeteringRemindSetEntity::getColor, meteringRemindSet.getColor());
+
+        // 3. 执行分页查询
+        return baseMapper.selectPage(page, wrapper);
     }
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeteringRemindSetWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeteringRemindSetWrapper.java
index c79b0e72..f6ad5e84 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeteringRemindSetWrapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeteringRemindSetWrapper.java
@@ -27,7 +27,8 @@ public class MeteringRemindSetWrapper extends BaseEntityWrapper<MeteringRemindSe
         //User updateUser = UserCache.getUser(meteringRemindSet.getUpdateUser());
         //meteringRemindSetVO.setCreateUserName(createUser.getName());
         //meteringRemindSetVO.setUpdateUserName(updateUser.getName());
-
+        meteringRemindSetVO.setCategoryName(meteringRemindSet.getCategoryText());
+        meteringRemindSetVO.setColorName(meteringRemindSet.getColorText());
         return meteringRemindSetVO;
     }