From b865647b14d33b23d6a7f7680e7064b41579641e Mon Sep 17 00:00:00 2001
From: panbaolin <13071138970@163.com>
Date: Fri, 27 Feb 2026 16:13:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8F=8D=E5=BA=94=E5=A0=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StationDataController.java     |  7 ++++
 .../org/jeecg/service/StationDataService.java |  6 ++++
 .../service/impl/StationDataServiceImpl.java  | 36 ++++++++++++++++---
 .../impl/TransportTaskServiceImpl.java        | 22 +++++++-----
 4 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java b/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java
index f07b03b..59e0def 100644
--- a/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java
+++ b/jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java
@@ -32,4 +32,11 @@ public class StationDataController {
         return Result.OK(stationDataService.getAllNuclearfacility());
     }
 
+    @AutoLog(value = "查询所有反应堆")
+    @Operation(summary = "查询所有反应堆")
+    @GetMapping("getAllResearchReactors")
+    public Result<?> getAllResearchReactors(){
+        return Result.OK(stationDataService.getAllResearchReactors());
+    }
+
 }
diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java b/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java
index 020003d..4ddff7b 100644
--- a/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java
+++ b/jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java
@@ -45,4 +45,10 @@ public interface StationDataService {
      * @return
      */
     List<Map<String,Object>> getAllNuclearFacilitiesAndReactors();
+
+    /**
+     * 查询所有反应堆
+     * @return
+     */
+    List<Map<String,Object>> getAllResearchReactors();
 }
diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java
index d0296cb..9a881c2 100644
--- a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java
+++ b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java
@@ -9,11 +9,9 @@ import org.jeecg.common.util.CoordinateTransformUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.base.entity.configuration.GardsNuclearReactors;
 import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility;
+import org.jeecg.modules.base.entity.configuration.GardsResearchReactors;
 import org.jeecg.modules.base.entity.configuration.GardsStations;
-import org.jeecg.modules.base.mapper.GardsNuclearReactorsMapper;
-import org.jeecg.modules.base.mapper.GardsNuclearfacilityMapper;
-import org.jeecg.modules.base.mapper.GardsStationsMapper;
-import org.jeecg.modules.base.mapper.GardsXeResultMapper;
+import org.jeecg.modules.base.mapper.*;
 import org.jeecg.service.StationDataService;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
@@ -30,6 +28,7 @@ public class StationDataServiceImpl implements StationDataService {
 
     private final GardsStationsMapper stationsMapper;
     private final GardsNuclearReactorsMapper nuclearReactorsMapper;
+    private final GardsResearchReactorsMapper researchReactorsMapper;
     private final GardsXeResultMapper gardsXeResultMapper;
     private final RedisUtil redisUtil;
 
@@ -125,4 +124,33 @@ public class StationDataServiceImpl implements StationDataService {
         return stationsMapper.getAllNuclearFacilitiesAndReactors();
     }
 
+    /**
+     * 查询所有反应堆
+     *
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllResearchReactors() {
+        List<GardsResearchReactors> researchReactors;
+        if(redisUtil.hasKey(CommonConstant.ALL_RESEARCH_REACTORS)){
+            researchReactors =  (List<GardsResearchReactors>) redisUtil.get(CommonConstant.ALL_RESEARCH_REACTORS);
+        }else {
+            researchReactors = researchReactorsMapper.selectList(new LambdaQueryWrapper<>());
+            redisUtil.set(CommonConstant.ALL_RESEARCH_REACTORS,researchReactors);
+        }
+        if (CollUtil.isNotEmpty(researchReactors)) {
+            List<Map<String,Object>> result =  new ArrayList<>();
+            researchReactors.forEach(researchReactor -> {
+                Map<String,Object> map = new HashMap<>();
+                map.put("id",researchReactor.getId());
+                map.put("unitName",researchReactor.getFacilityName());
+                map.put("lonValue",researchReactor.getLongitude());
+                map.put("latValue",researchReactor.getLatitude());
+                result.add(map);
+            });
+            return result;
+        }
+        return List.of();
+    }
+
 }
diff --git a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java
index c8ab05f..d14075c 100644
--- a/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java
+++ b/jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java
@@ -846,19 +846,25 @@ public class TransportTaskServiceImpl extends ServiceImpl<TransportTaskMapper,Tr
             info.add("上传文件必须为.xlsx格式的excel文件");
             return info;
         }
-        Workbook workBook = new XSSFWorkbook(file.getInputStream());
-        //封装任务
-        TransportTask transportTask = new TransportTask();
-        this.handleTaskBaseInfo(transportTask,workBook,info);
-        this.handleSiteReleaseInfo(transportTask,workBook,info);
-        TransactionStatus transaction = transactionManager.getTransaction(transactionDefinition);
+        Workbook workBook = null;
+        TransactionStatus transactionStatus = null;
         try{
+            workBook = new XSSFWorkbook(file.getInputStream());
+            //封装任务
+            TransportTask transportTask = new TransportTask();
+            this.handleTaskBaseInfo(transportTask,workBook,info);
+            this.handleSiteReleaseInfo(transportTask,workBook,info);
             //此处属于内部调用create函数的事务注解不会生效，所以用手动事务
+            transactionStatus = transactionManager.getTransaction(transactionDefinition);
             this.cteate(transportTask);
-            transactionManager.commit(transaction);
+            transactionManager.commit(transactionStatus);
         }catch (Exception e){
-            transactionManager.rollback(transaction);
+            transactionManager.rollback(transactionStatus);
             e.printStackTrace();
+        }finally {
+            if (Objects.nonNull(workBook)){
+                workBook.close();
+            }
         }
 
         return info;