panbaolin/SourceTermAnalysisSystem_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
1.完成查询所有反应堆功能
2.优化导入解析的任务数据功能
This commit is contained in:
panbaolin 2026-02-27 16:13:53 +08:00
parent e4fbc2fe69
commit b865647b14
4 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-transport/src/main/java/org/jeecg/controller/StationDataController.java
View File

@ -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());
}
}

6
jeecg-module-transport/src/main/java/org/jeecg/service/StationDataService.java
View File

@ -45,4 +45,10 @@ public interface StationDataService {
* @return
*/
List<Map<String,Object>> getAllNuclearFacilitiesAndReactors();
/**
* 查询所有反应堆
* @return
*/
List<Map<String,Object>> getAllResearchReactors();
}

36
jeecg-module-transport/src/main/java/org/jeecg/service/impl/StationDataServiceImpl.java
View File

@ -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();
}
}

22
jeecg-module-transport/src/main/java/org/jeecg/service/impl/TransportTaskServiceImpl.java
View File

@ -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;