From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 160 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 145 insertions(+), 15 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 2738004..1c1f6b5 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,28 +30,143 @@
@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) {
+ if (heartBeatDataPackage == null) {
+ System.out.println("淇濆瓨澶ф皵璁惧蹇冭烦鍖呮暟鎹紓甯革紝蹇冭烦鍖呬负绌猴紒");
+ return false;
+ }
- return list;
+ AirData airData = new AirData();
+ BeanUtils.copyProperties(heartBeatDataPackage, airData);
+ airData.setDeviceMac(deviceName);
+
+ //灏嗚澶囦俊鎭坊鍔犲埌澶ф皵璁惧琛�
+ AirEquipment airEquipment = new AirEquipment();
+ airEquipment.setId(airData.getId());
+ airEquipment.setMac(airData.getDeviceMac());
+ airEquipment.setDeviceType(heartBeatDataPackage.getDeviceType());
+ airEquipment.setModuleWarmUpStatusFlag(heartBeatDataPackage.getModuleWarmUpStatusFlag());
+ //娓╁害浼犳劅鍣�
+ airEquipment.setTemperature(heartBeatDataPackage.getTemperature() != null ? 1 : 0);
+ //婀垮害浼犳劅鍣�
+ airEquipment.setHumidity(heartBeatDataPackage.getHumidity() != null ? 1 : 0);
+ //椋庨�熶紶鎰熷櫒
+ airEquipment.setWindSpeed(heartBeatDataPackage.getWindSpeed() != null ? 1 : 0);
+ //椋庡悜浼犳劅鍣�
+ if (heartBeatDataPackage.getWindDirection() == null) {
+ airEquipment.setWindDirection(0);
+ } else if (heartBeatDataPackage.getWindDirection().contains("搴�")) {
+ //360搴︿紶鎰熷櫒
+ airEquipment.setWindDirection(2);
+ } else {
+ //鍏悜浠紶鎰熷櫒
+ airEquipment.setWindDirection(1);
+ }
+ //椋庡姏浼犳劅鍣�
+ airEquipment.setWindPower(heartBeatDataPackage.getWindPower() != null ? 1 : 0);
+ //姘斿帇浼犳劅鍣�
+ airEquipment.setPressure(heartBeatDataPackage.getPressure() != null ? 1 : 0);
+ //鍏夊己浼犳劅鍣�
+ airEquipment.setLightIntensity(heartBeatDataPackage.getLightIntensity() != null ? 1 : 0);
+ //鍣煶浼犳劅鍣�
+ airEquipment.setNoise(heartBeatDataPackage.getNoise() != null ? 1 : 0);
+ //PM25浼犳劅鍣�
+ airEquipment.setPm25(heartBeatDataPackage.getPm25() != null ? 1 : 0);
+ //PM10浼犳劅鍣�
+ airEquipment.setPm10(heartBeatDataPackage.getPm10() != null ? 1 : 0);
+ //TSP浼犳劅鍣�
+ airEquipment.setTsp(heartBeatDataPackage.getTsp() != null ? 1 : 0);
+ //闆ㄩ噺浼犳劅鍣�
+ airEquipment.setRain(heartBeatDataPackage.getRain() != null ? 1 : 0);
+ //SO2浼犳劅鍣�
+ airEquipment.setSo2(heartBeatDataPackage.getSo2() != null ? 1 : 0);
+ //鐢查啗浼犳劅鍣�
+ airEquipment.setEch2o(heartBeatDataPackage.getEch2o() != null ? 1 : 0);
+ //NO2浼犳劅鍣�
+ airEquipment.setNo2(heartBeatDataPackage.getNo2() != null ? 1 : 0);
+ //TVOC浼犳劅鍣�
+ airEquipment.setTvoc(heartBeatDataPackage.getTvoc() != null ? 1 : 0);
+ //CO浼犳劅鍣�
+ airEquipment.setCo(heartBeatDataPackage.getCo() != null ? 1 : 0);
+ //CO2浼犳劅鍣�
+ airEquipment.setCo2(heartBeatDataPackage.getCo2() != null ? 1 : 0);
+ //03浼犳劅鍣�
+ airEquipment.setO3(heartBeatDataPackage.getO3() != null ? 1 : 0);
+ //姘熷寲鐗╀紶鎰熷櫒
+ airEquipment.setFluoride(heartBeatDataPackage.getFluoride() != null ? 1 : 0);
+
+ 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 List<AirData> listAirDataByKeyword(String keyword) {
-
- LambdaQueryWrapper<AirData> wrapper = Wrappers.lambdaQuery(AirData.class);
- if(keyword != null){
- wrapper.like(AirData::getBelongTo,keyword);
+ 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());
}
- List<AirData> airDataList = list(wrapper);
- return airDataList;
+ 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 A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage getDataByPoleid(Long poleId) {
+ String code;
+ if (SecurityUtils.getClientId() != null) {
+ code = baseMapper.getCodeByPoleId(poleId, SecurityUtils.getUserId());
+ } else {
+ code = baseMapper.getCodeByPoleId(poleId, null);
+ }
+ A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage
+ = RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + code, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ if (heartBeatDataPackage == null) {
+ return null;
+ }
+
+ return heartBeatDataPackage;
}
}
--
Gitblit v1.9.3