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

MET、SOH普文件去重

Browse Source
This commit is contained in:
duwenyuan 2025-05-15 10:51:37 +08:00
parent 2d96fbe7d0
commit 9e65ca7493
3 changed files with 129 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/MetSpectrumServiceImpl.java
View File

@ -9,6 +9,7 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.NumberFormatUtil; import org.jeecg.common.util.NumberFormatUtil;
import org.jeecg.modules.base.entity.configuration.GardsStations; import org.jeecg.modules.base.entity.configuration.GardsStations;
import org.jeecg.modules.base.entity.original.GardsMetData; import org.jeecg.modules.base.entity.original.GardsMetData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.file.FileOperation; import org.jeecg.modules.file.FileOperation;
import org.jeecg.modules.mapper.GardsMetDataMapper; import org.jeecg.modules.mapper.GardsMetDataMapper;
import org.jeecg.modules.mapper.GardsStationsMapper; import org.jeecg.modules.mapper.GardsStationsMapper;
@ -22,6 +23,7 @@ import org.springframework.util.CollectionUtils;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* 处理气象谱 * 处理气象谱
@ -36,6 +38,7 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
/** /**
* 保存气象谱数据 * 保存气象谱数据
*
* @param struct * @param struct
* @param fileName * @param fileName
* @return * @return
@ -50,6 +53,13 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
final GardsStations station = stationsService.check(struct.station_code, fileName); final GardsStations station = stationsService.check(struct.station_code, fileName);
List<GardsMetData> list = Lists.newArrayList(); List<GardsMetData> list = Lists.newArrayList();
if (struct.record_count > 0) { if (struct.record_count > 0) {
String finalFileName = FileOperation.separatorConvert(fileName);
LambdaQueryWrapper<GardsMetData> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(GardsMetData::getMetId);
queryWrapper.eq(GardsMetData::getInputFileName, finalFileName);
GardsMetData metDataOne= this.getOne(queryWrapper,false);
if (Objects.isNull(metDataOne)) {
for (int i = 0; i < struct.record_count; i++) { for (int i = 0; i < struct.record_count; i++) {
GardsMetData metData = new GardsMetData(); GardsMetData metData = new GardsMetData();
metData.setStationId(station.getStationId()); metData.setStationId(station.getStationId());
@ -71,6 +81,8 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
this.save(metData); this.save(metData);
}); });
} }
}
} }
return list; return list;
} }

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/SOHSpectrumServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.val;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.NumberFormatUtil; import org.jeecg.common.util.NumberFormatUtil;
@ -22,6 +23,7 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* 健康谱数据处理 * 健康谱数据处理
@ -55,6 +57,11 @@ public class SOHSpectrumServiceImpl extends ServiceImpl<GardsSohDataMapper, Gard
List<GardsSohData> list = Lists.newArrayList(); List<GardsSohData> list = Lists.newArrayList();
if(struct.af_record_count > 0){ if(struct.af_record_count > 0){
String finalFileName = FileOperation.separatorConvert(fileName);
LambdaQueryWrapper<GardsSohData> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(GardsSohData::getInputFileName,finalFileName);
GardsSohData sohDataOne= this.getOne(queryWrapper,false);
if(Objects.isNull(sohDataOne)){
for(int i=0;i<struct.af_record_count;i++){ for(int i=0;i<struct.af_record_count;i++){
GardsSohData sohData = new GardsSohData(); GardsSohData sohData = new GardsSohData();
sohData.setStationId(station.getStationId()); sohData.setStationId(station.getStationId());
@ -74,6 +81,7 @@ public class SOHSpectrumServiceImpl extends ServiceImpl<GardsSohDataMapper, Gard
}); });
} }
} }
}
return list; return list;
} }
} }