From 18f8173a04c2b1dc15745627c2a1ddc1ebb782b7 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng>
Date: Fri, 26 May 2023 16:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2DATA=20BASE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=93=E6=85=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GardsSampleDataServiceImpl.java | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
index bd17ce56..edc3efa1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
@@ -28,20 +28,15 @@ import java.util.Objects;
 @Service("gardsSampleDataService")
 @DS("ori")
 public class GardsSampleDataServiceImpl extends ServiceImpl<GardsSampleDataMapper, GardsSampleData> implements IGardsSampleDataService {
-
-    @Autowired
-    private IGardsStationsService gardsStationsService;
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private IGardsDetectorsService gardsDetectorsService;
 
     @Override
     public Result<IPage<GardsSampleData>> findPage(QueryRequest queryRequest, GardsSampleData gardsSampleData) {
         //查询全部台站信息
         HashMap<Integer, String> stationMap = (HashMap<Integer, String>) redisUtil.get("stationMap");
         //查询全部监测器信息
-        List<GardsDetectors> detectors = gardsDetectorsService.findDetectors();
+        HashMap<Integer, String> detectorsMap = (HashMap<Integer, String>) redisUtil.get("detectorsMap");
         Result<IPage<GardsSampleData>> result = new Result<>();
         Page<GardsSampleData> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
         LambdaQueryWrapper<GardsSampleData> queryWrapper = new LambdaQueryWrapper<>();
@@ -58,11 +53,10 @@ public class GardsSampleDataServiceImpl extends ServiceImpl<GardsSampleDataMappe
                     item.setStationName(stationValue);
                 }
             }
-            if (CollectionUtils.isNotEmpty(detectors)){
-                for (GardsDetectors detector:detectors) {
-                    if (detector.getDetectorId().equals(item.getDetectorId())){
-                        item.setDetectorsName(detector.getDetectorCode());
-                    }
+            if (CollectionUtils.isNotEmpty(detectorsMap)){
+                String detectorValue = detectorsMap.get(item.getDetectorId());
+                if (StringUtils.isNotBlank(detectorValue)){
+                    item.setDetectorsName(detectorValue);
                 }
             }
         });