员工表钉钉同步任务加锁

pom.xml

@@ -135,5 +135,16 @@
       <artifactId>hibernate-core</artifactId>
       <version>6.4.4.Final</version>
     </dependency>
+    <!-- Spring Boot Data Redis 启动器 -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-redis</artifactId>
+    </dependency>
+
+    <!-- 连接池依赖 (Spring Boot 2.x/3.x 默认使用 Lettuce，建议配合连接池使用) -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+    </dependency>
   </dependencies>
 </project>

src/main/java/com/project/base/domain/dto/BaseDTO.java

@@ -1,9 +1,11 @@
 package com.project.base.domain.dto;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.function.Supplier;
 
 @Data
 public class BaseDTO {
@@ -20,4 +22,12 @@ public class BaseDTO {
 
     private Boolean deleted;
 
+
+    public <T> T toEntity(Supplier<T> supplier) {
+        // 这里的 supplier.get() 等价于执行了 new UserEntity()
+        T entity = supplier.get();
+        BeanUtil.copyProperties(this, entity);
+        return entity;
+    }
+
 }

src/main/java/com/project/ding/config/SyncThreadPoolConfig.java

@@ -0,0 +1,24 @@
+package com.project.ding.config;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+public class SyncThreadPoolConfig {
+    @Bean(name = "dingUserSyncExecutor")
+    public ExecutorService dingUserSyncExecutor() {
+        return new ThreadPoolExecutor(
+                1, 1,
+                0L, TimeUnit.MILLISECONDS,
+                new LinkedBlockingQueue<>(1),
+                new ThreadFactoryBuilder().setNameFormat("ding-user-sync-%d").build(),
+                new ThreadPoolExecutor.DiscardPolicy()
+        );
+    }
+}

src/main/java/com/project/ding/domain/entity/SyncLogEntity.java

@@ -0,0 +1,37 @@
+package com.project.ding.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.project.base.domain.entity.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Comment;
+
+import java.util.Date;
+
+
+@Data
+@Table(name = "evaluator_sync_log" )
+@Entity
+@TableName("evaluator_sync_log")
+@EqualsAndHashCode(callSuper = true)
+public class SyncLogEntity extends BaseEntity {
+
+    @Comment("同步开始时间")
+    @Column(name = "start_time")
+    private Date startTime;
+
+    @Comment("同步结束时间")
+    @Column(name = "end_time")
+    private Date endTime;
+
+    @Column(name = "status")
+    @Comment("任务状态")
+    private Integer status; // 0-进行中, 1-成功, 2-失败
+
+    @Column(name = "error_msg" , columnDefinition="TEXT comment '错误信息'")
+    private String errorMsg;
+
+}

src/main/java/com/project/ding/domain/entity/UserEntity.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.base.domain.entity.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.Index;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +12,7 @@ import org.hibernate.annotations.Comment;
 import java.util.Date;
 
 @Data
-@Table(name = "evaluator_user" , indexes = {@Index(name = "Idx_parentId", columnList = "parent_id")})
+@Table(name = "evaluator_user" )
 @Entity
 @TableName("evaluator_user")
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/project/ding/domain/service/UserBaseService.java

@@ -0,0 +1,7 @@
+package com.project.ding.domain.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.ding.domain.entity.UserEntity;
+
+public interface UserBaseService extends IService<UserEntity> {
+}

src/main/java/com/project/ding/domain/service/impl/UserBaseServiceImpl.java

@@ -0,0 +1,11 @@
+package com.project.ding.domain.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.ding.domain.entity.UserEntity;
+import com.project.ding.domain.service.UserBaseService;
+import com.project.ding.mapper.UserMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserBaseServiceImpl extends ServiceImpl<UserMapper , UserEntity> implements UserBaseService {
+}

src/main/java/com/project/ding/mapper/DepartmentMapper.java

@@ -0,0 +1,9 @@
+package com.project.ding.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.ding.domain.entity.DepartmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DepartmentMapper extends BaseMapper<DepartmentEntity> {
+}

src/main/java/com/project/ding/mapper/SyncLogMapper.java

@@ -0,0 +1,9 @@
+package com.project.ding.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.ding.domain.entity.SyncLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SyncLogMapper extends BaseMapper<SyncLogEntity> {
+}

src/main/java/com/project/ding/mapper/UserMapper.java

@@ -0,0 +1,7 @@
+package com.project.ding.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.ding.domain.entity.UserEntity;
+
+public interface UserMapper extends BaseMapper<UserEntity> {
+}

src/main/java/com/project/ding/utils/DingUserSyncUtil.java

@@ -0,0 +1,108 @@
+package com.project.ding.utils;
+
+
+import com.project.ding.domain.dto.UserDTO;
+import com.project.ding.domain.entity.SyncLogEntity;
+import com.project.ding.domain.entity.UserEntity;
+import com.project.ding.domain.service.UserBaseService;
+import com.project.ding.mapper.SyncLogMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class DingUserSyncUtil {
+    @Resource(name = "dingUserSyncExecutor")
+    private ExecutorService executor;
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @Autowired
+    private UserBaseService userBaseService;
+
+    @Autowired
+    private DingUtil dingUtil;
+
+    @Autowired
+    private SyncLogMapper syncLogMapper;
+
+    private static final String LOCK_KEY = "lock:ding:user_sync";
+    private static final String LAST_SYNC_KEY = "cache:ding:last_sync_time";
+
+    /**
+     * 触发同步任务
+     * @param force 是否强制触发（跳过120分钟冷却检查）
+     */
+    public String triggerSync(boolean force) {
+        // 1. 抢占 Redis 锁（防止多个实例同时跑全量）
+        Boolean acquired = redisTemplate.opsForValue().setIfAbsent(LOCK_KEY, "true", 1, TimeUnit.HOURS);
+        if (Boolean.FALSE.equals(acquired)) {
+            return "同步任务已在运行中，请勿重复触发";
+        }
+
+        // 2. 提交异步任务（不使用 @Async）
+        CompletableFuture.runAsync(() -> {
+            try {
+                // 3. 冷却检查
+                if (!force) {
+                    String lastSync = redisTemplate.opsForValue().get(LAST_SYNC_KEY);
+                    if (lastSync != null && (System.currentTimeMillis() - Long.parseLong(lastSync) < 120 * 60 * 1000)) {
+                        log.info("处于冷却期，跳过全量同步");
+                        return;
+                    }
+                }
+
+                log.info(">>> 开始钉钉用户全量同步 (force={})", force);
+                runActualSyncTask();
+
+            } catch (Exception e) {
+                log.error("全量同步发生严重异常", e);
+            } finally {
+                // 4. 释放锁
+                redisTemplate.delete(LOCK_KEY);
+            }
+        }, executor);
+
+        return "同步任务已启动，请查看系统日志或更新时间";
+    }
+    private void runActualSyncTask() {
+        // 插入一条同步日志
+        SyncLogEntity syncLogEntity = new SyncLogEntity();
+        syncLogEntity.setStartTime(new Date());
+        syncLogEntity.setStatus(0);
+        syncLogMapper.insert(syncLogEntity);
+
+        // 开始同步
+        try {
+            List<UserDTO> allUserDTOList = dingUtil.getAllUserDTO();
+            userBaseService.saveOrUpdateBatch(allUserDTOList.stream()
+                .map(dto -> dto.toEntity(UserEntity::new))
+                .collect(Collectors.toList()) , 300);
+            syncLogEntity.setStatus(1);
+            syncLogEntity.setEndTime(new Date());
+            syncLogMapper.updateById(syncLogEntity);
+
+            redisTemplate.opsForValue().set(LAST_SYNC_KEY, String.valueOf(System.currentTimeMillis()));
+            log.info(">>> 全量同步完成");
+        } catch (Exception e) {
+            // 同步失败更新
+            syncLogEntity.setEndTime(new Date());
+            syncLogEntity.setStatus(2); // 失败
+            syncLogEntity.setErrorMsg(e.getMessage());
+            syncLogMapper.updateById(syncLogEntity);
+            log.error(">>> 全量同步过程报错", e);
+        }
+    }
+
+}

src/main/java/com/project/ding/utils/DingUtil.java

@@ -8,12 +8,14 @@ import com.github.tingyugetc520.ali.dingtalk.bean.department.DtDepart;
 import com.google.gson.JsonObject;
 import com.jayway.jsonpath.JsonPath;
 import com.project.ding.domain.dto.DingUserDTO;
+import com.project.ding.domain.dto.UserDTO;
 import io.vavr.control.Try;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 public class DingUtil {
@@ -22,12 +24,11 @@ public class DingUtil {
 
 
 
-
     public List<DtDepart> getAllDepartment() throws Exception {
         return dtService.getDepartmentService().list(null , true);
     }
 
-    public List<DingUserDTO> getAllUser() throws Exception {
+    public List<DingUserDTO> getAllDingUserDTO() throws Exception {
         List<DtDepart> list = getAllDepartment();
 
         List<DingUserDTO> userList = new ArrayList<>();
@@ -38,6 +39,19 @@ public class DingUtil {
         return userList;
     }
 
+    public List<UserDTO> getAllUserDTO() throws Exception {
+        List<DtDepart> list = getAllDepartment();
+
+        List<UserDTO> userList = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            List<DingUserDTO> userInDepartment = getUserIdInDepartment(list.get(i).getId());
+            userList.addAll(userInDepartment.stream()
+                    .map(UserDTO::fromDingUserDTO)
+                    .collect(Collectors.toList()));
+        }
+        return userList;
+    }
+
     public List<DingUserDTO> getUserIdInDepartment(Long id) throws Exception {
 
         JsonObject jsonObject = new JsonObject();