fix: 审批节点生成流程编号重复问题

gongchunyi

7 小时以前 bbd6ab5d328556ec20432cd6016f8f352465b232

 src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java

@@ -4,27 +4,69 @@
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.concurrent.TimeUnit;


//基于redis的一个每日计数器
@Component
public class DailyRedisCounter {
public class DailyRedisCounter implements ApplicationRunner {
    private static final String KEY_PREFIX = "daily_counter:";
    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
    private final StringRedisTemplate redisTemplate;

    public DailyRedisCounter(StringRedisTemplate redisTemplate) {
        this.redisTemplate = redisTemplate;
    }

    @Value("${ruoyi.approvalNumberPrefix}")
    private String approvalNumberPrefix;

    @Autowired
    private ApproveProcessMapper approveProcessMapper;

    @Override
    public void run(ApplicationArguments args) {
        syncFromDb();
    }

    /**
     * 强制从数据库同步当前计数到 Redis
     */
    public void syncFromDb() {
        String key = approvalNumberPrefix + ":approveNum";
        String lockKey = key + ":sync_lock";
        Boolean lock = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 30, TimeUnit.SECONDS);
        if (Boolean.TRUE.equals(lock)) {
            try {
                long dbCount = getCountFromDb();
                redisTemplate.opsForValue().set(key, String.valueOf(dbCount), calculateSecondsUntilMidnight(), TimeUnit.SECONDS);
            } finally {
                redisTemplate.delete(lockKey);
            }
        }
    }

    /**
     * 从数据库获取今日审批单总量
     */
    private long getCountFromDb() {
        StartAndEndDateDto dateTime = getDateTime();
        LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(ApproveProcess::getApproveDelete, 0)
                .ge(ApproveProcess::getCreateTime, dateTime.getStartDate())
                .lt(ApproveProcess::getCreateTime, dateTime.getEndDate());
        Long count = approveProcessMapper.selectCount(wrapper);
        return count == null ? 0 : count;
    }

    /**查缓存
@@ -45,21 +87,14 @@
        return count;
    }

    @Autowired
    private ApproveProcessMapper approveProcessMapper;

    /**
     * 获取当前时间的  开始日期  ，结束日期
     * @return
     */
    public static StartAndEndDateDto getDateTime(){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        Date date = new Date();
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.DATE,1);
        String startDateTime = simpleDateFormat.format(date);
        String endDateTime = simpleDateFormat.format(cal.getTime());
        LocalDate now = LocalDate.now();
        String startDateTime = now.toString();
        String endDateTime = now.plusDays(1).toString();
        StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
        startAndEndDateDto.setStartDate(startDateTime);
        startAndEndDateDto.setEndDate(endDateTime);
@@ -71,29 +106,36 @@
     * @return 今日自增后的计数值
     */
    public long incrementAndGetByDb() {
        String approveId = redisTemplate.opsForValue().get("approveNum");
        if(approveId == null){
            StartAndEndDateDto dateTime = getDateTime();
            LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
            approveProcessLambdaQueryWrapper
                    .eq(ApproveProcess::getApproveDelete,0)
                    .gt(ApproveProcess::getCreateTime,dateTime.getStartDate())
                    .lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
            Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
            if(aLong == null){
                redisTemplate.opsForValue().set("approveNum","1",1L, TimeUnit.HOURS);
                return 1;
            }else{
                aLong += 1;
                redisTemplate.opsForValue().set("approveNum",aLong.toString(),1L, TimeUnit.HOURS);
                return aLong;
            }
        }else{
            Long num = Long.parseLong(approveId) + 1;
            redisTemplate.opsForValue().set("approveNum",num.toString(),1L, TimeUnit.HOURS);
            return Long.parseLong(approveId);
        }
        String key = approvalNumberPrefix + ":approveNum";
        //  获取现有值
        String approveId = redisTemplate.opsForValue().get(key);

        if (approveId == null) {
            //  缓存不存在进行初始化
            String lockKey = key + ":lock";
            Boolean lock = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
            if (Boolean.TRUE.equals(lock)) {
                try {
                    approveId = redisTemplate.opsForValue().get(key);
                    if (approveId == null) {
                        long count = getCountFromDb();
                        long nextVal = count + 1;
                        redisTemplate.opsForValue().set(key, String.valueOf(nextVal), calculateSecondsUntilMidnight(), TimeUnit.SECONDS);
                        return nextVal;
                    }
                } finally {
                    redisTemplate.delete(lockKey);
                }
            } else {
                try {
                    Thread.sleep(100);
                } catch (InterruptedException e) {
                    Thread.currentThread().interrupt();
                }
                return incrementAndGetByDb();
            }
        }
        return redisTemplate.opsForValue().increment(key);
    }

    /**
@@ -111,12 +153,9 @@
     * 计算距离次日凌晨的秒数
     */
    private long calculateSecondsUntilMidnight() {
        LocalDate tomorrow = LocalDate.now().plusDays(1);
        LocalDate midnight = tomorrow.atStartOfDay().toLocalDate();
        return java.time.Duration.between(
                LocalDate.now().atTime(23, 59, 59),
                midnight.atTime(0, 0, 0)
        ).getSeconds() + 1;
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
        return java.time.Duration.between(now, midnight).getSeconds();
    }

    /**