From 0a30812acaa26ebe654340f7e749a6801b63b194 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 16:32:36 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
index 182c5e0..d0bde78 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataNongGengService.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
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.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame;
@@ -92,17 +93,16 @@
}
-
/**
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
- public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword, String type) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Long> listAirId;
if (SecurityUtils.getClientId() == null) {
- listAirId = baseMapper.listAirId(keyword, null);
+ listAirId = baseMapper.listAirId(keyword, null, type);
} else {
- listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
+ listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId(), type);
}
if (CollUtil.isEmpty(listAirId)) {
return CollUtil.newArrayList();
@@ -111,4 +111,20 @@
return airDataBos;
}
+
+ /**
+ * 璁惧鍘嗗彶鏁版嵁
+ *
+ * @param baseConditionVO
+ * @param mac
+ * @return
+ */
+ public List<AirDataNongGengBo> historyData(BaseConditionVO baseConditionVO, String mac) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (mac == null || mac.isEmpty()) {
+ throw new BusinessException("mac涓嶈兘涓虹┖");
+ }
+ List<AirDataNongGengBo> bos = baseMapper.historyData(mac);
+ return bos;
+ }
}
--
Gitblit v1.9.3