BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 461c7894929ae8b21c40c716143eefacac31189f

Authored by YunaiV
1 parent a0417f18

清理 bpm 用不到的实体、与 convert 方法

Inline Side-by-side
Showing 3 changed files with 3 additions and 139 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
  View file @461c789
... ... @@ -17,12 +17,9 @@ import org.flowable.task.api.Task;
17 17 import org.flowable.task.api.history.HistoricTaskInstance;
18 18 import org.mapstruct.*;
19 19 import org.mapstruct.factory.Mappers;
20   -import org.springframework.beans.BeanUtils;
21 20  
22   -import java.util.Collections;
23 21 import java.util.List;
24 22 import java.util.Map;
25   -import java.util.stream.Collectors;
26 23  
27 24 /**
28 25 * Bpm 任务 Convert
... ... @@ -34,37 +31,9 @@ public interface BpmTaskConvert {
34 31  
35 32 BpmTaskConvert INSTANCE = Mappers.getMapper(BpmTaskConvert.class);
36 33  
37   - /**
38   - * 复制对象
39   - *
40   - * @param source 源 要复制的对象
41   - * @param target 目标 复制到此对象
42   - * @param <T>
43   - *
44   - * @return
45   - */
46   - public static <T> T copy(Object source, Class<T> target) {
47   - if (source == null || target == null) {
48   - return null;
49   - }
50   - try {
51   - T newInstance = target.getDeclaredConstructor().newInstance();
52   - BeanUtils.copyProperties(source, newInstance);
53   - return newInstance;
54   - } catch (Exception e) {
55   - throw new RuntimeException(e);
56   - }
57   - }
58   -
59   - default <T, K> List<K> copyList(List<T> source, Class<K> target) {
60   - if (null == source || source.isEmpty()) {
61   - return Collections.emptyList();
62   - }
63   - return source.stream().map(e -> copy(e, target)).collect(Collectors.toList());
64   - }
65   -
66 34 default List<BpmTaskTodoPageItemRespVO> convertList1(List<Task> tasks,
67   - Map<String, ProcessInstance> processInstanceMap, Map<Long, AdminUserRespDTO> userMap) {
  35 + Map<String, ProcessInstance> processInstanceMap,
  36 + Map<Long, AdminUserRespDTO> userMap) {
68 37 return CollectionUtils.convertList(tasks, task -> {
69 38 BpmTaskTodoPageItemRespVO respVO = convert1(task);
70 39 ProcessInstance processInstance = processInstanceMap.get(task.getProcessInstanceId());
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java deleted
View file @a0417f1
1   -package cn.iocoder.yudao.module.bpm.dal.dataobject.task;
2   -
3   -import com.fasterxml.jackson.annotation.JsonFormat;
4   -import lombok.*;
5   -import org.springframework.format.annotation.DateTimeFormat;
6   -
7   -import java.time.LocalDateTime;
8   -
9   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
10   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
11   -
12   -/**
13   - * 任务流程关联表
14   - *
15   - * @author kemengkai
16   - * @create 2022-05-09 10:33
17   - */
18   -@Data
19   -@AllArgsConstructor
20   -@NoArgsConstructor
21   -public class BpmActivityDO {
22   -
23   - /**
24   - * 任务流程关联id
25   - */
26   - private String id;
27   -
28   - /**
29   - * 审批结果
30   - */
31   - private Integer rev;
32   -
33   - /**
34   - * 任务流程部署id
35   - */
36   - private String procDefId;
37   -
38   - /**
39   - * 任务流程id
40   - */
41   - private String processInstanceId;
42   -
43   - /**
44   - * 任务执行id
45   - */
46   - private String executionId;
47   -
48   - /**
49   - * 任务key
50   - */
51   - private String activityId;
52   -
53   - /**
54   - * 任务id
55   - */
56   - private String taskId;
57   -
58   - /**
59   - * 调用流程id
60   - */
61   - private String callProcInstId;
62   -
63   - /**
64   - * 任务名称
65   - */
66   - private String activityName;
67   -
68   - /**
69   - * 任务类型
70   - */
71   - private String activityType;
72   -
73   - /**
74   - * 任务审批人id
75   - */
76   - private String assignee;
77   -
78   - /**
79   - * 任务开始时间
80   - */
81   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
82   - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
83   - private LocalDateTime startTime;
84   -
85   - /**
86   - * 任务结束时间
87   - */
88   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
89   - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
90   - private LocalDateTime endTime;
91   -
92   - private Integer transactionOrder;
93   -
94   - private LocalDateTime duration;
95   -
96   - /**
97   - * 删除结果
98   - */
99   - private String deleteReason;
100   -
101   - /**
102   - * 租户id
103   - */
104   - private String tenantId;
105   -}
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java
  View file @461c789
... ... @@ -29,8 +29,8 @@ public class ApiAccessLogPageReqVO extends PageParam {
29 29 @Schema(description = "请求地址,模糊匹配", example = "/xxx/yyy")
30 30 private String requestUrl;
31 31  
  32 + @Schema(description = "开始时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
32 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @Schema(description = "开始请求时间")
34 34 private LocalDateTime[] beginTime;
35 35  
36 36 @Schema(description = "执行时长,大于等于，单位：毫秒", example = "100")
... ...