From 58b89e49bf6dba960229a94a95d5b9f8821e3f23 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 08 七月 2024 16:34:44 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index b9a7384..5e141e1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -730,16 +730,16 @@
queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
}
if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
- queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType());
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
- queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel());
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDriveType())) {
- queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType());
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
- queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory());
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
@@ -789,7 +789,7 @@
Integer min = mdcEquipmentThreshold.getMinThreshold();
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
- messageDTO.setCategory("棰勮娑堟伅");
+ messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
MdcOverrunAlarm mdcOverrunAlarm = new MdcOverrunAlarm();
@@ -880,16 +880,16 @@
queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
}
if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
- queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType());
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
- queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel());
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDriveType())) {
- queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType());
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
}
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
- queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory());
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
--
Gitblit v1.9.3