From e870ae252f020b745bb6eb1b0f6f74ff29fa79bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 一月 2025 11:46:41 +0800
Subject: [PATCH] 事件新增日志
---
business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java | 41 ++++++
flowable/src/main/java/com/ycl/service/ProcessLogService.java | 12 +-
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 5
common/src/main/java/com/ycl/common/enums/business/ProcessLogEventTypeEnum.java | 4
flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java | 42 +++---
business/src/main/java/com/ycl/domain/json/DelegateData.java | 2
/dev/null | 33 -----
flowable/src/main/java/com/ycl/mapper/ProcessLogMapper.java | 32 +++++
business/src/main/java/com/ycl/event/event/TaskLogEvent.java | 62 ++++++++++
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 26 +---
flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java | 10 -
flowable/src/main/resources/mapper/ProcessLogMapper.xml | 8
flowable/src/main/java/com/ycl/controller/FlowLogController.java | 10
flowable/src/main/java/com/ycl/domain/query/ProcessLogQuery.java | 2
flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java | 12 +-
15 files changed, 195 insertions(+), 106 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/json/TaskDelegateData.java b/business/src/main/java/com/ycl/domain/json/DelegateData.java
similarity index 94%
rename from business/src/main/java/com/ycl/domain/json/TaskDelegateData.java
rename to business/src/main/java/com/ycl/domain/json/DelegateData.java
index e7cd897..486b19f 100644
--- a/business/src/main/java/com/ycl/domain/json/TaskDelegateData.java
+++ b/business/src/main/java/com/ycl/domain/json/DelegateData.java
@@ -12,7 +12,7 @@
* @date锛�2025/1/2 14:39
*/
@Data
-public class TaskDelegateData {
+public class DelegateData {
/**
* 杞姙鍓嶇殑澶勭悊浜篿d
diff --git a/business/src/main/java/com/ycl/event/event/TaskLogEvent.java b/business/src/main/java/com/ycl/event/event/TaskLogEvent.java
new file mode 100644
index 0000000..076c8dd
--- /dev/null
+++ b/business/src/main/java/com/ycl/event/event/TaskLogEvent.java
@@ -0,0 +1,62 @@
+package com.ycl.event.event;
+
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.context.ApplicationEvent;
+
+
+/**
+ * 杞姙浜嬩欢瀹氫箟
+ *
+ * @author锛歺p
+ * @date锛�2025/1/16 15:04
+ */
+@Getter
+@Setter
+public class TaskLogEvent extends ApplicationEvent {
+
+ /**
+ * 椤圭洰id
+ */
+ private Long projectId;
+
+ /**
+ * 娴佺▼瀹炰緥id
+ */
+ private String processInsId;
+
+ /**
+ * 浠诲姟id
+ */
+ private String taskId;
+
+ /**
+ * 浜嬩欢绫诲瀷
+ */
+ private ProcessLogEventTypeEnum eventType;
+
+ /**
+ * 鍏跺畠鏁版嵁
+ * @see com.ycl.domain.json
+ */
+ private Object otherData;
+
+ /**
+ * 鏋勯��
+ *
+ * @param source 浼爐his鍗冲彲
+ * @param projectId 椤圭洰id
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param taskId 浠诲姟id
+ * @param otherData 鍏跺畠鏁版嵁
+ */
+ public TaskLogEvent(Object source, Long projectId, String processInsId, String taskId, ProcessLogEventTypeEnum eventType, Object otherData) {
+ super(source);
+ this.projectId = projectId;
+ this.processInsId = processInsId;
+ this.eventType = eventType;
+ this.taskId = taskId;
+ this.otherData = otherData;
+ }
+}
diff --git a/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java b/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
new file mode 100644
index 0000000..39736e6
--- /dev/null
+++ b/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
@@ -0,0 +1,41 @@
+package com.ycl.event.listener;
+
+import com.alibaba.fastjson2.JSON;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
+import com.ycl.common.utils.SecurityUtils;
+import com.ycl.domain.entity.ProcessLog;
+import com.ycl.event.event.TaskLogEvent;
+import com.ycl.service.ProcessLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author锛歺p
+ * @date锛�2025/1/16 15:14
+ */
+@Component
+@RequiredArgsConstructor
+public class ProcessLogEventListener {
+
+ private final ProcessLogService processLogService;
+
+ /**
+ * 鐩戝惉娴佺▼鏃ュ織浜嬩欢
+ *
+ * @param event 杞姙鐨勪簨浠跺唴瀹�
+ */
+ @EventListener(classes = {TaskLogEvent.class})
+ public void delegate(TaskLogEvent event) {
+ ProcessLog log = new ProcessLog();
+ log.setEventType(event.getEventType());
+ log.setProcessInsId(event.getProcessInsId());
+ log.setProjectId(event.getProjectId());
+ log.setTaskId(event.getTaskId());
+ log.setUserId(SecurityUtils.getUserId());
+ log.setEventDataJson(JSON.toJSONString(event.getOtherData()));
+ processLogService.save(log);
+ }
+
+
+}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 80790af..15f8119 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,35 +1,28 @@
package com.ycl.service.impl;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.constant.ProcessConstants;
-import com.ycl.common.core.domain.AjaxResult;
import com.ycl.common.core.domain.entity.SysDept;
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
-import com.ycl.common.enums.FlowComment;
-import com.ycl.common.enums.business.FlowLogEventTypeEnum;
import com.ycl.common.enums.business.HandlerTypeEnum;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
import com.ycl.common.enums.business.TaskStatusEnum;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
-import com.ycl.domain.dto.FlowTaskDto;
-import com.ycl.domain.entity.FlowLog;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.entity.ProjectProcess;
-import com.ycl.domain.form.RejectTaskForm;
import com.ycl.domain.form.TaskDelegationForm;
-import com.ycl.domain.json.TaskDelegateData;
+import com.ycl.domain.json.DelegateData;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.IndexCustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
+import com.ycl.event.event.TaskLogEvent;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.mapper.ProjectProcessMapper;
-import com.ycl.service.FlowLogService;
import com.ycl.service.ProjectProcessService;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,18 +44,15 @@
import org.flowable.identitylink.api.IdentityLink;
import org.flowable.identitylink.api.IdentityLinkInfo;
import org.flowable.identitylink.api.IdentityLinkType;
-import org.flowable.identitylink.api.history.HistoricIdentityLink;
import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -89,7 +79,7 @@
private final ISysRoleService sysRoleService;
private final ISysDeptService sysDeptService;
private final TaskCommonService taskCommonService;
- private final FlowLogService flowLogService;
+ private final ApplicationEventPublisher publisher;
/**
* 鍒嗛〉鏌ヨ
@@ -521,7 +511,7 @@
taskService.deleteCandidateGroup(task.getId(), identityLink.getGroupId());
}
}
- TaskDelegateData jsonData = new TaskDelegateData();
+ DelegateData jsonData = new DelegateData();
jsonData.setBeforeHandlerIds(beforeHandlerIds);
jsonData.setBeforeHandlerType(beforeHandlerType);
@@ -566,8 +556,8 @@
}
jsonData.setAfterHandlerIds(afterHandlerIds);
jsonData.setAfterHandlerType(form.getPeopleType());
- // 娣诲姞鏃ュ織
- flowLogService.add(task.getId(), task.getProcessInstanceId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));
+ // 鍙戝竷杞姙浜嬩欢
+ publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), task.getId(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
return Result.ok("杞姙鎴愬姛");
}
diff --git a/common/src/main/java/com/ycl/common/enums/business/FlowLogEventTypeEnum.java b/common/src/main/java/com/ycl/common/enums/business/ProcessLogEventTypeEnum.java
similarity index 85%
rename from common/src/main/java/com/ycl/common/enums/business/FlowLogEventTypeEnum.java
rename to common/src/main/java/com/ycl/common/enums/business/ProcessLogEventTypeEnum.java
index e3bfdce..8e7bc79 100644
--- a/common/src/main/java/com/ycl/common/enums/business/FlowLogEventTypeEnum.java
+++ b/common/src/main/java/com/ycl/common/enums/business/ProcessLogEventTypeEnum.java
@@ -11,7 +11,7 @@
* @date锛�2024/11/29 11:13
*/
@Getter
-public enum FlowLogEventTypeEnum {
+public enum ProcessLogEventTypeEnum {
DELEGATE("DELEGATE", "杞姙"),
FINISHED("FINISHED", "瀹屾垚"),
@@ -26,7 +26,7 @@
private final String desc;
- FlowLogEventTypeEnum(String value, String desc) {
+ ProcessLogEventTypeEnum(String value, String desc) {
this.value = value;
this.desc = desc;
}
diff --git a/flowable/src/main/java/com/ycl/controller/FlowLogController.java b/flowable/src/main/java/com/ycl/controller/FlowLogController.java
index d654862..74cebf8 100644
--- a/flowable/src/main/java/com/ycl/controller/FlowLogController.java
+++ b/flowable/src/main/java/com/ycl/controller/FlowLogController.java
@@ -1,8 +1,8 @@
package com.ycl.controller;
import com.ycl.common.base.Result;
-import com.ycl.domain.query.FlowLogQuery;
-import com.ycl.service.FlowLogService;
+import com.ycl.domain.query.ProcessLogQuery;
+import com.ycl.service.ProcessLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -25,14 +25,14 @@
@RequestMapping("/flow-log")
public class FlowLogController {
- private final FlowLogService flowLogService;
+ private final ProcessLogService processLogService;
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@PreAuthorize("@ss.hasPermi('flowLog:page')")
- public Result page(FlowLogQuery query) {
- return flowLogService.page(query);
+ public Result page(ProcessLogQuery query) {
+ return processLogService.page(query);
}
}
diff --git a/flowable/src/main/java/com/ycl/domain/entity/FlowLog.java b/flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
similarity index 77%
rename from flowable/src/main/java/com/ycl/domain/entity/FlowLog.java
rename to flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
index 4cd774b..641ccad 100644
--- a/flowable/src/main/java/com/ycl/domain/entity/FlowLog.java
+++ b/flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ycl.common.enums.business.FlowLogEventTypeEnum;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
@@ -13,8 +13,8 @@
* @since 2025-01-02
*/
@Data
-@TableName("t_flow_log")
-public class FlowLog extends AbsEntity {
+@TableName("t_process_log")
+public class ProcessLog extends AbsEntity {
private static final long serialVersionUID = 1L;
@@ -24,15 +24,15 @@
@TableField("event_type")
/** 浜嬩欢鏃ュ織绫诲瀷 */
- private FlowLogEventTypeEnum eventType;
+ private ProcessLogEventTypeEnum eventType;
@TableField("project_id")
/** 椤圭洰id */
private Long projectId;
- @TableField("flow_ins_id")
+ @TableField("process_ins_id")
/** 娴佺▼瀹炰緥id */
- private String flowInsId;
+ private String processInsId;
@TableField("user_id")
/** 浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹� */
diff --git a/flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java b/flowable/src/main/java/com/ycl/domain/query/ProcessLogQuery.java
similarity index 91%
rename from flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java
rename to flowable/src/main/java/com/ycl/domain/query/ProcessLogQuery.java
index 124437b..12efd3d 100644
--- a/flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java
+++ b/flowable/src/main/java/com/ycl/domain/query/ProcessLogQuery.java
@@ -17,6 +17,6 @@
*/
@Data
@ApiModel(value = "FlowLog鏌ヨ鍙傛暟", description = "娴佺▼鏃ュ織鏌ヨ鍙傛暟")
-public class FlowLogQuery extends AbsQuery {
+public class ProcessLogQuery extends AbsQuery {
}
diff --git a/flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
similarity index 84%
rename from flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
rename to flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
index 9e66afb..af7ee57 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java
@@ -1,14 +1,12 @@
package com.ycl.domain.vo;
import com.ycl.system.domain.base.AbsVo;
-import com.ycl.domain.entity.FlowLog;
-import java.util.List;
+import com.ycl.domain.entity.ProcessLog;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
/**
* 娴佺▼鏃ュ織灞曠ず
@@ -18,7 +16,7 @@
*/
@Data
@ApiModel(value = "娴佺▼鏃ュ織鍝嶅簲鏁版嵁", description = "娴佺▼鏃ュ織鍝嶅簲鏁版嵁")
-public class FlowLogVO extends AbsVo {
+public class ProcessLogVO extends AbsVo {
/** 浠诲姟id */
@ApiModelProperty("浠诲姟id")
@@ -44,9 +42,9 @@
@ApiModelProperty("浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭�")
private String eventDataJson;
- public static FlowLogVO getVoByEntity(@NonNull FlowLog entity, FlowLogVO vo) {
+ public static ProcessLogVO getVoByEntity(@NonNull ProcessLog entity, ProcessLogVO vo) {
if(vo == null) {
- vo = new FlowLogVO();
+ vo = new ProcessLogVO();
}
BeanUtils.copyProperties(entity, vo);
return vo;
diff --git a/flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java b/flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java
deleted file mode 100644
index 17908f1..0000000
--- a/flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.ycl.mapper;
-
-import com.ycl.domain.entity.FlowLog;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.domain.vo.FlowLogVO;
-import com.ycl.domain.query.FlowLogQuery;
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 娴佺▼鏃ュ織 Mapper 鎺ュ彛
- *
- * @author xp
- * @since 2025-01-02
- */
-@Mapper
-public interface FlowLogMapper extends BaseMapper<FlowLog> {
-
- /**
- * id鏌ユ壘娴佺▼鏃ュ織
- * @param id
- * @return
- */
- FlowLogVO getById(Long id);
-
- /**
- * 鍒嗛〉
- */
- IPage getPage(IPage page, @Param("query") FlowLogQuery query);
-
-}
diff --git a/flowable/src/main/java/com/ycl/mapper/ProcessLogMapper.java b/flowable/src/main/java/com/ycl/mapper/ProcessLogMapper.java
new file mode 100644
index 0000000..1852b82
--- /dev/null
+++ b/flowable/src/main/java/com/ycl/mapper/ProcessLogMapper.java
@@ -0,0 +1,32 @@
+package com.ycl.mapper;
+
+import com.ycl.domain.entity.ProcessLog;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.domain.vo.ProcessLogVO;
+import com.ycl.domain.query.ProcessLogQuery;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 娴佺▼鏃ュ織 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2025-01-02
+ */
+@Mapper
+public interface ProcessLogMapper extends BaseMapper<ProcessLog> {
+
+ /**
+ * id鏌ユ壘娴佺▼鏃ュ織
+ * @param id
+ * @return
+ */
+ ProcessLogVO getById(Long id);
+
+ /**
+ * 鍒嗛〉
+ */
+ IPage getPage(IPage page, @Param("query") ProcessLogQuery query);
+
+}
diff --git a/flowable/src/main/java/com/ycl/service/FlowLogService.java b/flowable/src/main/java/com/ycl/service/ProcessLogService.java
similarity index 74%
rename from flowable/src/main/java/com/ycl/service/FlowLogService.java
rename to flowable/src/main/java/com/ycl/service/ProcessLogService.java
index 1c2727f..442b0fa 100644
--- a/flowable/src/main/java/com/ycl/service/FlowLogService.java
+++ b/flowable/src/main/java/com/ycl/service/ProcessLogService.java
@@ -1,10 +1,10 @@
package com.ycl.service;
-import com.ycl.common.enums.business.FlowLogEventTypeEnum;
-import com.ycl.domain.entity.FlowLog;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
+import com.ycl.domain.entity.ProcessLog;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.common.base.Result;
-import com.ycl.domain.query.FlowLogQuery;
+import com.ycl.domain.query.ProcessLogQuery;
import java.util.List;
/**
@@ -13,7 +13,7 @@
* @author xp
* @since 2025-01-02
*/
-public interface FlowLogService extends IService<FlowLog> {
+public interface ProcessLogService extends IService<ProcessLog> {
/**
* 娣诲姞
@@ -23,7 +23,7 @@
* @param projectId 椤圭洰id
* @param eventDataJson json鎵╁睍鍐呭
*/
- void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson);
+ void add(String taskId, String flowInsId, ProcessLogEventTypeEnum eventType, Long projectId, String eventDataJson);
/**
* 鎵归噺鍒犻櫎
@@ -44,7 +44,7 @@
* @param query
* @return
*/
- Result page(FlowLogQuery query);
+ Result page(ProcessLogQuery query);
/**
* 鏍规嵁id鏌ユ壘
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index 0b762c0..ef68382 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -29,7 +29,7 @@
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.flow.FlowableUtils;
import com.ycl.mapper.ProcessCodingMapper;
-import com.ycl.service.FlowLogService;
+import com.ycl.service.ProcessLogService;
import com.ycl.service.IFlowTaskService;
import com.ycl.service.ISysDeployFormService;
import com.ycl.service.ISysFormService;
@@ -64,7 +64,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
@@ -94,7 +93,7 @@
private final ISysFormService sysFormService;
private final TaskCommonService taskCommonService;
private final ProcessCodingMapper processCodingMapper;
- private final FlowLogService flowLogService;
+ private final ProcessLogService processLogService;
/**
* 瀹屾垚瀹℃牳浠诲姟
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
similarity index 64%
rename from flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
rename to flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
index 1638b47..c9dbe97 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.ycl.common.enums.business.FlowLogEventTypeEnum;
-import com.ycl.domain.entity.FlowLog;
-import com.ycl.mapper.FlowLogMapper;
-import com.ycl.service.FlowLogService;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
+import com.ycl.domain.entity.ProcessLog;
+import com.ycl.mapper.ProcessLogMapper;
+import com.ycl.service.ProcessLogService;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.domain.vo.FlowLogVO;
-import com.ycl.domain.query.FlowLogQuery;
+import com.ycl.domain.vo.ProcessLogVO;
+import com.ycl.domain.query.ProcessLogQuery;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
@@ -27,9 +27,9 @@
*/
@Service
@RequiredArgsConstructor
-public class FlowLogServiceImpl extends ServiceImpl<FlowLogMapper, FlowLog> implements FlowLogService {
+public class ProcessLogServiceImpl extends ServiceImpl<ProcessLogMapper, ProcessLog> implements ProcessLogService {
- private final FlowLogMapper flowLogMapper;
+ private final ProcessLogMapper processLogMapper;
/**
* 娣诲姞鏃ュ織
@@ -40,10 +40,10 @@
* @param eventDataJson json鎵╁睍鍐呭
*/
@Override
- public void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson) {
- FlowLog log = new FlowLog();
+ public void add(String taskId, String flowInsId, ProcessLogEventTypeEnum eventType, Long projectId, String eventDataJson) {
+ ProcessLog log = new ProcessLog();
log.setTaskId(taskId);
- log.setFlowInsId(flowInsId);
+ log.setProcessInsId(flowInsId);
log.setProjectId(projectId);
log.setEventType(eventType);
log.setEventDataJson(eventDataJson);
@@ -78,8 +78,8 @@
* @return
*/
@Override
- public Result page(FlowLogQuery query) {
- IPage<FlowLogVO> page = PageUtil.getPage(query, FlowLogVO.class);
+ public Result page(ProcessLogQuery query) {
+ IPage<ProcessLogVO> page = PageUtil.getPage(query, ProcessLogVO.class);
baseMapper.getPage(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -91,7 +91,7 @@
*/
@Override
public Result detail(Long id) {
- FlowLogVO vo = baseMapper.getById(id);
+ ProcessLogVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
}
@@ -102,19 +102,19 @@
*/
@Override
public Result all() {
- List<FlowLog> entities = baseMapper.selectList(null);
- List<FlowLogVO> vos = entities.stream()
- .map(entity -> FlowLogVO.getVoByEntity(entity, null))
+ List<ProcessLog> entities = baseMapper.selectList(null);
+ List<ProcessLogVO> vos = entities.stream()
+ .map(entity -> ProcessLogVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
return Result.ok().data(vos);
}
@Override
public Boolean taskDelegation(String processInstanceId, String taskId) {
- List<FlowLog> list = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(FlowLog::getFlowInsId, processInstanceId)
- .eq(FlowLog::getTaskId, taskId)
- .eq(FlowLog::getEventType, FlowLogEventTypeEnum.DELEGATE)
+ List<ProcessLog> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProcessLog::getProcessInsId, processInstanceId)
+ .eq(ProcessLog::getTaskId, taskId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.DELEGATE)
.list();
return CollectionUtils.isNotEmpty(list);
}
diff --git a/flowable/src/main/resources/mapper/FlowLogMapper.xml b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
similarity index 86%
rename from flowable/src/main/resources/mapper/FlowLogMapper.xml
rename to flowable/src/main/resources/mapper/ProcessLogMapper.xml
index 5a5c24a..a377afe 100644
--- a/flowable/src/main/resources/mapper/FlowLogMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessLogMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ycl.mapper.FlowLogMapper">
+<mapper namespace="com.ycl.mapper.ProcessLogMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.domain.vo.FlowLogVO">
+ <resultMap id="BaseResultMap" type="com.ycl.domain.vo.ProcessLogVO">
<result column="task_id" property="taskId" />
<result column="event_type" property="eventType" />
<result column="project_id" property="projectId" />
@@ -28,7 +28,7 @@
TFL.event_data_json,
TFL.id
FROM
- t_flow_log TFL
+ t_process_log TFL
WHERE
TFL.id = #{id} AND TFL.deleted = 0
</select>
@@ -44,7 +44,7 @@
TFL.event_data_json,
TFL.id
FROM
- t_flow_log TFL
+ t_process_log TFL
WHERE
TFL.deleted = 0
</select>
--
Gitblit v1.8.0