From 4a5d683e5094a45006fab957bdf022785e01065e Mon Sep 17 00:00:00 2001
From: kami <605128600@qq.com>
Date: Mon, 6 Jan 2025 17:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisiondata/service/impl/GBaseJJDServiceImpl.java  | 2 +-
 .../supervisiondata/service/impl/PetitionServiceImpl.java  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
index d914320..7155af3 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
@@ -506,7 +506,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
             RiskModelTaskClue old = oldMap.get(entry.getKey());
             if (old != null) {
                 oldMap.remove(entry.getKey());
-                if (!desc.equals(desc)) {
+                if (!old.getData().equals(desc)) {
                     RiskModelTaskClue update = new RiskModelTaskClue();
                     update.setId(old.getId());
                     update.setTags(List.of(list.size() + "起平台涉警事件"));
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
index bbdb925..f9ef169 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
@@ -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());