diff --git a/pom.xml b/pom.xml
index c4e125d..72e6815 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,10 +152,22 @@
-
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.4.1
+
+
+ com.baomidou
+ mybatis-plus-generator
+
+
@@ -249,6 +261,7 @@
lombok
1.18.24
+
diff --git a/src/main/java/com/zilber/boot/activiti/listen/ApplyListener.java b/src/main/java/com/zilber/boot/activiti/listen/ApplyListener.java
new file mode 100644
index 0000000..83eb32c
--- /dev/null
+++ b/src/main/java/com/zilber/boot/activiti/listen/ApplyListener.java
@@ -0,0 +1,17 @@
+package com.zilber.boot.activiti.listen;
+
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+
+public class ApplyListener implements ExecutionListener {
+
+ @Override
+ public void notify(DelegateExecution execution) {
+ String eventName = execution.getEventName();
+ if ("start".endsWith(eventName)) {
+ System.out.println("流程 start===");
+ } else if ("end".endsWith(eventName)) {
+ System.out.println("流程 end===");
+ }
+ }
+}
diff --git a/src/main/java/com/zilber/boot/activiti/listen/ApplyTaskListener.java b/src/main/java/com/zilber/boot/activiti/listen/ApplyTaskListener.java
new file mode 100644
index 0000000..e925bff
--- /dev/null
+++ b/src/main/java/com/zilber/boot/activiti/listen/ApplyTaskListener.java
@@ -0,0 +1,23 @@
+package com.zilber.boot.activiti.listen;
+
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+public class ApplyTaskListener implements TaskListener {
+
+ @Override
+ public void notify(DelegateTask delegateTask) {
+ System.out.println("===========进来了==============");
+ String eventName = delegateTask.getEventName();
+ if ("create".endsWith(eventName)) {
+ System.out.println("任务create===" + delegateTask.getName());
+ } else if ("complete".endsWith(eventName)) {
+ System.out.println("任务task complete===" + delegateTask.getName());
+ } else if ("delete".endsWith(eventName)) {
+ System.out.println("任务task delete===" + delegateTask.getName());
+ } else if ("assignment".endsWith(eventName)) {
+ System.out.println("任务task assignment===" + delegateTask.getName());
+ }
+ }
+
+}
diff --git a/src/main/java/com/zilber/boot/activiti/service/TaskService.java b/src/main/java/com/zilber/boot/activiti/service/TaskService.java
index edb444a..f0bcd4e 100644
--- a/src/main/java/com/zilber/boot/activiti/service/TaskService.java
+++ b/src/main/java/com/zilber/boot/activiti/service/TaskService.java
@@ -57,6 +57,7 @@ public class TaskService {
}
if (!StringUtils.isEmpty(dto.getRemark())) {
//taskService.createComment(taskId, task.getProcessInstanceId(), dto.getRemark());
+ taskService.addComment(taskId, task.getProcessInstanceId(), dto.getRemark());
}
Map variables = dto.getVariables();
if (dto.getVariables() == null) {
diff --git a/src/main/java/com/zilber/boot/framework/config/MyBatisConfig.java b/src/main/java/com/zilber/boot/framework/config/MyBatisConfig.java
index 17130bf..5485ade 100644
--- a/src/main/java/com/zilber/boot/framework/config/MyBatisConfig.java
+++ b/src/main/java/com/zilber/boot/framework/config/MyBatisConfig.java
@@ -30,15 +30,15 @@ import java.util.List;
*
* @author lsc
*/
-@Configuration
+//@Configuration
public class MyBatisConfig
{
- @Autowired
- private Environment env;
+ /* @Autowired
+ private Environment env;*/
static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
- public static String setTypeAliasesPackage(String typeAliasesPackage)
+ /* public static String setTypeAliasesPackage(String typeAliasesPackage)
{
ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
@@ -129,5 +129,5 @@ public class MyBatisConfig
sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
return sessionFactory.getObject();
- }
+ }*/
}
\ No newline at end of file
diff --git a/src/main/java/com/zilber/boot/framework/config/MybatisPlusConfig.java b/src/main/java/com/zilber/boot/framework/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..48e4564
--- /dev/null
+++ b/src/main/java/com/zilber/boot/framework/config/MybatisPlusConfig.java
@@ -0,0 +1,57 @@
+package com.zilber.boot.framework.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+public class MybatisPlusConfig {
+
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor()
+ {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ // 分页插件
+ interceptor.addInnerInterceptor(paginationInnerInterceptor());
+ // 乐观锁插件
+ interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+ // 阻断插件
+ interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+ return interceptor;
+ }
+
+ /**
+ * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
+ */
+ public PaginationInnerInterceptor paginationInnerInterceptor()
+ {
+ PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+ // 设置数据库类型为mysql
+ paginationInnerInterceptor.setDbType(DbType.MYSQL);
+ // 设置最大单页限制数量，默认 500 条，-1 不受限制
+ paginationInnerInterceptor.setMaxLimit(-1L);
+ return paginationInnerInterceptor;
+ }
+
+ /**
+ * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
+ */
+ public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor()
+ {
+ return new OptimisticLockerInnerInterceptor();
+ }
+
+ /**
+ * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
+ */
+ public BlockAttackInnerInterceptor blockAttackInnerInterceptor()
+ {
+ return new BlockAttackInnerInterceptor();
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6410efe..6f8df71 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -103,7 +103,7 @@ token:
expireTime: 30
# MyBatis配置
-mybatis:
+mybatis-plus:
# 搜索指定包别名
typeAliasesPackage: com.zilber.boot.**.pojo
# 配置mapper的扫描，找到所有的mapper.xml映射文件
diff --git a/src/main/resources/bpmn/daily.bpmn20.xml b/src/main/resources/bpmn/daily.bpmn20.xml
new file mode 100644
index 0000000..af43d28
--- /dev/null
+++ b/src/main/resources/bpmn/daily.bpmn20.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+ Flow_1jlgqlw
+
+
+
+
+
+
+
+ Flow_1jlgqlw
+ Flow_0ul7x96
+
+
+ Flow_0ul7x96
+ Flow_0v4r83w
+ Flow_1gr0gbv
+
+
+
+ ${day>3}
+
+
+ ${day<=3}
+
+
+ ${status== 1}
+
+
+ ${status==1}
+
+
+ Flow_0f94ru3
+
+
+
+ Flow_1s5r7c7
+
+
+ ${status==0}
+
+
+ Flow_0vre5aw
+
+
+ ${status==0}
+
+
+
+
+
+
+ Flow_1gr0gbv
+ Flow_0kudbee
+ Flow_1s5r7c7
+
+
+
+
+
+
+ Flow_0v4r83w
+ Flow_09xp52x
+ Flow_0vre5aw
+
+
+
+
+
+
+ Flow_0kudbee
+ Flow_09xp52x
+ Flow_0f94ru3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/bpmn/leave.bpmn20.xml b/src/main/resources/bpmn/leave.bpmn20.xml
index b26af30..bb1412c 100644
--- a/src/main/resources/bpmn/leave.bpmn20.xml
+++ b/src/main/resources/bpmn/leave.bpmn20.xml
@@ -1,9 +1,9 @@
-
+
-
-
+
+
@@ -37,4 +37,4 @@
-
+
\ No newline at end of file