Skip to content

J
jeecg-workflow
Commit 276e7527 by 赵剑炜
Options

对工作流进行拆分

parent 6a8f85d7
正在显示 包含 294 行增加 和 481 行删除
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/config/GlobalCorsConfig.java deleted 100644 → 0
package org.jeecg.junmpProcess.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
/**
* @author : willian fu
* @version : 1.0
* 设置跨域
*/
@Configuration
public class GlobalCorsConfig {// extends WebMvcConfigurerAdapter {
// @Bean
// public CorsFilter corsFilter() {
//
// CorsConfiguration config = new CorsConfiguration();
// config.addAllowedOriginPattern("*");
// config.setAllowCredentials(true);
// config.addAllowedMethod("OPTIONS");
// config.addAllowedMethod("HEAD");
// config.addAllowedMethod("GET");
// config.addAllowedMethod("PUT");
// config.addAllowedMethod("POST");
// config.addAllowedMethod("DELETE");
// config.addAllowedMethod("PATCH");
// config.addAllowedHeader("*");
// //2.添加映射路径，我们拦截一切请求
// UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
// configSource.registerCorsConfiguration("/**", config);
// return new CorsFilter(configSource);
// }
/*@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowCredentials(true)
.allowedMethods("*")
.allowedOrigins("*")
.allowedHeaders("*")
.maxAge(3600 * 5);
}*/
}
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/config/MybatisPlusConfig.java deleted 100644 → 0
package org.jeecg.junmpProcess.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.autoconfigure.SpringBootVFS;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.github.pagehelper.PageInterceptor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.logging.slf4j.Slf4jImpl;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.type.JdbcType;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import javax.sql.DataSource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
/**
* MybatisPlus配置类
*/
@Slf4j
@Configuration
@ComponentScan("org.jeecg.junmpProcess")
@MapperScan(basePackages = {"org.jeecg.junmpProcess.mapper"})
public class MybatisPlusConfig {
/**
* 对接数据库的实体层
*/
static final String ALIASES_PACKAGE = "org.jeecg.junmpProcess.entity";
@javax.annotation.Resource
private DataSourceProperties dataSourceProperties;
@Primary
@Bean(name = "dataSourceSystem")
public DataSource dataSourceOne() throws Exception{
return druidDataSource();
}
protected DataSource druidDataSource() throws Exception{
DruidDataSource dataSource = new DruidDataSource();
dataSource.setUsername(dataSourceProperties.getUsername());
dataSource.setPassword(dataSourceProperties.getPassword());
dataSource.setUrl(dataSourceProperties.getUrl());
dataSource.setDriverClassName(dataSourceProperties.getDriverClassName());
return dataSource;
}
@Bean(name = "sqlSessionFactorySystem")
public SqlSessionFactory sqlSessionFactoryOne(@Qualifier("dataSourceSystem") DataSource dataSource) throws Exception {
return createSqlSessionFactory(dataSource);
}
public Resource[] resolveMapperLocations() {
ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
List<String> mapperLocations = new ArrayList<>();
mapperLocations.add("classpath:mapper/*/*.xml");
mapperLocations.add("classpath:mapper/*/*/*.xml");
List<Resource> resources = new ArrayList<Resource>();
for (String mapperLocation : mapperLocations) {
try {
Resource[] mappers = resourceResolver.getResources(mapperLocation);
resources.addAll(Arrays.asList(mappers));
} catch (IOException e) {
// ignore
}
}
return resources.toArray(new Resource[0]);
}
public SqlSessionFactory createSqlSessionFactory(DataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
bean.setDataSource(dataSource);
bean.setVfs(SpringBootVFS.class);
bean.setTypeAliasesPackage(ALIASES_PACKAGE);
bean.setMapperLocations(resolveMapperLocations());
bean.setConfiguration(configuration(dataSource));
bean.setPlugins(new Interceptor[]{pageHelper()});
return bean.getObject();
}
public PageInterceptor pageHelper() {
PageInterceptor pageHelper = new PageInterceptor();
// 配置PageHelper参数
Properties properties = new Properties();
properties.setProperty("dialectAlias", "kingbasees8=com.github.pagehelper.dialect.helper.MySqlDialect");
properties.setProperty("autoRuntimeDialect", "true");
properties.setProperty("offsetAsPageNum", "false");
properties.setProperty("rowBoundsWithCount", "false");
properties.setProperty("pageSizeZero", "true");
properties.setProperty("reasonable", "false");
properties.setProperty("supportMethodsArguments", "false");
properties.setProperty("returnPageInfo", "none");
pageHelper.setProperties(properties);
return pageHelper;
}
public MybatisConfiguration configuration(DataSource dataSource){
MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
mybatisConfiguration.setMapUnderscoreToCamelCase(true);
mybatisConfiguration.setCacheEnabled(true);
mybatisConfiguration.setLogImpl(Slf4jImpl.class);
mybatisConfiguration.setJdbcTypeForNull(JdbcType.NULL);
return mybatisConfiguration;
}
@Bean
public IKeyGenerator keyGenerator() {
return new H2KeyGenerator();
}
}
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/config/SwaggerConfig.java deleted 100644 → 0
//package org.jeecg.junmpProcess.config;
//
//import io.swagger.annotations.ApiOperation;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import springfox.documentation.builders.ApiInfoBuilder;
//import springfox.documentation.builders.RequestHandlerSelectors;
//import springfox.documentation.oas.annotations.EnableOpenApi;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spring.web.plugins.Docket;
//
//@Configuration
//@EnableOpenApi
//public class SwaggerConfig {
//
// @Bean
// public Docket loginApi() {
// return new Docket(DocumentationType.OAS_30)
// .apiInfo(apiInfo())
// .pathMapping("/")
// .select() // 选择那些路径和api会生成document
// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// //不显示错误的接口地址
// .build();
// }
//
//
//
//
// private ApiInfo apiInfo() {
// return new ApiInfoBuilder()
// .title("接口文档")
// //描述
// .description("DingDing中台接口文档")
// .version("3.1.0")
// .build();
// }
//
//}
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/common/R.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/common/R.java
package org.jeecg.junmpProcess.common; package org.jeecg.module.junmpProcess.common;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/common/Result.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/common/Result.java
package org.jeecg.junmpProcess.common; package org.jeecg.module.junmpProcess.common;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/common/WorkFlowConstants.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/common/WorkFlowConstants.java
package org.jeecg.junmpProcess.common; package org.jeecg.module.junmpProcess.common;
/** /**
* @author LoveMyOrange * @author LoveMyOrange
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/config/ActivitiConfig.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/config/ActivitiConfig.java
package org.jeecg.junmpProcess.config; package org.jeecg.module.junmpProcess.config;
import org.jeecg.junmpProcess.job.CustomJobHandler; import org.jeecg.module.junmpProcess.job.CustomJobHandler;
import org.jeecg.junmpProcess.job.IdWorkerIdGenerator; import org.jeecg.module.junmpProcess.job.IdWorkerIdGenerator;
import org.flowable.engine.ProcessEngineConfiguration; import org.flowable.engine.ProcessEngineConfiguration;
import org.flowable.engine.cfg.HttpClientConfig; import org.flowable.engine.cfg.HttpClientConfig;
import org.flowable.engine.impl.cfg.DelegateExpressionFieldInjectionMode; import org.flowable.engine.impl.cfg.DelegateExpressionFieldInjectionMode;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/config/IdWorkerConfig.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/config/IdWorkerConfig.java
package org.jeecg.junmpProcess.config; package org.jeecg.module.junmpProcess.config;
import org.jeecg.junmpProcess.utils.IdWorker; import org.jeecg.module.junmpProcess.utils.IdWorker;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/controller/MainProcessController.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/controller/MainProcessController.java
package org.jeecg.junmpProcess.controller; package org.jeecg.module.junmpProcess.controller;
import org.jeecg.junmpProcess.common.Result; import org.jeecg.module.junmpProcess.common.Result;
import org.jeecg.junmpProcess.dto.ApplyDTO; import org.jeecg.module.junmpProcess.dto.ApplyDTO;
import org.jeecg.junmpProcess.dto.HandleDataDTO; import org.jeecg.module.junmpProcess.dto.HandleDataDTO;
import org.jeecg.junmpProcess.dto.StartProcessInstanceDTO; import org.jeecg.module.junmpProcess.dto.StartProcessInstanceDTO;
import org.jeecg.junmpProcess.dto.TaskDTO; import org.jeecg.module.junmpProcess.dto.TaskDTO;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.service.Bussiness.WorkProcessService; import org.jeecg.module.junmpProcess.service.Bussiness.WorkProcessService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.junmpProcess.vo.*; import org.jeecg.module.junmpProcess.vo.HandleDataVO;
import org.jeecg.module.junmpProcess.vo.HistoryProcessInstanceVO;
import org.jeecg.module.junmpProcess.vo.MultiVO;
import org.jeecg.module.junmpProcess.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/controller/OrgUserAndDeptController.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/controller/OrgUserAndDeptController.java
package org.jeecg.junmpProcess.controller; package org.jeecg.module.junmpProcess.controller;
import org.jeecg.junmpProcess.service.Bussiness.OrgUserAndDeptService; import org.jeecg.module.junmpProcess.service.Bussiness.OrgUserAndDeptService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/controller/SettingController.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/controller/SettingController.java
package org.jeecg.junmpProcess.controller; package org.jeecg.module.junmpProcess.controller;
import org.jeecg.junmpProcess.common.R; import org.jeecg.module.junmpProcess.common.R;
import org.jeecg.junmpProcess.dto.FlowEngineDTO; import org.jeecg.module.junmpProcess.dto.FlowEngineDTO;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.service.Bussiness.SettingService; import org.jeecg.module.junmpProcess.service.Bussiness.SettingService;
import org.jeecg.junmpProcess.vo.TemplateGroupVo; import org.jeecg.module.junmpProcess.vo.TemplateGroupVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/controller/WorkspaceProcessController.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/controller/WorkspaceProcessController.java
package org.jeecg.junmpProcess.controller; package org.jeecg.module.junmpProcess.controller;
import org.jeecg.common.util.SpringContextHolder; import org.jeecg.module.junmpProcess.common.Result;
import org.jeecg.junmpProcess.common.Result; import org.jeecg.module.junmpProcess.dto.*;
import org.jeecg.junmpProcess.dto.*; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.FormOperates;
import org.jeecg.junmpProcess.dto.json.FormOperates; import org.jeecg.module.junmpProcess.dto.json.SettingsInfo;
import org.jeecg.junmpProcess.dto.json.SettingsInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import org.jeecg.junmpProcess.dto.json.UserInfo;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.exception.WorkFlowException; import org.jeecg.module.junmpProcess.exception.WorkFlowException;
import org.jeecg.junmpProcess.service.Repository.ProcessTemplateService; import org.jeecg.module.junmpProcess.service.Repository.ProcessTemplateService;
import org.jeecg.junmpProcess.service.Repository.UserService; import org.jeecg.module.junmpProcess.service.Repository.UserService;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
import io.minio.errors.*;
import io.minio.http.Method;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -45,22 +40,16 @@ import org.flowable.engine.task.Comment; ...@@ -45,22 +40,16 @@ import org.flowable.engine.task.Comment;
import org.flowable.task.api.DelegationState; import org.flowable.task.api.DelegationState;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance; import org.flowable.task.api.history.HistoricTaskInstance;
import org.jeecg.junmpProcess.vo.*; import org.jeecg.module.junmpProcess.vo.*;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jeecg.junmpProcess.common.CommonConstants.*; import static org.jeecg.module.junmpProcess.common.CommonConstants.*;
import static org.jeecg.junmpProcess.common.WorkFlowConstants.PROCESS_PREFIX; import static org.jeecg.module.junmpProcess.common.WorkFlowConstants.PROCESS_PREFIX;
import static org.jeecg.junmpProcess.utils.BpmnModelUtils.getChildNode; import static org.jeecg.module.junmpProcess.utils.BpmnModelUtils.getChildNode;
/** /**
* @author : willian fu * @author : willian fu
...@@ -68,7 +57,7 @@ import static org.jeecg.junmpProcess.utils.BpmnModelUtils.getChildNode; ...@@ -68,7 +57,7 @@ import static org.jeecg.junmpProcess.utils.BpmnModelUtils.getChildNode;
*/ */
@RestController @RestController
@RequestMapping("/workspace") @RequestMapping("/workspace")
@Api("和Flowable有关的接口") @Api(tags = "原版flowable")
public class WorkspaceProcessController { public class WorkspaceProcessController {
@Resource @Resource
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/ApplyDTO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/ApplyDTO.java
package org.jeecg.junmpProcess.dto; package org.jeecg.module.junmpProcess.dto;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/FlowDTO.java 0 → 100644
package org.jeecg.modules.junmpProcess.dto;public class FlowDto {
}
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/HandleDataDTO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/HandleDataDTO.java
package org.jeecg.junmpProcess.dto; package org.jeecg.module.junmpProcess.dto;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/PageDTO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/PageDTO.java
package org.jeecg.junmpProcess.dto; package org.jeecg.module.junmpProcess.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/StartProcessInstanceDTO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/StartProcessInstanceDTO.java
package org.jeecg.junmpProcess.dto; package org.jeecg.module.junmpProcess.dto;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/TaskDTO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/TaskDTO.java
package org.jeecg.junmpProcess.dto; package org.jeecg.module.junmpProcess.dto;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/ChildNode.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/ChildNode.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/EmailInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/EmailInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/FormItem.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/FormItem.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/FormOperates.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/FormOperates.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/GroupsInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/GroupsInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/HttpInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/HttpInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/LogoInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/LogoInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/NotifyType.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/NotifyType.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/NotifyTypeInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/NotifyTypeInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/Properties.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/Properties.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/SettingsInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/SettingsInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/dto/json/UserInfo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/UserInfo.java
package org.jeecg.junmpProcess.dto.json; package org.jeecg.module.junmpProcess.dto.json;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/flowJson/FlowApproverGroups.java 0 → 100644
package org.jeecg.modules.junmpProcess.dto.json.flowJson;public class FlowApproverGroups {
}
jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/flowJson/FlowChildNode.java 0 → 100644
package org.jeecg.modules.junmpProcess.dto.json.flowJson;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import org.jeecg.modules.junmpProcess.dto.json.Properties;
import java.util.List;
@Data
public class ChildNode {
private String id;
private String parentId;
private String type;
private String name;
private String desc;
private Properties props;
private org.jeecg.modules.junmpProcess.dto.json.ChildNode children;
private List<org.jeecg.modules.junmpProcess.dto.json.ChildNode> branchs;
private String parallelStr;
private JSONObject incoming=new JSONObject();
private Boolean typeElse;
}
jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/flowJson/FlowConditionNodes.java 0 → 100644
package org.jeecg.modules.junmpProcess.dto.json.flowJson;public class FlowConditionNodes {
}
jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/dto/json/flowJson/FlowNode.java 0 → 100644
package org.jeecg.modules.junmpProcess.dto.json;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.util.List;
@Data
public class FlowNode {
private String id;
private String name;
private int type;
private int status;
private boolean error;
private ChildNode childNode;
private boolean addable;
private String desc;
private Properties props;
private List<ChildNode> branchs;
private String parallelStr;
private JSONObject incoming=new JSONObject();
private Boolean typeElse;
}
\ No newline at end of file
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/Departments.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/Departments.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/FormGroups.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/FormGroups.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/Process.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/Process.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/ProcessTemplates.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/ProcessTemplates.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/TemplateGroup.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/TemplateGroup.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/TemplateGroupBo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/TemplateGroupBo.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/entity/Users.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/entity/Users.java
package org.jeecg.junmpProcess.entity; package org.jeecg.module.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/enums/AssigneeTypeEnums.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/enums/AssigneeTypeEnums.java
package org.jeecg.junmpProcess.enums; package org.jeecg.module.junmpProcess.enums;
/** /**
* @Author:LoveMyOrange * @Author:LoveMyOrange
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/enums/ModeEnums.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/enums/ModeEnums.java
package org.jeecg.junmpProcess.enums; package org.jeecg.module.junmpProcess.enums;
/** /**
* @Author:LoveMyOrange * @Author:LoveMyOrange
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/exception/GlobalExceptionHandlerResolver.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/exception/GlobalExceptionHandlerResolver.java
package org.jeecg.junmpProcess.exception; package org.jeecg.module.junmpProcess.exception;
import org.jeecg.junmpProcess.common.R; import org.jeecg.module.junmpProcess.common.R;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/exception/WorkFlowException.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/exception/WorkFlowException.java
package org.jeecg.junmpProcess.exception; package org.jeecg.module.junmpProcess.exception;
/** /**
* 流程异常封装 * 流程异常封装
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/job/CustomJobCmd.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/job/CustomJobCmd.java
package org.jeecg.junmpProcess.job; package org.jeecg.module.junmpProcess.job;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.Command;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/job/CustomJobHandler.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/job/CustomJobHandler.java
package org.jeecg.junmpProcess.job; package org.jeecg.module.junmpProcess.job;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/job/IdWorkerIdGenerator.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/job/IdWorkerIdGenerator.java
package org.jeecg.junmpProcess.job; package org.jeecg.module.junmpProcess.job;
import org.jeecg.common.util.SpringContextHolder; import org.jeecg.common.util.SpringContextHolder;
import org.jeecg.junmpProcess.utils.IdWorker; import org.jeecg.module.junmpProcess.utils.IdWorker;
import org.flowable.common.engine.impl.cfg.IdGenerator; import org.flowable.common.engine.impl.cfg.IdGenerator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/listener/CounterSignListener.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/listener/CounterSignListener.java
package org.jeecg.junmpProcess.listener; package org.jeecg.module.junmpProcess.listener;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.dto.json.Properties; import org.jeecg.module.junmpProcess.dto.json.Properties;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import org.jeecg.junmpProcess.enums.AssigneeTypeEnums; import org.jeecg.module.junmpProcess.enums.AssigneeTypeEnums;
import org.jeecg.junmpProcess.exception.WorkFlowException; import org.jeecg.module.junmpProcess.exception.WorkFlowException;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -21,8 +21,8 @@ import java.util.ArrayList; ...@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.jeecg.junmpProcess.common.CommonConstants.START_USER_INFO; import static org.jeecg.module.junmpProcess.common.CommonConstants.START_USER_INFO;
import static org.jeecg.junmpProcess.utils.BpmnModelUtils.getChildNode; import static org.jeecg.module.junmpProcess.utils.BpmnModelUtils.getChildNode;
/** /**
* @author LoveMyOrange * @author LoveMyOrange
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/listener/ProcessListener.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/listener/ProcessListener.java
package org.jeecg.junmpProcess.listener; package org.jeecg.module.junmpProcess.listener;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.DelegateExecution;
...@@ -7,8 +7,8 @@ import org.springframework.stereotype.Component; ...@@ -7,8 +7,8 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import static org.jeecg.junmpProcess.common.CommonConstants.BUSINESS_STATUS_4; import static org.jeecg.module.junmpProcess.common.CommonConstants.BUSINESS_STATUS_4;
import static org.jeecg.junmpProcess.common.CommonConstants.PROCESS_STATUS; import static org.jeecg.module.junmpProcess.common.CommonConstants.PROCESS_STATUS;
/** /**
* @author LoveMyOrange * @author LoveMyOrange
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/listener/ServiceListener.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/listener/ServiceListener.java
package org.jeecg.junmpProcess.listener; package org.jeecg.module.junmpProcess.listener;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.DelegateExecution;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/listener/TaskCreatedListener.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/listener/TaskCreatedListener.java
package org.jeecg.junmpProcess.listener; package org.jeecg.module.junmpProcess.listener;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService; import org.flowable.engine.RuntimeService;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/listener/TimerListener.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/listener/TimerListener.java
package org.jeecg.junmpProcess.listener; package org.jeecg.module.junmpProcess.listener;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/mapper/DepartmentsMapper.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/mapper/DepartmentsMapper.java
package org.jeecg.junmpProcess.mapper; package org.jeecg.module.junmpProcess.mapper;
import org.jeecg.junmpProcess.entity.Departments; import org.jeecg.module.junmpProcess.entity.Departments;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/mapper/FormGroupsMapper.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/mapper/FormGroupsMapper.java
package org.jeecg.junmpProcess.mapper; package org.jeecg.module.junmpProcess.mapper;
import org.jeecg.junmpProcess.entity.FormGroups; import org.jeecg.module.junmpProcess.entity.FormGroups;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/mapper/ProcessTemplatesMapper.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/mapper/ProcessTemplatesMapper.java
package org.jeecg.junmpProcess.mapper; package org.jeecg.module.junmpProcess.mapper;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/mapper/TemplateGroupMapper.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/mapper/TemplateGroupMapper.java
package org.jeecg.junmpProcess.mapper; package org.jeecg.module.junmpProcess.mapper;
import org.jeecg.junmpProcess.entity.TemplateGroup; import org.jeecg.module.junmpProcess.entity.TemplateGroup;
import org.jeecg.junmpProcess.entity.TemplateGroupBo; import org.jeecg.module.junmpProcess.entity.TemplateGroupBo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/mapper/UsersMapper.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/mapper/UsersMapper.java
package org.jeecg.junmpProcess.mapper; package org.jeecg.module.junmpProcess.mapper;
import org.jeecg.junmpProcess.entity.Users; import org.jeecg.module.junmpProcess.entity.Users;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/OrgUserAndDeptService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/OrgUserAndDeptService.java
package org.jeecg.junmpProcess.service.Bussiness; package org.jeecg.module.junmpProcess.service.Bussiness;
/** /**
* @author : willian fu * @author : willian fu
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/SettingService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/SettingService.java
package org.jeecg.junmpProcess.service.Bussiness; package org.jeecg.module.junmpProcess.service.Bussiness;
import org.jeecg.junmpProcess.dto.FlowEngineDTO; import org.jeecg.module.junmpProcess.dto.FlowEngineDTO;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.vo.TemplateGroupVo; import org.jeecg.module.junmpProcess.vo.TemplateGroupVo;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/WorkProcessService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/WorkProcessService.java
package org.jeecg.junmpProcess.service.Bussiness; package org.jeecg.module.junmpProcess.service.Bussiness;
import org.jeecg.junmpProcess.common.Result; import org.jeecg.module.junmpProcess.common.Result;
import org.jeecg.junmpProcess.dto.ApplyDTO; import org.jeecg.module.junmpProcess.dto.ApplyDTO;
import org.jeecg.junmpProcess.dto.HandleDataDTO; import org.jeecg.module.junmpProcess.dto.HandleDataDTO;
import org.jeecg.junmpProcess.dto.StartProcessInstanceDTO; import org.jeecg.module.junmpProcess.dto.StartProcessInstanceDTO;
import org.jeecg.junmpProcess.dto.TaskDTO; import org.jeecg.module.junmpProcess.dto.TaskDTO;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.junmpProcess.vo.*; import org.jeecg.module.junmpProcess.vo.HandleDataVO;
import org.jeecg.module.junmpProcess.vo.HistoryProcessInstanceVO;
import org.jeecg.module.junmpProcess.vo.MultiVO;
import org.jeecg.module.junmpProcess.vo.TaskVO;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/impl/OrgUserAndDeptServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/impl/OrgUserAndDeptServiceImpl.java
package org.jeecg.junmpProcess.service.Bussiness.impl; package org.jeecg.module.junmpProcess.service.Bussiness.impl;
import org.jeecg.junmpProcess.common.R; import org.jeecg.module.junmpProcess.common.R;
import org.jeecg.junmpProcess.entity.Departments; import org.jeecg.module.junmpProcess.entity.Departments;
import org.jeecg.junmpProcess.service.Bussiness.OrgUserAndDeptService; import org.jeecg.module.junmpProcess.service.Bussiness.OrgUserAndDeptService;
import org.jeecg.junmpProcess.service.Repository.DepartmentsService; import org.jeecg.module.junmpProcess.service.Repository.DepartmentsService;
import org.jeecg.junmpProcess.service.Repository.UserService; import org.jeecg.module.junmpProcess.service.Repository.UserService;
import org.jeecg.junmpProcess.entity.Users; import org.jeecg.module.junmpProcess.entity.Users;
import org.jeecg.junmpProcess.vo.OrgTreeVo; import org.jeecg.module.junmpProcess.vo.OrgTreeVo;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/impl/SettingServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/impl/SettingServiceImpl.java
package org.jeecg.junmpProcess.service.Bussiness.impl; package org.jeecg.module.junmpProcess.service.Bussiness.impl;
import org.jeecg.common.util.SpringContextHolder; import org.jeecg.common.util.SpringContextHolder;
import org.jeecg.junmpProcess.common.R; import org.jeecg.module.junmpProcess.common.R;
import org.jeecg.junmpProcess.common.WorkFlowConstants; import org.jeecg.module.junmpProcess.common.WorkFlowConstants;
import org.jeecg.junmpProcess.dto.FlowEngineDTO; import org.jeecg.module.junmpProcess.dto.FlowEngineDTO;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.dto.json.SettingsInfo; import org.jeecg.module.junmpProcess.dto.json.SettingsInfo;
import org.jeecg.junmpProcess.entity.FormGroups; import org.jeecg.module.junmpProcess.entity.FormGroups;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.entity.TemplateGroup; import org.jeecg.module.junmpProcess.entity.TemplateGroup;
import org.jeecg.junmpProcess.entity.TemplateGroupBo; import org.jeecg.module.junmpProcess.entity.TemplateGroupBo;
import org.jeecg.junmpProcess.exception.WorkFlowException; import org.jeecg.module.junmpProcess.exception.WorkFlowException;
import org.jeecg.junmpProcess.mapper.TemplateGroupMapper; import org.jeecg.module.junmpProcess.mapper.TemplateGroupMapper;
import org.jeecg.junmpProcess.service.Bussiness.SettingService; import org.jeecg.module.junmpProcess.service.Bussiness.SettingService;
import org.jeecg.junmpProcess.service.Repository.FormGroupService; import org.jeecg.module.junmpProcess.service.Repository.FormGroupService;
import org.jeecg.junmpProcess.service.Repository.ProcessTemplateService; import org.jeecg.module.junmpProcess.service.Repository.ProcessTemplateService;
import org.jeecg.junmpProcess.service.Repository.TemplateGroupService; import org.jeecg.module.junmpProcess.service.Repository.TemplateGroupService;
import org.jeecg.junmpProcess.utils.IdWorker; import org.jeecg.module.junmpProcess.utils.IdWorker;
import org.jeecg.junmpProcess.vo.TemplateGroupVo; import org.jeecg.module.junmpProcess.vo.TemplateGroupVo;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -43,7 +43,7 @@ import javax.annotation.Resource; ...@@ -43,7 +43,7 @@ import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.*; import java.util.*;
import static org.jeecg.junmpProcess.utils.BpmnModelUtils.*; import static org.jeecg.module.junmpProcess.utils.BpmnModelUtils.*;
/** /**
* @author : willian fu * @author : willian fu
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
package org.jeecg.junmpProcess.service.Bussiness.impl; package org.jeecg.module.junmpProcess.service.Bussiness.impl;
import org.jeecg.common.util.SpringContextHolder; import org.jeecg.module.junmpProcess.common.Result;;
import org.jeecg.junmpProcess.common.Result;; import org.jeecg.module.junmpProcess.dto.*;
import org.jeecg.junmpProcess.dto.*; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.FormOperates;
import org.jeecg.junmpProcess.dto.json.FormOperates; import org.jeecg.module.junmpProcess.dto.json.SettingsInfo;
import org.jeecg.junmpProcess.dto.json.SettingsInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.exception.WorkFlowException;
import org.jeecg.junmpProcess.exception.WorkFlowException; import org.jeecg.module.junmpProcess.service.Bussiness.WorkProcessService;
import org.jeecg.junmpProcess.service.Bussiness.WorkProcessService; import org.jeecg.module.junmpProcess.service.Repository.ProcessTemplateService;
import org.jeecg.junmpProcess.service.Repository.ProcessTemplateService;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
import io.minio.errors.*;
import io.minio.http.Method;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.FlowElement;
...@@ -42,23 +37,17 @@ import org.flowable.engine.task.Comment; ...@@ -42,23 +37,17 @@ import org.flowable.engine.task.Comment;
import org.flowable.task.api.DelegationState; import org.flowable.task.api.DelegationState;
import org.flowable.task.api.Task; import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance; import org.flowable.task.api.history.HistoricTaskInstance;
import org.jeecg.junmpProcess.vo.*; import org.jeecg.module.junmpProcess.vo.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jeecg.junmpProcess.common.CommonConstants.*; import static org.jeecg.module.junmpProcess.common.CommonConstants.*;
import static org.jeecg.junmpProcess.common.WorkFlowConstants.PROCESS_PREFIX; import static org.jeecg.module.junmpProcess.common.WorkFlowConstants.PROCESS_PREFIX;
import static org.jeecg.junmpProcess.utils.BpmnModelUtils.getChildNode; import static org.jeecg.module.junmpProcess.utils.BpmnModelUtils.getChildNode;
@Service @Service
public class WorkProcessServiceImpl implements WorkProcessService { public class WorkProcessServiceImpl implements WorkProcessService {
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/DepartmentsService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/DepartmentsService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
import org.jeecg.junmpProcess.entity.Departments; import org.jeecg.module.junmpProcess.entity.Departments;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/FormGroupService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/FormGroupService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
import org.jeecg.junmpProcess.entity.FormGroups; import org.jeecg.module.junmpProcess.entity.FormGroups;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/ProcessTemplateService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/ProcessTemplateService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/TemplateGroupService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/TemplateGroupService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
import org.jeecg.junmpProcess.entity.TemplateGroup; import org.jeecg.module.junmpProcess.entity.TemplateGroup;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/UserService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/UserService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
import org.jeecg.junmpProcess.entity.Users; import org.jeecg.module.junmpProcess.entity.Users;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/WorkspaceProcessService.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/WorkspaceProcessService.java
package org.jeecg.junmpProcess.service.Repository; package org.jeecg.module.junmpProcess.service.Repository;
/** /**
* @author : willian fu * @author : willian fu
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/DepartmentsServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/DepartmentsServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.entity.Departments; import org.jeecg.module.junmpProcess.entity.Departments;
import org.jeecg.junmpProcess.mapper.DepartmentsMapper; import org.jeecg.module.junmpProcess.mapper.DepartmentsMapper;
import org.jeecg.junmpProcess.service.Repository.DepartmentsService; import org.jeecg.module.junmpProcess.service.Repository.DepartmentsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/FormGroupServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/FormGroupServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.entity.FormGroups; import org.jeecg.module.junmpProcess.entity.FormGroups;
import org.jeecg.junmpProcess.mapper.FormGroupsMapper; import org.jeecg.module.junmpProcess.mapper.FormGroupsMapper;
import org.jeecg.junmpProcess.service.Repository.FormGroupService; import org.jeecg.module.junmpProcess.service.Repository.FormGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/ProcessTemplateServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/ProcessTemplateServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import org.jeecg.junmpProcess.mapper.ProcessTemplatesMapper; import org.jeecg.module.junmpProcess.mapper.ProcessTemplatesMapper;
import org.jeecg.junmpProcess.service.Repository.ProcessTemplateService; import org.jeecg.module.junmpProcess.service.Repository.ProcessTemplateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/TemplateGroupServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/TemplateGroupServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.entity.TemplateGroup; import org.jeecg.module.junmpProcess.entity.TemplateGroup;
import org.jeecg.junmpProcess.mapper.TemplateGroupMapper; import org.jeecg.module.junmpProcess.mapper.TemplateGroupMapper;
import org.jeecg.junmpProcess.service.Repository.TemplateGroupService; import org.jeecg.module.junmpProcess.service.Repository.TemplateGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/UserServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/UserServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.entity.Users; import org.jeecg.module.junmpProcess.entity.Users;
import org.jeecg.junmpProcess.mapper.UsersMapper; import org.jeecg.module.junmpProcess.mapper.UsersMapper;
import org.jeecg.junmpProcess.service.Repository.UserService; import org.jeecg.module.junmpProcess.service.Repository.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/service/Repository/impl/WorkspaceProcessServiceImpl.java
package org.jeecg.junmpProcess.service.Repository.impl; package org.jeecg.module.junmpProcess.service.Repository.impl;
import org.jeecg.junmpProcess.service.Bussiness.SettingService; import org.jeecg.module.junmpProcess.service.Bussiness.SettingService;
import org.jeecg.junmpProcess.service.Repository.WorkspaceProcessService; import org.jeecg.module.junmpProcess.service.Repository.WorkspaceProcessService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/BpmnModelUtils.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/BpmnModelUtils.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import org.jeecg.junmpProcess.common.WorkFlowConstants; import org.jeecg.module.junmpProcess.common.WorkFlowConstants;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.dto.json.ConditionInfo; import org.jeecg.module.junmpProcess.dto.json.ConditionInfo;
import org.jeecg.junmpProcess.dto.json.GroupsInfo; import org.jeecg.module.junmpProcess.dto.json.GroupsInfo;
import org.jeecg.junmpProcess.dto.json.Properties; import org.jeecg.module.junmpProcess.dto.json.Properties;
import org.jeecg.junmpProcess.enums.ModeEnums; import org.jeecg.module.junmpProcess.enums.ModeEnums;
import org.jeecg.junmpProcess.exception.WorkFlowException; import org.jeecg.module.junmpProcess.exception.WorkFlowException;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/DateUtils.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/DateUtils.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/ExUtils.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/ExUtils.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/FileUtil.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/FileUtil.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import lombok.Cleanup; import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/IdWorker.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/IdWorker.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.net.InetAddress; import java.net.InetAddress;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/ServletUtil.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/ServletUtil.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/SpringContextHolderV2.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/SpringContextHolderV2.java
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* *
*/ */
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.DisposableBean;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/utils/XSSEscape.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/utils/XSSEscape.java
package org.jeecg.junmpProcess.utils; package org.jeecg.module.junmpProcess.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.owasp.validator.html.AntiSamy; import org.owasp.validator.html.AntiSamy;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/CommentVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/CommentVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/HandleDataVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/HandleDataVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import org.jeecg.junmpProcess.dto.json.ChildNode; import org.jeecg.module.junmpProcess.dto.json.ChildNode;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/HistoryProcessInstanceVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/HistoryProcessInstanceVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/MultiVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/MultiVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/OptionVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/OptionVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/OrgTreeVo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/OrgTreeVo.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/ProcessInstanceDetailVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/ProcessInstanceDetailVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import org.jeecg.junmpProcess.entity.ProcessTemplates; import org.jeecg.module.junmpProcess.entity.ProcessTemplates;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/TaskVO.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/TaskVO.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import org.jeecg.junmpProcess.dto.json.UserInfo; import org.jeecg.module.junmpProcess.dto.json.UserInfo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
jeecg-module-process/src/main/java/org/jeecg/junmpProcess/vo/TemplateGroupVo.java → jeecg-module-process/src/main/java/org/jeecg/modules/junmpProcess/vo/TemplateGroupVo.java
package org.jeecg.junmpProcess.vo; package org.jeecg.module.junmpProcess.vo;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论