Skip to content

Z
zlmy-cloud
Commit 897d1a08 authored by 鲁鸿波's avatar 鲁鸿波
Browse files
Options

安全风险分析bug

parent 177ea358
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 31 deletions
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardAssessmentServiceImpl.java
View file @ 897d1a08
...@@ -59,44 +59,56 @@ public class THazardAssessmentServiceImpl extends SuperServiceImpl<THazardAssess ...@@ -59,44 +59,56 @@ public class THazardAssessmentServiceImpl extends SuperServiceImpl<THazardAssess
THazardAssessment tHazardAssessment = null; THazardAssessment tHazardAssessment = null;
final int MAX_ATTEMPTS = 5; final int MAX_ATTEMPTS = 5;
if (StringUtils.isEmpty(completeTime)) { int count = this.count(
// 构建不含时间条件的查询 new LambdaQueryWrapper<THazardAssessment>()
tHazardAssessment = this.getOne( .eq(THazardAssessment::getWorkTypeId, typeId)
new LambdaQueryWrapper<THazardAssessment>() .eq(THazardAssessment::getPlanId, planId));
.eq(THazardAssessment::getWorkTypeId, typeId) if(count>1){
.eq(THazardAssessment::getPlanId, planId) if (StringUtils.isEmpty(completeTime)) {
); // 构建不含时间条件的查询
} else { tHazardAssessment = this.getOne(
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); new LambdaQueryWrapper<THazardAssessment>()
.eq(THazardAssessment::getWorkTypeId, typeId)
.eq(THazardAssessment::getPlanId, planId)
);
} else {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 尝试原始时间 // 尝试原始时间
tHazardAssessment = this.getOne( tHazardAssessment = this.getOne(
new LambdaQueryWrapper<THazardAssessment>() new LambdaQueryWrapper<THazardAssessment>()
.eq(THazardAssessment::getWorkTypeId, typeId) .eq(THazardAssessment::getWorkTypeId, typeId)
.eq(THazardAssessment::getPlanId, planId) .eq(THazardAssessment::getPlanId, planId)
.eq(THazardAssessment::getCreateDate, completeTime) .eq(THazardAssessment::getCreateDate, completeTime)
); );
// 时间递减查询（最多5次） // 时间递减查询（最多5次）
if (tHazardAssessment == null) { if (tHazardAssessment == null) {
LocalDateTime dateTime = LocalDateTime.parse(completeTime, formatter); LocalDateTime dateTime = LocalDateTime.parse(completeTime, formatter);
for (int i = 1; i <= MAX_ATTEMPTS; i++) { for (int i = 1; i <= MAX_ATTEMPTS; i++) {
// 每次递减1秒 // 每次递减1秒
LocalDateTime adjustedTime = dateTime.minusSeconds(i); LocalDateTime adjustedTime = dateTime.minusSeconds(i);
String newTime = adjustedTime.format(formatter); String newTime = adjustedTime.format(formatter);
// 每次创建全新的查询条件 // 每次创建全新的查询条件
tHazardAssessment = this.getOne( tHazardAssessment = this.getOne(
new LambdaQueryWrapper<THazardAssessment>() new LambdaQueryWrapper<THazardAssessment>()
.eq(THazardAssessment::getWorkTypeId, typeId) .eq(THazardAssessment::getWorkTypeId, typeId)
.eq(THazardAssessment::getPlanId, planId) .eq(THazardAssessment::getPlanId, planId)
.eq(THazardAssessment::getCreateDate, newTime) .eq(THazardAssessment::getCreateDate, newTime)
); );
if (tHazardAssessment != null) break; if (tHazardAssessment != null) break;
}
} }
} }
}else{
tHazardAssessment = this.getOne(
new LambdaQueryWrapper<THazardAssessment>()
.eq(THazardAssessment::getWorkTypeId, typeId)
.eq(THazardAssessment::getPlanId, planId)
);
} }
if(tHazardAssessment == null){ if(tHazardAssessment == null){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment