From 76699b98e0ce1ffa6506f63c33d966d91704a516 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Tue, 3 Dec 2024 10:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 52 +++++++++---------- .../supervisiondata/rest/ApiController.java | 6 +++ .../service/GBaseJJDService.java | 2 + .../service/impl/GBaseJJDServiceImpl.java | 20 +++++++ 4 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 119486c..a8c2e7a 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -101,32 +101,32 @@ public class ApplicationEvent { LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0, 0); LocalDateTime end = LocalDateTime.now(); CompletableFutureUtil.runSync(() -> { - personalService.init(); - gBaseJJDService.pullAndSave(start, end); - gBaseSHRWFRService.pullAndSave(start, end); - petitionService.personPullAndSave(start, end); - pointService.personPullAndSave(start, end); - riskPersonalService.fixed(); - - riskTaskService.heightFight(initDomain(List.of(42))); - petitionService.petitionModelTask(initDomain(List.of(40))); - riskTaskService.eduModelTask(initDomain(List.of(34))); - riskTaskService.infoModelTask(initDomain(List.of(32,33))); - riskTaskService.caseModelTask(initDomain(List.of(35))); - pointService.syncSecurity(initDomain(List.of(37))); - policeService.contradictModelTask(initDomain(List.of(38))); - habitService.habitModelTask(initDomain(List.of(36))); - marriageService.marriageModelTask(initDomain(List.of(39,51))); - pointService.syncCarUser(initDomain(List.of(53))); - riskTaskService.riskAreaModelTask(initDomain(List.of(41))); - pointService.syncScore(initDomain(List.of(43))); - pointService.syncViolence(initDomain(List.of(44))); - noControlService.syncNoControlData(initDomain(List.of(45,49))); - pointService.syncKillSelf(initDomain(List.of(46))); - pointService.syncDrug(initDomain(List.of(37))); - pointService.syncControlNoPower(initDomain(List.of(48))); - pointService.syncPointCall(initDomain(List.of(50))); - pointService.syncOilBuy(initDomain(List.of(52))); +// personalService.init(); +// gBaseJJDService.pullAndSave(start, end); +// gBaseSHRWFRService.pullAndSave(start, end); +// petitionService.personPullAndSave(start, end); +// pointService.personPullAndSave(start, end); +// riskPersonalService.fixed(); +// +// riskTaskService.heightFight(initDomain(List.of(42))); +// petitionService.petitionModelTask(initDomain(List.of(40))); +// riskTaskService.eduModelTask(initDomain(List.of(34))); +// riskTaskService.infoModelTask(initDomain(List.of(32,33))); +// riskTaskService.caseModelTask(initDomain(List.of(35))); +// pointService.syncSecurity(initDomain(List.of(37))); +// policeService.contradictModelTask(initDomain(List.of(38))); +// habitService.habitModelTask(initDomain(List.of(36))); +// marriageService.marriageModelTask(initDomain(List.of(39,51))); +// pointService.syncCarUser(initDomain(List.of(53))); +// riskTaskService.riskAreaModelTask(initDomain(List.of(41))); +// pointService.syncScore(initDomain(List.of(43))); +// pointService.syncViolence(initDomain(List.of(44))); +// noControlService.syncNoControlData(initDomain(List.of(45,49))); +// pointService.syncKillSelf(initDomain(List.of(46))); +// pointService.syncDrug(initDomain(List.of(37))); +// pointService.syncControlNoPower(initDomain(List.of(48))); +// pointService.syncPointCall(initDomain(List.of(50))); +// pointService.syncOilBuy(initDomain(List.of(52))); //暂时废弃该保安 //gBaseBAService.baModelTask(initDomain(List.of(37))); //personalService.syncOrg(); diff --git a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java index 5b1be8f..3b9169d 100644 --- a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java +++ b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java @@ -2,6 +2,7 @@ package com.biutag.supervisiondata.rest; import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; import com.biutag.supervisiondata.common.response.RS; +import com.biutag.supervisiondata.config.cache.RedisDao; import com.biutag.supervisiondata.lock.LocalLock; import com.biutag.supervisiondata.service.ModelClueService; import com.biutag.supervisiondata.service.RiskScoreRuleService; @@ -53,6 +54,11 @@ public class ApiController { return RS.success(); } + @GetMapping("/get/jjd") + public String getJJD() { + return (String) RedisDao.getInstance().leftPop("jjd"); + } + @GetMapping("/model/{modelId}") public RS score(@PathVariable Integer modelId) { System.out.println("开始执行模型" + modelId); diff --git a/src/main/java/com/biutag/supervisiondata/service/GBaseJJDService.java b/src/main/java/com/biutag/supervisiondata/service/GBaseJJDService.java index 3fb95d6..d266d1b 100644 --- a/src/main/java/com/biutag/supervisiondata/service/GBaseJJDService.java +++ b/src/main/java/com/biutag/supervisiondata/service/GBaseJJDService.java @@ -14,4 +14,6 @@ public interface GBaseJJDService { * @param end 接警结束范围 */ void pullAndSave(LocalDateTime start, LocalDateTime end); + + void pullDataAndSaveRedis(LocalDateTime start, LocalDateTime end); } 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 2236d95..dd2d581 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -1,7 +1,9 @@ package com.biutag.supervisiondata.service.impl; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; +import com.biutag.supervisiondata.config.cache.RedisDao; import com.biutag.supervisiondata.pojo.constants.Default; import com.biutag.supervisiondata.pojo.database.PointOrg; import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX; @@ -235,6 +237,24 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { log.info("人数： {}", personals.size()); } + @Override + public void pullDataAndSaveRedis(LocalDateTime start, LocalDateTime end) { + List result = gBaseJJDRepository.getBaseMapper().selectDataToRisk(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), + end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + for (GBaseJJD gBaseJJD : result) { + if(gBaseJJD.getBjnr() == null && gBaseJJD.getCjqk()==null) { + continue; + } + JSONObject ob = new JSONObject(); + ob.put("name", gBaseJJD.getBjrxm()); + ob.put("mobile", gBaseJJD.getBjdh()); + ob.put("idCode", Optional.ofNullable(gBaseJJD.getBjrzjhm()).orElse("暂无")); + ob.put("bjnr", Optional.ofNullable(gBaseJJD.getBjnr()).orElse("")); + ob.put("cjqk", Optional.ofNullable(gBaseJJD.getCjqk()).orElse("")); + RedisDao.getInstance().rightPush("jjd", ob.toJSONString()); + } + } + /** * 多身份证对比名称 *