From 2cf32f240759df98c3e886b61e747cb7577a2f52 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 19 Dec 2024 17:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E4=B8=BB=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=20=20=E6=8F=90=E9=AB=98=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 2 +- .../service/impl/AiServiceImpl.java | 5 +-- .../service/impl/GBaseJJDServiceImpl.java | 3 +- .../service/impl/PointServiceImpl.java | 40 ++----------------- .../supervisiondata/util/DateTimeUtil.java | 24 +++++++++++ 5 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/biutag/supervisiondata/util/DateTimeUtil.java diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index a927b44..33ecbb0 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -123,7 +123,7 @@ public class ApplicationEvent { // habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62))); // pointService.syncCarUser(initDomain(List.of(53))); // pointService.syncScore(initDomain(List.of(43))); -// pointService.syncViolence(initDomain(List.of(44))); + pointService.syncViolence(initDomain(List.of(44))); // noControlService.syncNoControlData(initDomain(List.of(45))); // // pointService.syncControlNoPower(initDomain(List.of(48))); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java index fd02cc9..99a9d1a 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java @@ -8,6 +8,7 @@ import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcJJD; import com.biutag.supervisiondata.repository.GBaseJJDRepository; import com.biutag.supervisiondata.repository.WdpcJJDRepository; import com.biutag.supervisiondata.service.AiService; +import com.biutag.supervisiondata.util.DateTimeUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,9 +51,7 @@ public class AiServiceImpl implements AiService { jjd.setBjrxm(gBaseJJD.getBjrxm()); jjd.setBjrzjhm(gBaseJJD.getBjrzjhm()); wdpcJJDS.add(jjd); - try { - jjd.setBjsj(gBaseJJD.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - } catch (Exception ignored) {} + jjd.setBjsj(DateTimeUtil.date2LocalDateTime(gBaseJJD.getBjsj())); connection.rPush(key.serialize(RedisKey.JJD_CACHE), value.serialize(JSON.toJSONString(jjd))); })); wdpcJJDRepository.saveBatch(wdpcJJDS, 10000); 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 2fb7b84..8aee091 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -191,8 +191,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (time.isAfter(jjd.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime())) { tmp = jjd; } - } catch (Exception e) { - log.info("报警时间处理异常"); + } catch (Exception ignored) { } } if (tmp == null || tmp.getGxdwdm() == null) { diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java index a3a8415..ea8cf80 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -306,17 +306,13 @@ public class PointServiceImpl implements PointService { .personId(person.getId()) .idCode(person.getIdCode()) .sourceData("通过核查案件信息，发现该人员有近3个月，每出现一次扬言滋事、自杀等行为，接警单编号为：" + extreme.getJjdbh() + Optional.ofNullable(extreme.getBjnr()).map(it -> "，具体情况为：" + it).orElse("") + Optional.ofNullable(extreme.getCjqk()).map(it -> "，处警情况为：" + it).orElse("")) - .tag("扬言滋事、自杀等行为") + .tags(List.of("扬言滋事、自杀等行为")) + .score(10) .build(); - if (extreme.getGxdwdm() != null) { - data.setDepartId(extreme.getGxdwdm()); - data.setDepartName(extreme.getGxdwmc()); - } try { data.setEventTime(extreme.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - } catch (Exception ignored) { - } - toInsert.add(createClue2(task.getModelId(), 10, task.getId(), data)); + } catch (Exception ignored) {} + toInsert.add(DataUtil.createClueData(task, data)); } if (!toInsert.isEmpty()) { @@ -2089,23 +2085,6 @@ public class PointServiceImpl implements PointService { return clue; } - RiskModelTaskClue createClue2(Integer modelId, Integer score, Integer taskId, ClueData data) { - RiskModelTaskClue clue = new RiskModelTaskClue(); - clue.setModelId(modelId); - clue.setScore(score); - clue.setName(data.getName()); - clue.setIdCode(data.getIdCode()); - clue.setTaskId(taskId); - clue.setData(data.getSourceData()); - clue.setEventTime(data.getEventTime()); - clue.setCreateTime(LocalDateTime.now()); - clue.setUpdateTime(LocalDateTime.now()); - clue.setCaseIds(BhUtil.ajBh(data.getId())); - data.setPersonId(data.getPersonId()); - clue.setRiskReason(data.getTag()); - return clue; - } - RiskTask createTask(Integer size, Integer modelId) { RiskTask task = new RiskTask(); task.setModelId(modelId); @@ -2115,17 +2094,6 @@ public class PointServiceImpl implements PointService { return task; } - SupDepart findLevelThreeDepart(SupDepart supDepart, Map departMap) { - if (supDepart == null) { - return null; - } - if (supDepart.getLevel() == 3) { - return supDepart; - } - supDepart = departMap.get(supDepart.getPid()); - return findLevelThreeDepart(supDepart, departMap); - } - private final GBaseTbDZdrylbRepository zdrylbRepository; private final SupExternalDepartRepository externalDepartRepository; diff --git a/src/main/java/com/biutag/supervisiondata/util/DateTimeUtil.java b/src/main/java/com/biutag/supervisiondata/util/DateTimeUtil.java new file mode 100644 index 0000000..2f8a237 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/util/DateTimeUtil.java @@ -0,0 +1,24 @@ +package com.biutag.supervisiondata.util; + +import lombok.experimental.UtilityClass; + +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; + +/** + * @author kami on 2024-12-19 17:25 + * @version 1.0 + * @since 1.8 + */ +@UtilityClass +public class DateTimeUtil { + + public LocalDateTime date2LocalDateTime(Date date) { + try { + return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + } catch (Exception ignored) { + } + return null; + } +}