From 2e5582facc8d161780dec8e58a74fb36d094ca37 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Fri, 16 Jan 2026 09:01:39 +0800
Subject: [PATCH] 修改设备预警信息
---
src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java
index 0898d67..2364c7e 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/GasCategoryServiceImpl.java
@@ -3,6 +3,7 @@
import com.gkhy.fourierSpecialGasMonitor.commons.domain.Result;
import com.gkhy.fourierSpecialGasMonitor.commons.domain.SearchResult;
import com.gkhy.fourierSpecialGasMonitor.commons.enums.ResultCode;
+import com.gkhy.fourierSpecialGasMonitor.commons.enums.SystemCacheKeyEnum;
import com.gkhy.fourierSpecialGasMonitor.commons.exception.BusinessException;
import com.gkhy.fourierSpecialGasMonitor.commons.model.PageQuery;
import com.gkhy.fourierSpecialGasMonitor.domain.account.entity.User;
@@ -20,21 +21,34 @@
import com.gkhy.fourierSpecialGasMonitor.service.GasCategoryService;
import com.gkhy.fourierSpecialGasMonitor.utils.ThreadLocalUtil;
import io.micrometer.core.instrument.util.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
@@ -63,7 +77,7 @@
}
@Override
- public Result createGasCategory(CreateGasCategoryReqDTO reqDto) {
+ public synchronized Result createGasCategory(CreateGasCategoryReqDTO reqDto) {
if (reqDto == null)
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR_NULL.getCode(),"参数不能为空");
if (StringUtils.isBlank(reqDto.getMolecularFormula()))
@@ -94,7 +108,7 @@
gasCategoryMolecularFormulaRepeatlock.unlock();
}
//清除redis缓存
- RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info");
+ RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey());
if (bucket.isExists()) {
bucket.delete();
}
@@ -134,7 +148,7 @@
gasCategoryMolecularFormulaRepeatlock.unlock();
}
//清除redis缓存
- RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info");
+ RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey());
if (bucket.isExists()) {
bucket.delete();
}
@@ -164,9 +178,14 @@
}
@Override
+ public List<GasCategory> findGasCategoryForReport() {
+ return gasCategoryRepository.findGasCategoryForReport();
+ }
+
+ @Override
public Result gasCategoryList() {
Result success = Result.success();
- RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info");
+ RBucket<List<GasCategory>> bucket = redissonClient.getBucket(SystemCacheKeyEnum.KEY_GAS_CATEGORY.getKey());
List<GasCategory> categories = bucket.get();
if (CollectionUtils.isEmpty(categories)){
categories = gasCategoryRepository.findAll();
@@ -213,8 +232,11 @@
searchResult.setTotal(pageResult.getTotalElements());
searchResult.setPages(pageResult.getTotalPages());
if (!CollectionUtils.isEmpty(pageResult.getContent())){
- List<FindGasCategoryPageRespDTO> respDTOS = new ArrayList<>();
- BeanUtils.copyProperties(pageResult.getContent(),respDTOS);
+ List<FindGasCategoryPageRespDTO> respDTOS = pageResult.getContent().stream().map(gasCategory -> {
+ FindGasCategoryPageRespDTO dto = new FindGasCategoryPageRespDTO();
+ BeanUtils.copyProperties(gasCategory,dto);
+ return dto;
+ }).collect(Collectors.toList());
searchResult.setData(respDTOS);
}
return searchResult;
--
Gitblit v1.9.2