From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java
index 49ac06a..eff9426 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java
@@ -7,8 +7,11 @@
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.entity.SysWarehouseContainer;
import com.nanometer.smartlab.entity.dto.ContainerStatusMngDto;
+import com.nanometer.smartlab.exception.BusinessException;
+import com.nanometer.smartlab.exception.ExceptionEnumCode;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.IDUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.log4j.Logger;
@@ -18,6 +21,7 @@
import org.springframework.util.Assert;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.sql.SQLException;
import java.util.*;
@@ -48,7 +52,7 @@
for (Map params : sensorsList) {
String containerCode = params.containsKey("containerCode")?params.get("containerCode").toString():"";
SysContainerSensors sensors = new SysContainerSensors();
- sensors.setId(IDUtils.uuid());
+ // sensors.setId(IDUtils.uuid());
sensors.setFlag(params.containsKey("Flag")?String.valueOf(params.get("Flag")):"");
sensors.setHumidity(params.containsKey("Humidity")?(int) params.get("Humidity"):0);
sensors.setTemp(params.containsKey("Temp")?(double) params.get("Temp"):0);
@@ -109,5 +113,31 @@
return sysContainerSensorsDao.countAll(params);
}
+ @Override
+ public ContainerStatusMngDto getRowData(String rowKey) {
+ return sysContainerSensorsDao.getRowData(rowKey);
+ }
+
+ @Override
+ public Map<String,BigDecimal> selectMaxTemperature(String selectedContainerId, String beginDate, String endDate) {
+ if (StringUtils.isBlank(selectedContainerId))
+ throw new BusinessException(ExceptionEnumCode.PARAM_NULL,"参数为空");
+ return sysContainerSensorsDao.selectMaxTemperature( selectedContainerId, beginDate, endDate);
+ }
+
+ @Override
+ public Map<String,BigDecimal> selectMaxHumidity(String selectedContainerId, String beginDate, String endDate) {
+ if (StringUtils.isBlank(selectedContainerId))
+ throw new BusinessException(ExceptionEnumCode.PARAM_NULL,"参数为空");
+ return sysContainerSensorsDao.selectMaxHumidity(selectedContainerId, beginDate, endDate);
+ }
+
+ @Override
+ public Map<String,BigDecimal> selectMaxVoc(String selectedContainerId, String beginDate, String endDate) {
+ if (StringUtils.isBlank(selectedContainerId))
+ throw new BusinessException(ExceptionEnumCode.PARAM_NULL,"参数为空");
+ return sysContainerSensorsDao.selectMaxVoc(selectedContainerId, beginDate, endDate);
+ }
+
}
--
Gitblit v1.9.2