physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-01-06 15:36:13 +08:00
parent caef8391fd
commit 2f2e86ff4c
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
View File

@@ -1,6 +1,8 @@
package org.jeecg.modules.database.service.impl; package org.jeecg.modules.database.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
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 org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -73,10 +75,24 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
} }
List<ExperimentRadiationProcess> radiationProcessList = getByExperimentId(experimentRadiationProcess.getExperimentId()); List<ExperimentRadiationProcess> radiationProcessList = getByExperimentId(experimentRadiationProcess.getExperimentId());
if (CollUtil.isNotEmpty(radiationProcessList)) { if (CollUtil.isNotEmpty(radiationProcessList)) {
List<TimeRange> list = radiationProcessList.stream().map(v -> new TimeRange(v.getRadiationStartTime(), v.getRadiationEndTime())) List<TimeRange> list =new ArrayList<>();
.collect(Collectors.toList()); for (ExperimentRadiationProcess process : radiationProcessList) {
String radiationDetail = process.getRadiationDetail();
if (StringUtils.isNotBlank(radiationDetail)) {
Map<String, List<Map<String, String>>> detailMap = JSONObject.parseObject(radiationDetail,
new TypeReference<>() {});
detailMap.forEach((key, value) -> value.forEach(v1 -> {
String startTime = v1.get("startTime");
String endTime = v1.get("endTime");
list.add(new TimeRange(DateUtils.parseDatetime(startTime), DateUtils.parseDatetime(endTime)));
}));
}
}
log.warn("TimeRange:" + list);
Date earliestTime = DateUtils.findEarliestTime(list); Date earliestTime = DateUtils.findEarliestTime(list);
Date latestTime = DateUtils.findLatestTime(list); Date latestTime = DateUtils.findLatestTime(list);
log.warn("earliestTime:" + earliestTime);
log.warn("latestTime:" + latestTime);
List<ExperimentIrradiationBoard> irradiationBoardList = experimentIrradiationBoardService.getByExperimentId( List<ExperimentIrradiationBoard> irradiationBoardList = experimentIrradiationBoardService.getByExperimentId(
experimentRadiationProcess.getExperimentId()); experimentRadiationProcess.getExperimentId());
String mv = DateUtils.formatDate(earliestTime, "yyyy-MM-dd") + "至" + DateUtils.formatDate(latestTime, "yyyy-MM-dd"); String mv = DateUtils.formatDate(earliestTime, "yyyy-MM-dd") + "至" + DateUtils.formatDate(latestTime, "yyyy-MM-dd");