ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-14 11:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-02-15 14:25:48 +08:00
parent 71409176cf
commit c45cddd04e
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessEventListener.java
View File

@@ -74,7 +74,7 @@ public class TicketProcessEventListener {
.key(TicketConsts.TICKET_PROCESS_KEY_GROUP)
.description(TicketConsts.TICKET_PROCESS_NAME_GROUP)
.build();
processRequest.setUid(processUid.toLowerCase());
processRequest.setUid(processUid);
processRequest.setContent(groupTicketBpmn20Xml);
processRequest.setOrgUid(orgUid);
ticketProcessRestService.create(processRequest);

9
modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessInitializer.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2025-02-15 13:03:35
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-02-15 13:51:20
* @LastEditTime: 2025-02-15 14:05:34
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -79,7 +79,7 @@ public class TicketProcessInitializer implements SmartInitializingSingleton {
try {
// 读取文件内容
String groupTicketBpmn20Xml = FileUtils.readFileToString(resource.getFile(), "UTF-8");
log.info("groupTicketBpmn20Xml: {}", groupTicketBpmn20Xml);
// log.info("groupTicketBpmn20Xml: {}", groupTicketBpmn20Xml);
// 判断所有组织是否存在 TicketProcessEntity
List<OrganizationEntity> organizations = organizationService.findAll();
for (OrganizationEntity organization : organizations) {
@@ -92,17 +92,18 @@ public class TicketProcessInitializer implements SmartInitializingSingleton {
if (!existingDeployments.isEmpty()) {
log.info("工单流程已存在，跳过部署: tenantId={}", orgUid);
continue;
}
String processUid = orgUid + "_" + TicketConsts.TICKET_PROCESS_KEY_GROUP;
String processUid = (orgUid + "_" + TicketConsts.TICKET_PROCESS_KEY_GROUP).toLowerCase();
// 初始化 TicketProcessEntity
TicketProcessRequest processRequest = TicketProcessRequest.builder()
.name(TicketConsts.TICKET_PROCESS_NAME_GROUP)
.key(TicketConsts.TICKET_PROCESS_KEY_GROUP)
.description(TicketConsts.TICKET_PROCESS_NAME_GROUP)
.build();
processRequest.setUid(processUid.toLowerCase());
processRequest.setUid(processUid);
processRequest.setOrgUid(orgUid);
processRequest.setContent(groupTicketBpmn20Xml);
ticketProcessRestService.create(processRequest);

10
modules/ticket/src/main/java/com/bytedesk/ticket/process/TicketProcessRestService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-11 18:25:45
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-02-15 14:00:26
* @LastEditTime: 2025-02-15 14:03:30
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -87,6 +87,9 @@ public class TicketProcessRestService extends BaseRestService<TicketProcessEntit
if (optional.isPresent()) {
return convertToResponse(optional.get());
}
} else {
// 生成uid
request.setUid(uidUtils.getUid());
}
// 流程key不能重复
Optional<TicketProcessEntity> optionalKey = processRepository.findByKeyAndOrgUid(request.getKey(), request.getOrgUid());
@@ -98,12 +101,11 @@ public class TicketProcessRestService extends BaseRestService<TicketProcessEntit
if (user != null) {
request.setUserUid(user.getUid());
} else {
// 如果用户为空，则设置为系统用户
log.warn("TicketProcessRestService create process, user is null");
// 如果用户为空，则为系统自动创建
}
TicketProcessEntity entity = modelMapper.map(request, TicketProcessEntity.class);
entity.setUid(uidUtils.getUid());
// entity.setUid(uidUtils.getUid()); // 移动到开头
TicketProcessEntity savedEntity = save(entity);
if (savedEntity == null) {