From 2e1d651fb5778ce91a72e9ce1f8525b9a926c026 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Tue, 5 Mar 2024 14:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhiyuanzhe/quartz/VolunteerQuartz.java    | 29 +++++++++++++++++++
 .../impl/BDistributionRecordsServiceImpl.java | 11 ++++++-
 .../src/main/resources/application-dev.yml    |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/quartz/VolunteerQuartz.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/quartz/VolunteerQuartz.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/quartz/VolunteerQuartz.java
new file mode 100644
index 0000000..9acab2f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/quartz/VolunteerQuartz.java
@@ -0,0 +1,29 @@
+package com.ruoyi.zhiyuanzhe.quartz;
+
+import com.ruoyi.zhiyuanzhe.service.IBDistributionRecordsService;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 定时任务同步志愿者数据
+ *
+ * @author dong
+ * @since 2024/2/29 11:25
+ */
+@Configuration
+@EnableScheduling
+@Transactional(rollbackFor = Exception.class)
+public class VolunteerQuartz {
+    @Resource
+    private IBDistributionRecordsService bDistributionRecordsService;
+    @Scheduled(cron = "0 0 4 * * ?")
+    public void volunteer() {
+        bDistributionRecordsService.volunteer();
+
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BDistributionRecordsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BDistributionRecordsServiceImpl.java
index 987acef..db79134 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BDistributionRecordsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BDistributionRecordsServiceImpl.java
@@ -45,6 +45,8 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 /**
@@ -353,7 +355,14 @@ public class BDistributionRecordsServiceImpl implements IBDistributionRecordsSer
                 sysUser.setDelFlag("0");
                 sysUser.setSex("2");
                 sysUser.setRoleId(101L);
-                sysUser.setUserId(Long.valueOf(dto.getPhone()));
+                String phone = dto.getPhone();
+                Pattern pattern = Pattern.compile("\\D"); // 匹配所有非数字字符
+                Matcher matcher = pattern.matcher(phone);
+                String result = matcher.replaceAll("");
+                if (!result.isEmpty()) {
+                    long userId = Long.parseLong(result);
+                    sysUser.setUserId(userId);
+                }
                 // 标记为导出数据
                 sysUser.setRemark("1");
                 userList.add(sysUser);
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index a406bc3..b0048e5 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -24,7 +24,7 @@ spring:
       master:
         url: jdbc:mysql://localhost:3306/zhi_yuan_zhe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: adminadmin
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭