xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自动处理日志内容追加部分判断如果有文件重复异常，依赖文件不存在异常，分析数据存储失败异常情况下，日志内容从追加成功标识信息改为错误标识信息

Browse Source 
台站运行管理增加判断缓存数据空情况返回内容逻辑
This commit is contained in:
qiaoqinzheng 2023-12-07 11:21:09 +08:00
parent 7a1aa66027
commit f474d67385
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/ParsingProcessLog.java
View File

@ -135,7 +135,12 @@ public class ParsingProcessLog extends AbstractAutoLogOrReport{
storageLog.append(System.lineSeparator()).append(System.lineSeparator()); storageLog.append(System.lineSeparator()).append(System.lineSeparator());
storageLog.append(rowFormat(INSTANCE_STATUS,spectrumHandler.status)); storageLog.append(rowFormat(INSTANCE_STATUS,spectrumHandler.status));
storageLog.append(System.lineSeparator()).append(System.lineSeparator()); storageLog.append(System.lineSeparator()).append(System.lineSeparator());
storageLog.append(titleFormat(WRITE_INTO_SUCCESS,19,StringConstant.DASH,endIntoDatabaseTime,StringConstant.DASH)); //判断是否有文件重复 或 gas,det文件不存在的情况 或 分析数据存储失败
if (fileRepeat || fileNotExist || analysisDataStoreFlag) {
storageLog.append(titleFormat(WRITE_INTO_ERROR,19,StringConstant.DASH,endIntoDatabaseTime,StringConstant.DASH));
} else {
storageLog.append(titleFormat(WRITE_INTO_SUCCESS,19,StringConstant.DASH,endIntoDatabaseTime,StringConstant.DASH));
}
storageLog.append(System.lineSeparator()).append(System.lineSeparator()).append(System.lineSeparator()); storageLog.append(System.lineSeparator()).append(System.lineSeparator()).append(System.lineSeparator());
} }
} }
@ -171,8 +176,8 @@ public class ParsingProcessLog extends AbstractAutoLogOrReport{
this.NCC_analysis(); this.NCC_analysis();
} }
if(analysisDataStoreFlag == true){ if(fileRepeat || fileNotExist || analysisDataStoreFlag){
storeFlag = "error"; storeFlag = "Error";
} }
analysisLog.append(rowFormat(storeResult,storeFlag)); analysisLog.append(rowFormat(storeResult,storeFlag));
analysisLog.append(System.lineSeparator()).append(System.lineSeparator()); analysisLog.append(System.lineSeparator()).append(System.lineSeparator());

21
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java
View File

@ -43,27 +43,12 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
@Autowired
private ICacheTimeService cacheTimeService;
@Resource
private StationSampleDataMapper stationSampleDataMapper;
@Resource
private StationSohDataMapper stationSohDataMapper;
@Resource
private StationMetDataMapper stationMetDataMapper;
@Resource @Resource
private SysUserFocusStationMapper sysUserFocusStationMapper; private SysUserFocusStationMapper sysUserFocusStationMapper;
@Autowired @Autowired
private StationTypeUtil stationTypeUtil; private StationTypeUtil stationTypeUtil;
@Autowired
private CalculateStationData calCulateStationData;
private final SpatialContext spatialContext = SpatialContext.GEO; private final SpatialContext spatialContext = SpatialContext.GEO;
@Override @Override
@ -566,7 +551,11 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
@Override @Override
public Result getDataProvisionEfficiency() { public Result getDataProvisionEfficiency() {
Map<String, StationInfo> stationInfoMap = (Map<String, StationInfo>) redisUtil.get("dataStationInfoList"); Map<String, StationInfo> stationInfoMap = (Map<String, StationInfo>) redisUtil.get("dataStationInfoList");
List<StationInfo> stationInfoList = stationInfoMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList()); List<StationInfo> stationInfoList = new LinkedList<>();
if (Objects.nonNull(stationInfoMap)) {
stationInfoList = stationInfoMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList());
}
// // 获取所有的台站信息 // // 获取所有的台站信息
// HashMap<String, GardsStations> stationInfoMap = (HashMap<String, GardsStations>) redisUtil.get("stationInfoMap"); // HashMap<String, GardsStations> stationInfoMap = (HashMap<String, GardsStations>) redisUtil.get("stationInfoMap");
// List<Integer> detectorsUsedList = (List<Integer>) redisUtil.get("detectorsUsedList"); // List<Integer> detectorsUsedList = (List<Integer>) redisUtil.get("detectorsUsedList");