From 4de54e51aebeeca66bfcf758cd1357ed24744393 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 10 Dec 2024 11:33:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BA=A0=E7=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/supervisiondata/event/ApplicationEvent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 1f4e5e8..039a6f8 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -154,13 +154,15 @@ public class ApplicationEvent { // pointService.syncDomicileType(initDomain(List.of(114))); // pointService.syncCriminalPunishment(initDomain(List.of(115))); // pointService.syncAdministrativePunishment(initDomain(List.of(116))); - pointService.syncParentsDivorce(initDomain(List.of(117))); +// pointService.syncParentsDivorce(initDomain(List.of(117))); pointService.syncFamilyDie(initDomain(List.of(118))); pointService.syncFatherDie(initDomain(List.of(119))); pointService.syncMotherDie(initDomain(List.of(120))); pointService.syncChildNo(initDomain(List.of(121))); pointService.syncXIDU(initDomain(List.of(122))); pointService.syncFiliation(initDomain(List.of(123))); + gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); + pointService.syncPetitionContent(initDomain(List.of(124))); // *********暂时不要********** From 4a260336e74f80c024a3f90df934656b4b4a840f Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 10 Dec 2024 11:49:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BA=A0=E7=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/supervisiondata/event/ApplicationEvent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 039a6f8..c9a6ee5 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -161,6 +161,7 @@ public class ApplicationEvent { pointService.syncChildNo(initDomain(List.of(121))); pointService.syncXIDU(initDomain(List.of(122))); pointService.syncFiliation(initDomain(List.of(123))); + // 必须在123后面 gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); pointService.syncPetitionContent(initDomain(List.of(124))); From 71b79c420571a10357c9cf4b620574902387ec9e Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 10 Dec 2024 12:35:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BA=A0=E7=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 2 +- .../service/impl/GBaseJJDServiceImpl.java | 60 ++++++++----------- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index c9a6ee5..4813ed9 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -135,7 +135,7 @@ public class ApplicationEvent { // pointService.syncDrug(initDomain(List.of(37))); // pointService.syncControlNoPower(initDomain(List.of(48))); // pointService.syncOilBuy(initDomain(List.of(52))); - gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58))); +// gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58))); // jsbryService.syncPys(initDomain(List.of(59))); // gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); // gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); 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 d507819..0e67e07 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -307,60 +307,48 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { String startTime = start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String endTime = end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - List list1 = new ArrayList<>(); - List list2 = new ArrayList<>(); - List list3 = new ArrayList<>(); - List list4 = new ArrayList<>(); - List tasks = new ArrayList<>(4); CompletableFuture.allOf( CompletableFutureUtil.runSyncObject(() -> { List jjdList = gBaseJJDRepository.getBaseMapper().selectRevenge(startTime, endTime); RiskTask task = taskRepository.create(jjdList.size(), 58); - list1.addAll(collectJJD(task, "表达报复社会", jjdList, domain)); - tasks.set(0, task.getId()); + List list =collectJJD(task, "表达报复社会", jjdList, domain); + if (!list.isEmpty()) { + log.info("保存复仇者联盟：{}", list.size()); + clueService.saveClues(list, "表达报复社会"); + } + taskRepository.updateTask(task.getId(), list.size(), 0); }), CompletableFutureUtil.runSyncObject(() -> { List jjdList = gBaseJJDRepository.getBaseMapper().selectHater(startTime, endTime); RiskTask task = taskRepository.create(jjdList.size(), 55); - list2.addAll(collectJJD(task, "表达厌世情绪", gBaseJJDRepository.getBaseMapper().selectHater(startTime, endTime), domain)); - tasks.set(1, task.getId()); + List list = collectJJD(task, "表达厌世情绪", jjdList, domain); + if (!list.isEmpty()) { + log.info("厌世强者：{}", list.size()); + clueService.saveClues(list, "表达厌世情绪"); + } + taskRepository.updateTask(task.getId(), list.size(), 0); }), CompletableFutureUtil.runSyncObject(() -> { List jjdList = gBaseJJDRepository.getBaseMapper().selectInjustice(startTime, endTime); RiskTask task = taskRepository.create(jjdList.size(), 57); - list3.addAll(collectJJD(task, "表达遭受不公", gBaseJJDRepository.getBaseMapper().selectInjustice(startTime, endTime), domain)); - tasks.set(2, task.getId()); + List list = collectJJD(task, "表达遭受不公", jjdList, domain); + if (!list.isEmpty()) { + log.info("我命由我不由天：{}", list.size()); + clueService.saveClues(list, "表达遭受不公"); + } + taskRepository.updateTask(task.getId(), list.size(), 0); }), CompletableFutureUtil.runSyncObject(() -> { List jjdList = gBaseJJDRepository.getBaseMapper().selectSuicide(startTime, endTime); RiskTask task = taskRepository.create(jjdList.size(), 56); - list4.addAll(collectJJD(task, "尝试自杀", gBaseJJDRepository.getBaseMapper().selectSuicide(startTime, endTime), domain)); - tasks.set(3, task.getId()); + List list = collectJJD(task, "尝试自杀", jjdList, domain); + if (!list.isEmpty()) { + log.info("毁灭吧：{}", list.size()); + clueService.saveClues(list, "尝试自杀"); + } + taskRepository.updateTask(task.getId(), list.size(), 0); }) ).join(); - - - if (!list1.isEmpty()) { - log.info("保存复仇者联盟：{}", list1.size()); - clueService.saveClues(list1, "表达报复社会"); - } - if (!list2.isEmpty()) { - log.info("厌世强者：{}", list2.size()); - clueService.saveClues(list2, "表达厌世情绪"); - } - if (!list3.isEmpty()) { - log.info("我命由我不由天：{}", list3.size()); - clueService.saveClues(list3, "表达遭受不公"); - } - if (!list4.isEmpty()) { - log.info("毁灭吧：{}", list4.size()); - clueService.saveClues(list4, "尝试自杀"); - } - taskRepository.updateTask(tasks.get(0), list1.size(), 0); - taskRepository.updateTask(tasks.get(1), list2.size(), 0); - taskRepository.updateTask(tasks.get(2), list3.size(), 0); - taskRepository.updateTask(tasks.get(3), list4.size(), 0); - } private final RiskTaskRepository taskRepository; From d6807e41844a01c4babaf931359b68ce86ccd5c8 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 10 Dec 2024 12:36:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BA=A0=E7=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/supervisiondata/event/ApplicationEvent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 4813ed9..2c43ae7 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -155,9 +155,9 @@ public class ApplicationEvent { // pointService.syncCriminalPunishment(initDomain(List.of(115))); // pointService.syncAdministrativePunishment(initDomain(List.of(116))); // pointService.syncParentsDivorce(initDomain(List.of(117))); - pointService.syncFamilyDie(initDomain(List.of(118))); - pointService.syncFatherDie(initDomain(List.of(119))); - pointService.syncMotherDie(initDomain(List.of(120))); +// pointService.syncFamilyDie(initDomain(List.of(118))); +// pointService.syncFatherDie(initDomain(List.of(119))); +// pointService.syncMotherDie(initDomain(List.of(120))); pointService.syncChildNo(initDomain(List.of(121))); pointService.syncXIDU(initDomain(List.of(122))); pointService.syncFiliation(initDomain(List.of(123)));