From 2931c8141662454e44500827c8be8da31b03abeb Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Wed, 27 Nov 2024 10:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ModelClueServiceImpl.java     | 17 ++++++++++++-----
 .../supervisiondata/task/TaskService.java      | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
index 5c7b429..d47308c 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
@@ -119,7 +119,7 @@ public class ModelClueServiceImpl implements ModelClueService {
             getModelCluesForModel22(sql, modelClues);
             return modelClues;
         } else if (modelId == 23) { // 23号模型：保安员预警
-            modelClueDataMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 23));
+            modelClueMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 23));
         } else if (modelId == 25) { // 25号模型：重点人员管控人数过多
             getModelCluesForModel25(sql, modelClues);
             return modelClues;
@@ -833,7 +833,7 @@ public class ModelClueServiceImpl implements ModelClueService {
     private void getModelCluesForModel22(String param, List<ModelClue> modelClues) {
         System.out.println("模型22开始查询数据库");
         // 定时任务
-        String sql = "select * from \"JSDZ_4GDB\".\"v_anomaly_statistics\" where \"CREATETIME\" = " + getSpeDayString(1);
+        String sql = "select * from \"JSDZ_4GDB\".\"v_anomaly_statistics\" where \"CREATETIME\" = \"" + getYesterdayString() + "\"";
         List<Map<String, Object>> sqlList = modelClueDataDMRepository.selectByUniqueKeys(sql);
         System.out.println("模型22查询数据库完毕，结果数量：" + sqlList.size());
         if (sqlList.isEmpty()) {
@@ -911,7 +911,7 @@ public class ModelClueServiceImpl implements ModelClueService {
     }
 
     private void getModelCluesForModel25(String sql, List<ModelClue> modelClues) {
-        modelClueDataMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 25));
+        modelClueMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 25));
         System.out.println("模型25开始查询数据库");
         List<Map<String, Object>> sqlList = modelClueDataMapper.selectByUniqueKeys(sql);
         System.out.println("模型25查询数据库完毕，结果数量：" + sqlList.size());
@@ -1081,7 +1081,7 @@ public class ModelClueServiceImpl implements ModelClueService {
             }
             newModelClue.setDistributionState("0");
             newModelClue.setThingDesc("发现" + newModelClue.getInvolveDepartName()
-                    + "在" + getDateString(getSpeDayString(30)) + "到" + getDateString(getTodayString())
+                    + "在" + getSpeDayString(30) + "到" + getDateString(getTodayString())
                     + "之间共有" + departAllNumMap.get(department) + "个警情，变更了" + departNumMap.get(department)
                     + "个警情的结警性质，超过了该单位总警情的70%，存在大量变更接警性质的异常情况。");
             newModelClue.setData(newModelClue.getThingDesc());
@@ -1090,7 +1090,7 @@ public class ModelClueServiceImpl implements ModelClueService {
     }
 
     private void getModelCluesForModel105(String sql, List<ModelClue> modelClues) {
-        modelClueDataMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 105));
+        modelClueMapper.delete(Wrappers.<ModelClue>lambdaUpdate().eq(ModelClue::getModelId, 105));
         System.out.println("模型105开始查询数据库");
         List<Map<String, Object>> sqlList = modelClueMapper.selectByUniqueKeys(sql);
         System.out.println("模型105查询数据库完毕，结果数量：" + sqlList.size());
@@ -1261,6 +1261,13 @@ public class ModelClueServiceImpl implements ModelClueService {
         return result.format(formatter);
     }
 
+    private static String getYesterdayString() {
+        LocalDate today = LocalDate.now();
+        LocalDate result = today.minusDays(1);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return result.format(formatter);
+    }
+
     private static String getTodayString() {
         LocalDate today = LocalDate.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
diff --git a/src/main/java/com/biutag/supervisiondata/task/TaskService.java b/src/main/java/com/biutag/supervisiondata/task/TaskService.java
index b484a4b..43fa3aa 100644
--- a/src/main/java/com/biutag/supervisiondata/task/TaskService.java
+++ b/src/main/java/com/biutag/supervisiondata/task/TaskService.java
@@ -102,8 +102,12 @@ public class TaskService {
     public void runModel22To29() {
         for (int i = 22; i <= 29; i++) {
             log.info("开始执行模型{}", i);
-            modelClueService.generate(i);
-            log.info("模型{}执行完毕", i);
+            try {
+                modelClueService.generate(i);
+                log.info("模型{}执行完毕", i);
+            } catch (Exception e) {
+                log.error("模型{}执行失败", i, e);
+            }
         }
     }
 
@@ -117,12 +121,16 @@ public class TaskService {
     @Scheduled(cron = "0 45 3 * * *")
     public void runModel100To103() {
         for (int i = 100; i <= 103; i++) {
-            log.info("开始执行模型{}", i);
-            modelClueService.generate(i);
-            log.info("模型{}执行完毕", i);
+            try {
+                modelClueService.generate(i);
+                log.info("模型{}执行完毕", i);
+            } catch (Exception e) {
+                log.error("模型{}执行失败", i, e);
+            }
         }
     }
 
+    // 每月1日执行
     @Scheduled(cron = "0 50 3 1 * ?")
     public void runModel104() {
         log.info("开始执行模型104");