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 | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 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 1fbb073..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
@@ -4,6 +4,7 @@
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;
@@ -38,6 +39,10 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+ if (heartBeatDataPackage == null) {
+ System.out.println("淇濆瓨澶ф皵璁惧蹇冭烦鍖呮暟鎹紓甯革紝蹇冭烦鍖呬负绌猴紒");
+ return false;
+ }
AirData airData = new AirData();
BeanUtils.copyProperties(heartBeatDataPackage, airData);
@@ -47,7 +52,57 @@
AirEquipment airEquipment = new AirEquipment();
airEquipment.setId(airData.getId());
airEquipment.setMac(airData.getDeviceMac());
- airEquipment.setCreateTime(airData.getCreateTime());
+ 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);
//瀛樼紦瀛樺績璺冲寘
@@ -61,7 +116,7 @@
/**
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
- public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ public CommonPage listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Long> listAirId;
if (SecurityUtils.getClientId() == null) {
@@ -69,11 +124,13 @@
} else {
listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
}
+ CommonPage commonPage = CommonPage.restPage(listAirId);
if (CollUtil.isEmpty(listAirId)) {
- return CollUtil.newArrayList();
+ return commonPage;
}
List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
- return airDataBos;
+ commonPage.setList(airDataBos);
+ return commonPage;
}
@@ -91,6 +148,7 @@
}
+
/**
* +
* 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
--
Gitblit v1.9.3