Skip to content

Commit 1f87bb4

Browse files
xlornexlorne
committed
fix #171 
1 parent e5680bd commit 1f87bb4

12 files changed

Lines changed: 179 additions & 17 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<groupId>com.codingapi.springboot</groupId>
1717
<artifactId>springboot-parent</artifactId>
18-
<version>2.10.26</version>
18+
<version>2.10.27</version>
1919

2020
<url>https://github.com/codingapi/springboot-framewrok</url>
2121
<name>springboot-parent</name>

‎springboot-starter-data-authorization/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.26</version>
9+
<version>2.10.27</version>
1010
</parent>
1111

1212
<name>springboot-starter-data-authorization</name>

‎springboot-starter-data-fast/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.10.26</version>
8+
<version>2.10.27</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityClassBuilder.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ private List<AnnotationDescription> buildFieldAnnotations(
168168
}
169169
}
170170

171+
// @Lob 注解
172+
if (columnMeta.isLob()) {
173+
AnnotationDescription.Builder logBuilder =
174+
AnnotationDescription.Builder.ofType(Lob.class);
175+
annotations.add(logBuilder.build());
176+
}
177+
171178
// @Column 注解
172179
AnnotationDescription.Builder columnBuilder =
173180
AnnotationDescription.Builder.ofType(Column.class);

‎springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public static class ColumnMeta {
6868
* 备注
6969
*/
7070
private String comment;
71+
72+
/**
73+
* 是否为lob 对应长内容
74+
*/
75+
private boolean isLob;
76+
7177
/**
7278
* 是否唯一
7379
*/
@@ -92,7 +98,13 @@ public static class ColumnMeta {
9298
* 字段长度
9399
*/
94100
private int length;
101+
/**
102+
* 字段精度
103+
*/
95104
private int precision;
105+
/**
106+
* 字段缩放
107+
*/
96108
private int scale;
97109
}
98110

@@ -138,7 +150,7 @@ public void setTable(String name) {
138150
}
139151

140152
public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnName, GenerationType strategy,
141-
String generator, String comment, boolean unique, boolean nullable,
153+
String generator, String comment, boolean isLob, boolean unique, boolean nullable,
142154
boolean insertable, boolean updatable, String columnDefinition,
143155
int length, int precision, int scale) {
144156
ColumnMeta column = new ColumnMeta();
@@ -150,6 +162,7 @@ public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnNa
150162
generatedValueMeta.setGenerator(generator);
151163
generatedValueMeta.setStrategy(strategy);
152164
column.setGeneratedValue(generatedValueMeta);
165+
column.setLob(isLob);
153166
column.setComment(comment);
154167
column.setUnique(unique);
155168
column.setNullable(nullable);
@@ -162,7 +175,7 @@ public void addPrimaryKeyColumn(Class<?> type, String fieldName, String columnNa
162175
this.columns.add(column);
163176
}
164177

165-
public void addColumn(Class<?> type, String fieldName, String columnName, String comment,
178+
public void addColumn(Class<?> type, String fieldName, String columnName, String comment, boolean isLob,
166179
boolean unique, boolean nullable, boolean insertable,
167180
boolean updatable, String columnDefinition, int length,
168181
int precision, int scale) {
@@ -172,6 +185,7 @@ public void addColumn(Class<?> type, String fieldName, String columnName, String
172185
column.setFieldName(fieldName);
173186
column.setColumnName(columnName);
174187
column.setComment(comment);
188+
column.setLob(isLob);
175189
column.setUnique(unique);
176190
column.setNullable(nullable);
177191
column.setInsertable(insertable);
@@ -184,23 +198,31 @@ public void addColumn(Class<?> type, String fieldName, String columnName, String
184198
}
185199

186200
public void addColumn(Class<?> type, String name, String comment) {
187-
this.addColumn(type, name, name, comment, false, false, false, false, null, 255, 0, 0);
201+
this.addColumn(type, name, name, comment, false, false, true, false, false, null, 255, 0, 0);
202+
}
203+
204+
public void addColumn(Class<?> type, String name, String comment, boolean isLob) {
205+
this.addColumn(type, name, name, comment, isLob, false, true, false, false, null, 255, 0, 0);
206+
}
207+
208+
public void addColumn(Class<?> type, String name, boolean isLob) {
209+
this.addColumn(type, name, name, null, isLob, false, true, false, false, null, 255, 0, 0);
188210
}
189211

190212
public void addColumn(Class<?> type, String name) {
191-
this.addColumn(type, name, name, null, false, false, false, false, null, 255, 0, 0);
213+
this.addColumn(type, name, name, null, false, false, true, false, false, null, 255, 0, 0);
192214
}
193215

194216
public void addPrimaryKeyColumn(Class<?> type, String name) {
195-
this.addPrimaryKeyColumn(type, name, name, null, null, null, false, false, false, false, null, 255, 0, 0);
217+
this.addPrimaryKeyColumn(type, name, name, null, null, null, false, false, false, false, false, null, 255, 0, 0);
196218
}
197219

198220
public void addPrimaryKeyColumn(Class<?> type, String name, GenerationType strategy) {
199-
this.addPrimaryKeyColumn(type, name, name, strategy, null, null, false, false, false, false, null, 255, 0, 0);
221+
this.addPrimaryKeyColumn(type, name, name, strategy, null, null, false, false, false, false, false, null, 255, 0, 0);
200222
}
201223

202224
public void addPrimaryKeyColumn(Class<?> type, String name, GenerationType strategy, String comment) {
203-
this.addPrimaryKeyColumn(type, name, name, strategy, null, comment, false, false, false, false, null, 255, 0, 0);
225+
this.addPrimaryKeyColumn(type, name, name, strategy, null, comment, false, false, false, false, false, null, 255, 0, 0);
204226
}
205227

206228
public void verify() {
@@ -225,4 +247,4 @@ public Class<?> buildClass() {
225247
}
226248

227249

228-
}
250+
}

‎springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/generator/DynamicTableGeneratorQueryTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,15 @@ void generateThenUpdateQuery() throws ClassNotFoundException {
4646
tableEntityMetadata.setTable("test");
4747
tableEntityMetadata.addPrimaryKeyColumn(Long.class, "id", GenerationType.IDENTITY, "主键");
4848
tableEntityMetadata.addColumn(String.class, "name", "姓名");
49+
tableEntityMetadata.addColumn(String.class, "description", "描述",true);
4950

5051
Class<?> entityClass = tableEntityMetadata.buildClass();
5152

53+
dynamicTableGenerator.generateDropTableDDL(entityClass,true);
54+
5255
// 创建表
53-
dynamicTableGenerator.generateMigratorTableDDL(entityClass, true);
56+
String sql = dynamicTableGenerator.generateMigratorTableDDL(entityClass, true);
57+
System.out.println(sql);
5458

5559
// 通过DynamicTableGenerator 动态创建的entity无法通过jpa的 EntityManager进行数据查询处理, 因为Entity不在JPA扫描支持的范围内。
5660
JpaQuery jpaQuery = JpaQueryContext.getInstance().getJpaQuery();
@@ -59,7 +63,7 @@ void generateThenUpdateQuery() throws ClassNotFoundException {
5963
});
6064

6165
// 插入数据
62-
jdbcTemplate.update("insert into test(name) values(?)", "小明");
66+
jdbcTemplate.update("insert into test(name,description) values(?,?)", "小明","123");
6367

6468
// 查询数据
6569
JdbcQuery jdbcQuery = JdbcQueryContext.getInstance().getJdbcQuery();

‎springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/generator/DynamicTableGeneratorTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ void dynamicGenerateTableDDL() {
3939
tableEntityMetadata.setTable("test");
4040
tableEntityMetadata.addPrimaryKeyColumn(Long.class,"id", GenerationType.IDENTITY,"主键");
4141
tableEntityMetadata.addColumn(String.class,"name","姓名");
42+
tableEntityMetadata.addColumn(String.class,"desc","描述",true);
4243

4344
Class<?> entityClass = tableEntityMetadata.buildClass();
4445

‎springboot-starter-flow/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.26</version>
9+
<version>2.10.27</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

‎springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,10 @@ public FlowSubmitResult trySubmitFlow() {
380380

381381
// 是否跳过相同审批人
382382
public boolean isSkipIfSameApprover() {
383-
return flowWork.isSkipIfSameApprover() && !nextNode.isOverNode();
383+
if(nextNode!=null) {
384+
return flowWork.isSkipIfSameApprover() && !nextNode.isOverNode();
385+
}else {
386+
return flowWork.isSkipIfSameApprover();
387+
}
384388
}
385389
}

‎springboot-starter-flow/src/test/java/com/codingapi/springboot/flow/test/FlowSkipSameApproverTest.java‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
package com.codingapi.springboot.flow.test;
2+
3+
import com.codingapi.springboot.flow.bind.BindDataSnapshot;
4+
import com.codingapi.springboot.flow.build.FlowWorkBuilder;
5+
import com.codingapi.springboot.flow.domain.FlowWork;
6+
import com.codingapi.springboot.flow.domain.Opinion;
7+
import com.codingapi.springboot.flow.em.ApprovalType;
8+
import com.codingapi.springboot.flow.flow.Leave;
9+
import com.codingapi.springboot.flow.matcher.OperatorMatcher;
10+
import com.codingapi.springboot.flow.record.FlowRecord;
11+
import com.codingapi.springboot.flow.repository.*;
12+
import com.codingapi.springboot.flow.service.FlowService;
13+
import com.codingapi.springboot.flow.user.User;
14+
import org.junit.jupiter.api.Test;
15+
import org.springframework.data.domain.PageRequest;
16+
17+
import java.util.List;
18+
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
21+
22+
public class FlowSkipSameApproverTest {
23+
24+
private final UserRepository userRepository = new UserRepository();
25+
private final FlowWorkRepository flowWorkRepository = new FlowWorkRepositoryImpl();
26+
private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
27+
private final FlowBindDataRepositoryImpl flowBindDataRepository = new FlowBindDataRepositoryImpl();
28+
private final LeaveRepository leaveRepository = new LeaveRepository();
29+
private final FlowBackupRepository flowBackupRepository = new FlowBackupRepositoryImpl();
30+
private final FlowProcessRepository flowProcessRepository = new FlowProcessRepositoryImpl(flowBackupRepository, userRepository);
31+
private final FlowService flowService = new FlowService(flowWorkRepository, flowRecordRepository, flowBindDataRepository, userRepository, flowProcessRepository, flowBackupRepository);
32+
33+
34+
/**
35+
* 设置跳过审批人且会签时测试
36+
*/
37+
@Test
38+
void test() {
39+
PageRequest pageRequest = PageRequest.of(0, 1000);
40+
41+
User user = new User("张飞");
42+
userRepository.save(user);
43+
44+
User dept = new User("刘备");
45+
userRepository.save(dept);
46+
47+
User boss = new User("诸葛亮");
48+
userRepository.save(boss);
49+
50+
FlowWork flowWork = FlowWorkBuilder.builder(user)
51+
.title("请假流程")
52+
.skipIfSameApprover(true)
53+
.nodes()
54+
.node("开始节点", "start", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
55+
.node("部门负责人审批", "dept", "default", ApprovalType.SIGN, OperatorMatcher.specifyOperatorMatcher(user.getUserId(), boss.getUserId()))
56+
.node("分管领导审批", "office", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(dept.getUserId()))
57+
.node("总经理审批", "manager", "default", ApprovalType.UN_SIGN, OperatorMatcher.specifyOperatorMatcher(boss.getUserId()))
58+
.node("结束节点", "over", "default", ApprovalType.UN_SIGN, OperatorMatcher.anyOperatorMatcher())
59+
.relations()
60+
.relation("部门负责人审批", "start", "dept")
61+
.relation("分管领导审批", "dept", "office")
62+
.relation("总经理审批", "office", "manager")
63+
.relation("结束节点", "manager", "over")
64+
.build();
65+
66+
flowWorkRepository.save(flowWork);
67+
68+
String workCode = flowWork.getCode();
69+
70+
Leave leave = new Leave("我要出去看看");
71+
leaveRepository.save(leave);
72+
73+
// 创建流程
74+
flowService.startFlow(workCode, user, leave, "发起流程");
75+
76+
// 查看我的待办
77+
List<FlowRecord> userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
78+
assertEquals(1, userTodos.size());
79+
80+
// 提交流程
81+
FlowRecord userTodo = userTodos.get(0);
82+
flowService.submitFlow(userTodo.getId(), user, leave, Opinion.pass("同意"));
83+
84+
// 查看部门经理的待办
85+
List<FlowRecord> deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
86+
assertEquals(0, deptTodos.size());
87+
88+
// 查看部门经理的待办
89+
List<FlowRecord> boosTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
90+
assertEquals(1, boosTodos.size());
91+
92+
FlowRecord boosTodo = boosTodos.get(0);
93+
flowService.submitFlow(boosTodo.getId(), boss, leave, Opinion.pass("同意"));
94+
95+
deptTodos = flowRecordRepository.findTodoByOperatorId(dept.getUserId(), pageRequest).getContent();
96+
assertEquals(1, deptTodos.size());
97+
98+
FlowRecord deptTodo = deptTodos.get(0);
99+
flowService.submitFlow(deptTodo.getId(), dept, leave, Opinion.pass("同意"));
100+
101+
boosTodos = flowRecordRepository.findTodoByOperatorId(boss.getUserId(), pageRequest).getContent();
102+
assertEquals(1, boosTodos.size());
103+
104+
boosTodo = boosTodos.get(0);
105+
flowService.submitFlow(boosTodo.getId(), boss, leave, Opinion.pass("同意"));
106+
107+
// 查看所有流程
108+
List<FlowRecord> records = flowRecordRepository.findAll(pageRequest).getContent();
109+
assertEquals(5, records.size());
110+
111+
userTodos = flowRecordRepository.findTodoByOperatorId(user.getUserId(), pageRequest).getContent();
112+
assertEquals(0, userTodos.size());
113+
114+
records = flowRecordRepository.findAll(pageRequest).getContent();
115+
assertEquals(5, records.size());
116+
// 查看所有流程是否都已经结束
117+
assertTrue(records.stream().allMatch(FlowRecord::isFinish));
118+
119+
List<BindDataSnapshot> snapshots = flowBindDataRepository.findAll();
120+
assertEquals(6, snapshots.size());
121+
122+
123+
}
124+
}

0 commit comments

Comments
 (0)