From 3075910e10bb60fa2775afb4dbad8d5dba488abb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 09:56:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 116 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 27 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..bac6106 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,28 @@
package com.sandu.ximon.admin.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.ResUtils;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+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.admin.utils.StringUtil;
+import com.sandu.ximon.dao.bo.AirDataBo;
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.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.AirDataMapper;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -15,41 +30,88 @@
@Service
@AllArgsConstructor
public class AirDataService extends BaseServiceImpl<AirDataMapper, AirData> {
+ private final AirDataMapper airDataMapper;
+ private final AirEquipmentService airEquipmentService;
/**
- * 鏌ヨ鍏ㄩ儴澶ф皵璁惧鏁版嵁
+ * 淇濆瓨涓婃姤澶ф皵蹇冭烦鏁版嵁
+ *
+ * @return 鏄惁鎴愬姛
*/
- public List<AirData> listAirData() {
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- List<AirData> list = list(wrapper);
+ 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);
+ //瀛樼紦瀛樼姸鎬�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + deviceName, heartBeatDataPackage, 300L);
+
+ return save(airData);
+ }
+
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
+ */
+ public CommonPage 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());
+ }
+ CommonPage commonPage = CommonPage.restPage(listAirId);
+ if (CollUtil.isEmpty(listAirId)) {
+ return commonPage;
+ }
+ List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
+ commonPage.setList(airDataBos);
+ return commonPage;
+
+ }
+
+ /**
+ * 鏌ヨ澶ф皵璁惧鍘嗗彶鏁版嵁
+ */
+ public List<AirDataBo> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, String deviceMac) {
+ if (StringUtils.isEmpty(deviceMac)) {
+ throw new BusinessException("璁惧鍙蜂笉鑳戒负绌猴紒");
+ }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<AirDataBo> list = baseMapper.listAirDataHistory(deviceMac);
return list;
+
}
/**
- * 妯＄硦鏌ヨ
+ * +
+ * 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
*/
- public List<AirData> listAirDataByKeyword(String keyword) {
-
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- if(keyword != null){
- wrapper.like(AirData::getBelongTo,keyword);
+ public A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage getDataByPoleid(Long poleId) {
+ String code;
+ if (SecurityUtils.getClientId() != null) {
+ code = baseMapper.getCodeByPoleId(poleId, SecurityUtils.getUserId());
+ } else {
+ code = baseMapper.getCodeByPoleId(poleId, null);
}
- List<AirData> airDataList = list(wrapper);
- return airDataList;
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage
+ = RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + code, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ if (heartBeatDataPackage == null) {
+ return null;
+ }
+
+ return heartBeatDataPackage;
}
- /**
- * 鍒犻櫎澶ф皵璁惧
- *
- * @param Id
- * @return
- */
- public boolean deleteAirData(Long Id) {
- AirData airData = getById(Id);
- if (airData == null) {
- throw new BusinessException("鎵句笉鍒板ぇ姘旇澶�");
- }
- return removeById(Id);
- }
}
--
Gitblit v1.9.3