From 20cf08efd6f966f53f4dfebafb586b127204415a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 04 一月 2022 14:55:16 +0800
Subject: [PATCH] 大气设备查询
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 69b2386..2bb2a4b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -1,9 +1,14 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
@@ -21,23 +26,19 @@
private final AirEquipmentMapper airEquipmentMapper;
- /**
- * 鏌ヨ鍏ㄩ儴澶ф皵璁惧鏁版嵁
- */
- public List<AirEquipmentBo> listAirEquipment() {
- return airEquipmentMapper.listAirEquipment();
- }
/**
* 妯＄硦鏌ヨ
*/
- public List<AirEquipmentBo> listAirEquipmentByKeyword(String keyword) {
- if (keyword == null || keyword.trim().length() == 0) {
- return listAirEquipment();
- } else {
- return airEquipmentMapper.listAirEquipmentByKeyword(keyword);
+ public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ List<Long> listAirEquipmentId = airEquipmentMapper.listAirEquipmentId(keyword,clientId);
+ if(CollUtil.isEmpty(listAirEquipmentId)){
+ return CollUtil.newArrayList();
}
-
+ List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(listAirEquipmentId);
+ return airEquipmentBos;
}
/**
--
Gitblit v1.9.3