ady/ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
This commit is contained in:
YunaiV
2025-04-12 11:56:35 +08:00
parent 7f8261ce37 f6601ab639
commit d8451b004e
23 changed files with 1123 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
View File

@@ -10,6 +10,8 @@ import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
import static cn.hutool.core.date.DatePattern.*;
/**
* BPM 流程 Id 编码的 Redis DAO
*
@@ -32,16 +34,16 @@ public class BpmProcessIdRedisDAO {
String infix = "";
switch (processIdRule.getInfix()) {
case "DAY":
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDD");
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN);
break;
case "HOUR":
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHH");
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HH");
break;
case "MINUTE":
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmm");
infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HHmm");
break;
case "SECOND":
infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmmss");
infix = DateUtil.format(LocalDateTime.now(), PURE_DATETIME_PATTERN);
break;
}

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
View File

@@ -12,7 +12,6 @@ import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;