From 9a46347d03f06ca89e0d12f0dcc10ade753d5b40 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 04 一月 2022 14:10:49 +0800
Subject: [PATCH] 大气数据查询
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
index f6056f4..5cabbbc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -1,7 +1,11 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
+import com.github.pagehelper.PageHelper;
+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.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.domain.AirData;
@@ -41,21 +45,18 @@
}
/**
- * 鏌ヨ鍏ㄩ儴澶ф皵鏁版嵁
- */
- public List<AirDataBo> listAirData() {
- return airDataMapper.listAirData();
- }
-
- /**
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
- public List<AirDataBo> listAirDataByKeyword(String keyword) {
- if (keyword == null || keyword.trim().length() == 0) {
- return listAirData();
- } else {
- return airDataMapper.listAirDataByKeyword(keyword);
+ public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ List<Long> listAirId = baseMapper.listAirId(keyword,clientId);
+ if(CollUtil.isEmpty(listAirId)){
+ return null;
}
+ List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
+ return airDataBos;
+
}
/**
--
Gitblit v1.9.3