From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 95 +++++++++++++++++++++++++++++------------------
1 files changed, 59 insertions(+), 36 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 04c478e..7d5e55a 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,13 +1,20 @@
package com.sandu.ximon.admin.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sandu.common.execption.BusinessException;
+
+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.manager.iot.rrpc.enums.AtmoFunctionCode;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+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;
-import com.sandu.ximon.dao.domain.Monitor;
+import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,41 +22,57 @@
@Service
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
+ private final AirDataMapper airDataMapper;
+ private final AirEquipmentService airEquipmentService;
/**
- * 鏌ヨ鍏ㄩ儴澶ф皵璁惧鏁版嵁
- */
- public List<AirData> listAirData() {
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- List<AirData> list = list(wrapper);
-
- return list;
- }
-
- /**
- * 妯＄硦鏌ヨ
- */
- public List<AirData> listAirDataByKeyword(String keyword) {
-
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- if(keyword != null){
- wrapper.like(AirData::getBelongTo,keyword);
- }
- List<AirData> airDataList = list(wrapper);
- return airDataList;
- }
-
- /**
- * 鍒犻櫎澶ф皵璁惧
+ * 淇濆瓨涓婃姤澶ф皵蹇冭烦鏁版嵁
*
- * @param Id
- * @return
+ * @return 鏄惁鎴愬姛
*/
- public boolean deleteAirData(Long Id) {
- AirData airData = getById(Id);
- if (airData == null) {
- throw new BusinessException("鎵句笉鍒板ぇ姘旇澶�");
- }
- return removeById(Id);
+ public boolean saveReportData(String deviceName, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+
+ AirData airData = new AirData();
+ BeanUtils.copyProperties(heartBeatDataPackage, airData);
+ airData.setDeviceMac(deviceName);
+
+ //灏嗚澶囦俊鎭坊鍔犲埌澶ф皵璁惧琛�
+ AirEquipment airEquipment = new AirEquipment();
+ airEquipment.setId(airData.getId());
+ airEquipment.setMac(airData.getDeviceMac());
+ airEquipment.setCreateTime(airData.getCreateTime());
+ airEquipmentService.addAirEquipment(airEquipment);
+
+ //瀛樼紦瀛�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + deviceName, heartBeatDataPackage, 300L);
+
+ return save(airData);
}
+
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
+ */
+ public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Long> listAirId;
+ if (SecurityUtils.getClientId() == null) {
+ listAirId = baseMapper.listAirId(keyword, null);
+ } else {
+ listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
+ }
+ if (CollUtil.isEmpty(listAirId)) {
+ return CollUtil.newArrayList();
+ }
+ List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
+ return airDataBos;
+
+ }
+
+ /**
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ */
+ public List<String> listAirEquipmentMAC() {
+ return airDataMapper.listAirEquipmentMAC();
+ }
+
}
--
Gitblit v1.9.3