|
|
|
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; |
|
|
|
|
import com.biutag.supervisiondata.pojo.ClueData; |
|
|
|
|
import com.biutag.supervisiondata.pojo.constants.Default; |
|
|
|
|
import com.biutag.supervisiondata.pojo.database.PointOrg; |
|
|
|
|
import com.biutag.supervisiondata.pojo.domain.PetitionData; |
|
|
|
|
import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; |
|
|
|
|
import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX; |
|
|
|
|
@ -18,7 +17,6 @@ import com.biutag.supervisiondata.service.RiskPersonalService;
|
|
|
|
|
import com.biutag.supervisiondata.util.DataUtil; |
|
|
|
|
import com.biutag.supervisiondata.util.DepartUtil; |
|
|
|
|
import com.biutag.supervisiondata.util.IdCodeUtil; |
|
|
|
|
import com.biutag.supervisiondata.util.BhUtil; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
@ -276,7 +274,6 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
|
|
|
|
|
// List<PetitionData> dataList1 = new ArrayList<>();
|
|
|
|
|
List<PetitionData> dataList2 = new ArrayList<>(); |
|
|
|
|
List<PetitionData> dataList3 = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
CompletableFuture.allOf( |
|
|
|
|
// CompletableFutureUtil.runSyncObject(() -> dataList1.addAll(dataCaseVerifRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))),
|
|
|
|
|
@ -301,7 +298,9 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
|
|
|
|
|
LocalDateTime maxTime = entry.getValue().stream() |
|
|
|
|
.filter(it -> it.getEventTime() != null) |
|
|
|
|
.max(Comparator.comparing(PetitionData::getEventTime)).get().getEventTime(); |
|
|
|
|
.max(Comparator.comparing(PetitionData::getEventTime)) |
|
|
|
|
.map(PetitionData::getEventTime) |
|
|
|
|
.orElse(LocalDateTime.now()); |
|
|
|
|
RiskModelTaskClue old = oldMap.get(entry.getKey()); |
|
|
|
|
if (old != null) { |
|
|
|
|
oldMap.remove(entry.getKey()); |
|
|
|
|
|