From 1b0b86833609f1d0a25b0bc84d21796581629f4e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 10 四月 2025 13:07:21 +0800
Subject: [PATCH] 温湿度报检功能调整
---
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
index 2e37f6a..0f8f015 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeTempHumRecordServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.require.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.require.dto.FeTempHumRecordDto;
@@ -22,6 +23,53 @@
@Override
public IPage<FeTempHumRecordDto> getFeTempHumRecordPage(Page page, Integer dateId) {
- return baseMapper.getFeTempHumRecordPage(page, dateId);
+ IPage<FeTempHumRecordDto> feTempHumRecordPage = baseMapper.getFeTempHumRecordPage(page, dateId);
+ for (FeTempHumRecordDto record : feTempHumRecordPage.getRecords()) {
+ // 鍒ゆ柇鏄惁鏄棶棰樻暟鎹�
+ // 鍒ゆ柇娓╂箍搴︽槸鍚﹁秴杩囧尯闂�
+ boolean flag = false;
+ if (StringUtils.isNotBlank(record.getMorningTemp())) {
+ Double value = Double.valueOf(record.getMorningTemp());
+ if (value > record.getTemperatureHighest() || value < record.getTemperatureLowest()) {
+ flag = true;
+ }
+ }
+ if (StringUtils.isNotBlank(record.getMorningHum())) {
+ Double value = Double.valueOf(record.getMorningHum());
+ if (value > record.getHumidityHighest() || value < record.getHumidityLowest()) {
+ flag = true;
+ }
+ }
+ if (StringUtils.isNotBlank(record.getAfternoonTemp())) {
+ Double value = Double.valueOf(record.getAfternoonTemp());
+ if (value > record.getTemperatureHighest() || value < record.getTemperatureLowest()) {
+ flag = true;
+ }
+ }
+ if (StringUtils.isNotBlank(record.getAfternoonHum())) {
+ Double value = Double.valueOf(record.getAfternoonHum());
+ if (value > record.getHumidityHighest() || value < record.getHumidityLowest()) {
+ flag = true;
+ }
+ }
+
+ // 鍒ゆ柇鏄惁鏄亽娓╀簩, 鏄亽娓╀簩涓婁笅娓╁害鏄惁瓒呰繃1鎽勬皬搴�
+ if (StringUtils.isNotBlank(record.getTestAreaName()) && record.getTestAreaName().equals("鎭掓俯浜�")) {
+ if (StringUtils.isNotBlank(record.getMorningTemp()) && StringUtils.isNotBlank(record.getAfternoonTemp())) {
+ if (Double.valueOf(record.getAfternoonTemp()) - Double.valueOf(record.getMorningTemp()) > 1) {
+ flag = true;
+ }
+ }
+ }
+
+ if (flag) {
+ record.setIsIssue(1);
+ } else {
+ record.setIsIssue(0);
+ }
+
+
+ }
+ return feTempHumRecordPage;
}
}
--
Gitblit v1.9.3