diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml index 628a6304..acac14b4 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/pom.xml @@ -2,7 +2,7 @@ - com.flow.demo + com.orangeforms DemoFlow 1.0.0 @@ -16,32 +16,32 @@ - com.flow.demo + com.orangeforms common-redis 1.0.0 - com.flow.demo + com.orangeforms common-online-api 1.0.0 - com.flow.demo + com.orangeforms common-flow-online 1.0.0 - com.flow.demo + com.orangeforms common-log 1.0.0 - com.flow.demo + com.orangeforms common-sequence 1.0.0 - com.flow.demo + com.orangeforms common-datafilter 1.0.0 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/util/FlowDeptPostExtHelper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/util/FlowDeptPostExtHelper.java deleted file mode 100644 index a00a4e8b..00000000 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/util/FlowDeptPostExtHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.flow.demo.webadmin.app.util; - -import cn.hutool.core.collection.CollUtil; -import com.flow.demo.common.flow.util.BaseFlowDeptPostExtHelper; -import com.flow.demo.common.flow.util.FlowCustomExtFactory; -import com.flow.demo.webadmin.upms.service.SysDeptService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import java.util.List; - -/** - * 为流程提供所需的部门岗位等扩展信息的帮助类。如本部门领导岗位和上级部门领导岗位。 - * - * @author Jerry - * @date 2021-06-06 - */ -@Slf4j -@Component -public class FlowDeptPostExtHelper implements BaseFlowDeptPostExtHelper { - - @Autowired - private SysDeptService sysDeptService; - @Autowired - private FlowCustomExtFactory flowCustomExtFactory; - - @PostConstruct - public void doRegister() { - flowCustomExtFactory.registerFlowDeptPostExtHelper(this); - } - - @Override - public Long getLeaderDeptPostId(Long deptId) { - List deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId); - return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0); - } - - @Override - public Long getUpLeaderDeptPostId(Long deptId) { - List deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId); - return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0); - } -} diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/WebAdminApplication.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/WebAdminApplication.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java index 3a1b50b1..b80b6ec9 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/WebAdminApplication.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin; +package com.orangeforms.webadmin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableAsync; DataSourceAutoConfiguration.class, SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) -@ComponentScan("com.flow.demo") +@ComponentScan("com.orangeforms") public class WebAdminApplication { public static void main(String[] args) { diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/controller/AreaCodeController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/controller/AreaCodeController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java index 6d88cd24..f9d34991 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/controller/AreaCodeController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java @@ -1,10 +1,10 @@ -package com.flow.demo.webadmin.app.controller; +package com.orangeforms.webadmin.app.controller; import cn.jimmyshi.beanquery.BeanQuery; -import com.flow.demo.webadmin.app.model.AreaCode; -import com.flow.demo.webadmin.app.service.AreaCodeService; -import com.flow.demo.common.core.object.ResponseResult; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.app.model.AreaCode; +import com.orangeforms.webadmin.app.service.AreaCodeService; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/AreaCodeMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java similarity index 51% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/AreaCodeMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java index 21e069c4..e40d5469 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/AreaCodeMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.app.dao; +package com.orangeforms.webadmin.app.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.model.AreaCode; /** * 行政区划数据操作访问接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml similarity index 75% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml index dd9cdadd..09e629fa 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/model/AreaCode.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/model/AreaCode.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java index bbf3026d..7b280e41 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/model/AreaCode.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin.app.model; +package com.orangeforms.webadmin.app.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/AreaCodeService.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java similarity index 72% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/AreaCodeService.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java index df824c5b..946150d0 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/AreaCodeService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.app.service; +package com.orangeforms.webadmin.app.service; -import com.flow.demo.common.core.base.service.IBaseDictService; -import com.flow.demo.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.base.service.IBaseDictService; +import com.orangeforms.webadmin.app.model.AreaCode; import java.util.Collection; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java similarity index 74% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java index a4d02a74..2a0b8a4d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/service/impl/AreaCodeServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java @@ -1,11 +1,11 @@ -package com.flow.demo.webadmin.app.service.impl; +package com.orangeforms.webadmin.app.service.impl; -import com.flow.demo.webadmin.app.service.AreaCodeService; -import com.flow.demo.webadmin.app.dao.AreaCodeMapper; -import com.flow.demo.webadmin.app.model.AreaCode; -import com.flow.demo.common.core.cache.MapTreeDictionaryCache; -import com.flow.demo.common.core.base.service.BaseDictService; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.app.service.AreaCodeService; +import com.orangeforms.webadmin.app.dao.AreaCodeMapper; +import com.orangeforms.webadmin.app.model.AreaCode; +import com.orangeforms.common.core.cache.MapTreeDictionaryCache; +import com.orangeforms.common.core.base.service.BaseDictService; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java new file mode 100644 index 00000000..520e5ba3 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java @@ -0,0 +1,135 @@ +package com.orangeforms.webadmin.app.util; + +import cn.hutool.core.collection.CollUtil; +import com.orangeforms.common.flow.util.BaseFlowIdentityExtHelper; +import com.orangeforms.common.flow.util.FlowCustomExtFactory; +import com.orangeforms.webadmin.upms.model.SysDept; +import com.orangeforms.webadmin.upms.model.SysUser; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.webadmin.upms.model.SysDeptPost; +import com.orangeforms.webadmin.upms.service.SysDeptService; +import com.orangeforms.webadmin.upms.service.SysUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 为流程提供所需的用户身份相关的等扩展信息的帮助类。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Slf4j +@Component +public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper { + + @Autowired + private SysDeptService sysDeptService; + @Autowired + private SysUserService sysUserService; + @Autowired + private FlowCustomExtFactory flowCustomExtFactory; + + @PostConstruct + public void doRegister() { + flowCustomExtFactory.registerFlowIdentityExtHelper(this); + } + + @Override + public Long getLeaderDeptPostId(Long deptId) { + List deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId); + return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0); + } + + @Override + public Long getUpLeaderDeptPostId(Long deptId) { + List deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId); + return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0); + } + + @Override + public Map getDeptPostIdMap(Long deptId, Set postIdSet) { + Set postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet()); + List deptPostList = sysDeptService.getSysDeptPostList(deptId, postIdSet2); + if (CollUtil.isEmpty(deptPostList)) { + return null; + } + Map resultMap = new HashMap<>(deptPostList.size()); + deptPostList.forEach(sysDeptPost -> + resultMap.put(sysDeptPost.getPostId().toString(), sysDeptPost.getDeptPostId().toString())); + return resultMap; + } + + @Override + public Map getUpDeptPostIdMap(Long deptId, Set postIdSet) { + SysDept sysDept = sysDeptService.getById(deptId); + if (sysDept == null || sysDept.getParentId() == null) { + return null; + } + return getDeptPostIdMap(sysDept.getParentId(), postIdSet); + } + + @Override + public Set getUsernameListByRoleIds(Set roleIdSet) { + Set usernameSet = new HashSet<>(); + Set roleIdSet2 = roleIdSet.stream().map(Long::valueOf).collect(Collectors.toSet()); + SysUser filter = new SysUser(); + filter.setUserStatus(SysUserStatus.STATUS_NORMAL); + for (Long roleId : roleIdSet2) { + List userList = sysUserService.getSysUserListByRoleId(roleId, filter, null); + this.extractAndAppendUsernameList(usernameSet, userList); + } + return usernameSet; + } + + @Override + public Set getUsernameListByDeptIds(Set deptIdSet) { + Set usernameSet = new HashSet<>(); + Set deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet()); + for (Long deptId : deptIdSet2) { + SysUser filter = new SysUser(); + filter.setDeptId(deptId); + filter.setUserStatus(SysUserStatus.STATUS_NORMAL); + List userList = sysUserService.getSysUserList(filter, null); + this.extractAndAppendUsernameList(usernameSet, userList); + } + return usernameSet; + } + + @Override + public Set getUsernameListByPostIds(Set postIdSet) { + Set usernameSet = new HashSet<>(); + Set postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet()); + SysUser filter = new SysUser(); + filter.setUserStatus(SysUserStatus.STATUS_NORMAL); + for (Long postId : postIdSet2) { + List userList = sysUserService.getSysUserListByPostId(postId, filter, null); + this.extractAndAppendUsernameList(usernameSet, userList); + } + return usernameSet; + } + + @Override + public Set getUsernameListByDeptPostIds(Set deptPostIdSet) { + Set usernameSet = new HashSet<>(); + Set deptPostIdSet2 = deptPostIdSet.stream().map(Long::valueOf).collect(Collectors.toSet()); + SysUser filter = new SysUser(); + filter.setUserStatus(SysUserStatus.STATUS_NORMAL); + for (Long deptPostId : deptPostIdSet2) { + List userList = sysUserService.getSysUserListByDeptPostId(deptPostId, filter, null); + this.extractAndAppendUsernameList(usernameSet, userList); + } + return usernameSet; + } + + private void extractAndAppendUsernameList(Set resultUsernameList, List userList) { + List usernameList = userList.stream().map(SysUser::getLoginName).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(usernameList)) { + resultUsernameList.addAll(usernameList); + } + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/vo/AreaCodeVo.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/vo/AreaCodeVo.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java index 7e1051a5..d7a7c5a7 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/vo/AreaCodeVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin.app.vo; +package com.orangeforms.webadmin.app.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/ApplicationConfig.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/ApplicationConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java index 2be23ed5..e872b66c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/ApplicationConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin.config; +package com.orangeforms.webadmin.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/DataSourceType.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/DataSourceType.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java index 92876210..3c5d8e9e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/DataSourceType.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin.config; +package com.orangeforms.webadmin.config; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/FilterConfig.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java similarity index 98% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/FilterConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java index 2e9d2117..bd4d63ce 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/FilterConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.flow.demo.webadmin.config; +package com.orangeforms.webadmin.config; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/InterceptorConfig.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java similarity index 83% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/InterceptorConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java index 854e9fbc..73aa3d0e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/InterceptorConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java @@ -1,6 +1,6 @@ -package com.flow.demo.webadmin.config; +package com.orangeforms.webadmin.config; -import com.flow.demo.webadmin.interceptor.AuthenticationInterceptor; +import com.orangeforms.webadmin.interceptor.AuthenticationInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/MultiDataSourceConfig.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/MultiDataSourceConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java index b7440328..1e4a46c6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/config/MultiDataSourceConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.config; +package com.orangeforms.webadmin.config; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.flow.demo.common.core.config.DynamicDataSource; +import com.orangeforms.common.core.config.DynamicDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -21,7 +21,7 @@ import java.util.Map; */ @Configuration @EnableTransactionManagement -@MapperScan(value = {"com.flow.demo.webadmin.*.dao", "com.flow.demo.common.*.dao"}) +@MapperScan(value = {"com.orangeforms.webadmin.*.dao", "com.orangeforms.common.*.dao"}) public class MultiDataSourceConfig { @Bean(initMethod = "init", destroyMethod = "close") diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/interceptor/AuthenticationInterceptor.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/interceptor/AuthenticationInterceptor.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java index 611a4cca..0ded5cdb 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/interceptor/AuthenticationInterceptor.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java @@ -1,17 +1,17 @@ -package com.flow.demo.webadmin.interceptor; +package com.orangeforms.webadmin.interceptor; import com.alibaba.fastjson.JSON; -import com.flow.demo.webadmin.config.ApplicationConfig; -import com.flow.demo.webadmin.upms.model.SysPermWhitelist; -import com.flow.demo.webadmin.upms.service.SysPermWhitelistService; -import com.flow.demo.webadmin.upms.service.SysPermService; -import com.flow.demo.common.core.annotation.NoAuthInterface; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.ResponseResult; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.util.ApplicationContextHolder; -import com.flow.demo.common.core.util.JwtUtil; -import com.flow.demo.common.core.util.RedisKeyUtil; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.webadmin.upms.service.SysPermWhitelistService; +import com.orangeforms.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.annotation.NoAuthInterface; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.core.util.JwtUtil; +import com.orangeforms.common.core.util.RedisKeyUtil; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java index d51d4551..dfe78c08 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java @@ -1,27 +1,27 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.config.ApplicationConfig; -import com.flow.demo.webadmin.upms.service.*; -import com.flow.demo.webadmin.upms.model.*; -import com.flow.demo.webadmin.upms.model.constant.SysUserStatus; -import com.flow.demo.webadmin.upms.model.constant.SysUserType; -import com.flow.demo.webadmin.upms.model.constant.SysMenuType; -import com.flow.demo.webadmin.upms.model.constant.SysOnlineMenuPermType; -import com.flow.demo.common.online.util.OnlineUtil; -import com.flow.demo.common.online.model.OnlineDatasource; -import com.flow.demo.common.online.service.OnlineDatasourceService; -import com.flow.demo.common.online.api.config.OnlineApiProperties; -import com.flow.demo.common.core.annotation.NoAuthInterface; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ApplicationConstant; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.redis.cache.SessionCacheHelper; +import com.orangeforms.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.model.constant.SysUserStatus; +import com.orangeforms.webadmin.upms.model.constant.SysUserType; +import com.orangeforms.webadmin.upms.model.constant.SysMenuType; +import com.orangeforms.webadmin.upms.model.constant.SysOnlineMenuPermType; +import com.orangeforms.common.online.util.OnlineUtil; +import com.orangeforms.common.online.model.OnlineDatasource; +import com.orangeforms.common.online.service.OnlineDatasourceService; +import com.orangeforms.common.online.api.config.OnlineApiProperties; +import com.orangeforms.common.core.annotation.NoAuthInterface; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.redis.cache.SessionCacheHelper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.redisson.api.RBucket; @@ -58,6 +58,8 @@ public class LoginController { @Autowired private SysPostService sysPostService; @Autowired + private SysRoleService sysRoleService; + @Autowired private SysDataPermService sysDataPermService; @Autowired private OnlineDatasourceService onlineDatasourceService; @@ -206,6 +208,13 @@ public class LoginController { if (CollectionUtils.isNotEmpty(userPostList)) { Set deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet()); tokenData.setDeptPostIds(StringUtils.join(deptPostIdSet, ",")); + Set postIdSet = userPostList.stream().map(SysUserPost::getPostId).collect(Collectors.toSet()); + tokenData.setPostIds(StringUtils.join(postIdSet, ",")); + } + List userRoleList = sysRoleService.getSysUserRoleListByUserId(user.getUserId()); + if (CollectionUtils.isNotEmpty(userRoleList)) { + Set userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet()); + tokenData.setRoleIds(StringUtils.join(userRoleIdSet, ",")); } String sessionIdKey = RedisKeyUtil.makeSessionIdKey(sessionId); String sessionData = JSON.toJSONString(tokenData, SerializerFeature.WriteNonStringValueAsString); diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginUserController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginUserController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java index 7369509e..a0ac1220 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/LoginUserController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java @@ -1,11 +1,11 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.RedisKeyUtil; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.RedisKeyUtil; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDataPermController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDataPermController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java index 7286cdfd..c2ccb7af 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDataPermController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java @@ -1,22 +1,22 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysDataPermDto; -import com.flow.demo.webadmin.upms.dto.SysUserDto; -import com.flow.demo.webadmin.upms.vo.SysDataPermVo; -import com.flow.demo.webadmin.upms.vo.SysUserVo; -import com.flow.demo.webadmin.upms.model.SysDataPerm; -import com.flow.demo.webadmin.upms.model.SysUser; -import com.flow.demo.webadmin.upms.service.SysDataPermService; -import com.flow.demo.webadmin.upms.service.SysUserService; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysDataPermDto; +import com.orangeforms.webadmin.upms.dto.SysUserDto; +import com.orangeforms.webadmin.upms.vo.SysDataPermVo; +import com.orangeforms.webadmin.upms.vo.SysUserVo; +import com.orangeforms.webadmin.upms.model.SysDataPerm; +import com.orangeforms.webadmin.upms.model.SysUser; +import com.orangeforms.webadmin.upms.service.SysDataPermService; +import com.orangeforms.webadmin.upms.service.SysUserService; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDeptController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDeptController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java index b7239dbd..6978e5ee 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysDeptController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java @@ -1,15 +1,15 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.jimmyshi.beanquery.BeanQuery; import com.github.pagehelper.page.PageMethod; -import com.flow.demo.webadmin.upms.vo.*; -import com.flow.demo.webadmin.upms.dto.*; -import com.flow.demo.webadmin.upms.model.*; -import com.flow.demo.webadmin.upms.service.*; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.constant.*; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.vo.*; +import com.orangeforms.webadmin.upms.dto.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -199,6 +199,7 @@ public class SysDeptController { sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId, filter, orderBy); } else { sysPostList = sysPostService.getSysPostList(filter, orderBy); + sysPostService.buildRelationForDataList(sysPostList, MyRelationParam.dictOnly()); } return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE)); } diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysMenuController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysMenuController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java index e742af60..50620d11 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysMenuController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java @@ -1,18 +1,18 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.TypeReference; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysMenuDto; -import com.flow.demo.webadmin.upms.vo.SysMenuVo; -import com.flow.demo.webadmin.upms.model.SysMenu; -import com.flow.demo.webadmin.upms.model.constant.SysMenuType; -import com.flow.demo.webadmin.upms.service.SysMenuService; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysMenuDto; +import com.orangeforms.webadmin.upms.vo.SysMenuVo; +import com.orangeforms.webadmin.upms.model.SysMenu; +import com.orangeforms.webadmin.upms.model.constant.SysMenuType; +import com.orangeforms.webadmin.upms.service.SysMenuService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermCodeController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermCodeController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java index d92dbbf1..49a76e03 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermCodeController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java @@ -1,16 +1,16 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.TypeReference; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysPermCodeDto; -import com.flow.demo.webadmin.upms.vo.SysPermCodeVo; -import com.flow.demo.webadmin.upms.model.SysPermCode; -import com.flow.demo.webadmin.upms.service.SysPermCodeService; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysPermCodeDto; +import com.orangeforms.webadmin.upms.vo.SysPermCodeVo; +import com.orangeforms.webadmin.upms.model.SysPermCode; +import com.orangeforms.webadmin.upms.service.SysPermCodeService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java index 602ea1c0..d1b63293 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java @@ -1,17 +1,17 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysPermDto; -import com.flow.demo.webadmin.upms.vo.SysPermVo; -import com.flow.demo.webadmin.upms.model.SysPerm; -import com.flow.demo.webadmin.upms.service.SysPermService; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysPermDto; +import com.orangeforms.webadmin.upms.vo.SysPermVo; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.service.SysPermService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermModuleController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermModuleController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java index 7d0e96ef..4ac1e067 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPermModuleController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java @@ -1,16 +1,16 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysPermModuleDto; -import com.flow.demo.webadmin.upms.vo.SysPermModuleVo; -import com.flow.demo.webadmin.upms.model.SysPerm; -import com.flow.demo.webadmin.upms.model.SysPermModule; -import com.flow.demo.webadmin.upms.service.SysPermModuleService; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysPermModuleDto; +import com.orangeforms.webadmin.upms.vo.SysPermModuleVo; +import com.orangeforms.webadmin.upms.model.SysPerm; +import com.orangeforms.webadmin.upms.model.SysPermModule; +import com.orangeforms.webadmin.upms.service.SysPermModuleService; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPostController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPostController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java index 008c7401..daecc152 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysPostController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java @@ -1,16 +1,16 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import cn.jimmyshi.beanquery.BeanQuery; import com.github.pagehelper.page.PageMethod; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.constant.*; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.webadmin.upms.dto.SysPostDto; -import com.flow.demo.webadmin.upms.model.SysPost; -import com.flow.demo.webadmin.upms.service.SysPostService; -import com.flow.demo.webadmin.upms.vo.SysPostVo; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.webadmin.upms.dto.SysPostDto; +import com.orangeforms.webadmin.upms.model.SysPost; +import com.orangeforms.webadmin.upms.service.SysPostService; +import com.orangeforms.webadmin.upms.vo.SysPostVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysRoleController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysRoleController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java index f806adbd..a510110e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysRoleController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java @@ -1,23 +1,24 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; +import cn.jimmyshi.beanquery.BeanQuery; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.Page; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; -import com.flow.demo.webadmin.upms.dto.SysRoleDto; -import com.flow.demo.webadmin.upms.dto.SysUserDto; -import com.flow.demo.webadmin.upms.vo.SysRoleVo; -import com.flow.demo.webadmin.upms.vo.SysUserVo; -import com.flow.demo.webadmin.upms.model.SysRole; -import com.flow.demo.webadmin.upms.model.SysUser; -import com.flow.demo.webadmin.upms.model.SysUserRole; -import com.flow.demo.webadmin.upms.service.SysRoleService; -import com.flow.demo.webadmin.upms.service.SysUserService; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.upms.dto.SysRoleDto; +import com.orangeforms.webadmin.upms.dto.SysUserDto; +import com.orangeforms.webadmin.upms.vo.SysRoleVo; +import com.orangeforms.webadmin.upms.vo.SysUserVo; +import com.orangeforms.webadmin.upms.model.SysRole; +import com.orangeforms.webadmin.upms.model.SysUser; +import com.orangeforms.webadmin.upms.model.SysUserRole; +import com.orangeforms.webadmin.upms.service.SysRoleService; +import com.orangeforms.webadmin.upms.service.SysUserService; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.annotation.MyRequestBody; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -285,6 +286,34 @@ public class SysRoleController { return ResponseResult.success(); } + /** + * 以字典形式返回全部角色管理数据集合。字典的键值为[roleId, roleName]。 + * 白名单接口，登录用户均可访问。 + * + * @param filter 过滤对象。 + * @return 应答结果对象，包含的数据为 List>，map中包含两条记录，key的值分别是id和name，value对应具体数据。 + */ + @GetMapping("/listDict") + public ResponseResult>> listDict(SysRole filter) { + List resultList = sysRoleService.getListByFilter(filter); + return ResponseResult.success(BeanQuery.select( + "roleId as id", "roleName as name").executeFrom(resultList)); + } + + /** + * 根据字典Id集合，获取查询后的字典数据。 + * + * @param dictIds 字典Id集合。 + * @return 应答结果对象，包含字典形式的数据集合。 + */ + @PostMapping("/listDictByIds") + public ResponseResult>> listDictByIds( + @MyRequestBody(elementType = Long.class) List dictIds) { + List resultList = sysRoleService.getInList(new HashSet<>(dictIds)); + return ResponseResult.success(BeanQuery.select( + "roleId as id", "roleName as name").executeFrom(resultList)); + } + /** * 查询角色的权限资源地址列表。同时返回详细的分配路径。 * diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysUserController.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java similarity index 95% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysUserController.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java index 6c8373a4..93740918 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/controller/SysUserController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java @@ -1,17 +1,16 @@ -package com.flow.demo.webadmin.upms.controller; +package com.orangeforms.webadmin.upms.controller; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.page.PageMethod; -import com.flow.demo.webadmin.upms.vo.*; -import com.flow.demo.webadmin.upms.dto.*; -import com.flow.demo.webadmin.upms.model.*; -import com.flow.demo.webadmin.upms.service.*; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.constant.*; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.validator.AddGroup; -import com.flow.demo.webadmin.config.ApplicationConfig; +import com.orangeforms.webadmin.upms.vo.*; +import com.orangeforms.webadmin.upms.dto.*; +import com.orangeforms.webadmin.upms.model.*; +import com.orangeforms.webadmin.upms.service.*; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.webadmin.config.ApplicationConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermDeptMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java similarity index 53% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermDeptMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java index 7497a954..93d8028f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermDeptMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDataPermDept; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPermDept; /** * 数据权限与部门关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java index 59612cae..947b3761 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDataPerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPerm; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermUserMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java similarity index 53% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermUserMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java index 9a3b3817..d68eb823 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDataPermUserMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDataPermUser; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDataPermUser; /** * 数据权限与用户关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java similarity index 82% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java index cbbe2407..30fb1c5d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDept; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDept; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptPostMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptPostMapper.java similarity index 79% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptPostMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptPostMapper.java index c405692a..886dc84b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptPostMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptPostMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDeptPost; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDeptPost; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,7 +19,7 @@ public interface SysDeptPostMapper extends BaseDaoMapper { * 获取指定部门Id的部门岗位多对多关联数据列表，以及关联的部门和岗位数据。 * * @param deptId 部门Id。如果参数为空则返回全部数据。 - * @return 部门岗位多对多数量列表。 + * @return 部门岗位多对多数据列表。 */ List> getSysDeptPostListWithRelationByDeptId(@Param("deptId") Long deptId); diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptRelationMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptRelationMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java index 267c4ad3..4c438921 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysDeptRelationMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysDeptRelation; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysDeptRelation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java index c557f90a..3db2362d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysMenu; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysMenu; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java similarity index 53% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java index c4e930ce..cd91f783 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysMenuPermCodeMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysMenuPermCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysMenuPermCode; /** * 菜单与权限字关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodeMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodeMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java index 76711a40..c9fa0469 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodeMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPermCode; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermCode; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodePermMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java similarity index 54% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodePermMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java index 80dae542..bc619a2f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermCodePermMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPermCodePerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermCodePerm; /** * 权限字与权限资源关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java index d8e351b1..be1d2bff 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPerm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPerm; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermModuleMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java similarity index 71% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermModuleMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java index 494eb9ba..dc0e35c2 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermModuleMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPermModule; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermModule; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermWhitelistMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java similarity index 53% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermWhitelistMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java index 803a2c5c..e256c9dc 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPermWhitelistMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPermWhitelist; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPermWhitelist; /** * 权限资源白名单数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPostMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPostMapper.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPostMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPostMapper.java index 1bb63676..38781f51 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysPostMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysPost; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysPost; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java index bb9c5e81..78d026b0 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysRole; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysRole; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMenuMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java similarity index 54% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMenuMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java index 0c141fe3..079256c6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysRoleMenuMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysRoleMenu; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysRoleMenu; /** * 角色与菜单操作关联关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java similarity index 70% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java index 5ecaaa3e..08f9d524 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysUser; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysUser; import org.apache.ibatis.annotations.Param; import java.util.*; @@ -83,6 +83,45 @@ public interface SysUserMapper extends BaseDaoMapper { @Param("sysUserFilter") SysUser sysUserFilter, @Param("orderBy") String orderBy); + /** + * 根据部门岗位Id，获取关联的用户Id列表。 + * + * @param deptPostId 关联的部门岗位Id。 + * @param sysUserFilter 用户过滤条件对象。 + * @param orderBy order by从句的参数。 + * @return 和DeptPostId关联的用户列表。 + */ + List getSysUserListByDeptPostId( + @Param("deptPostId") Long deptPostId, + @Param("sysUserFilter") SysUser sysUserFilter, + @Param("orderBy") String orderBy); + + /** + * 根据部门岗位Id，获取和当前部门岗位Id没有建立多对多关联关系的用户Id列表。 + * + * @param deptPostId 关联的部门岗位Id。 + * @param sysUserFilter 用户过滤条件对象。 + * @param orderBy order by从句的参数。 + * @return 和deptPostId没有建立关联关系的用户列表。 + */ + List getNotInSysUserListByDeptPostId( + @Param("deptPostId") Long deptPostId, + @Param("sysUserFilter") SysUser sysUserFilter, + @Param("orderBy") String orderBy); + + /** + * 根据岗位Id，获取关联的用户Id列表。 + * + * @param postId 关联的岗位Id。 + * @param sysUserFilter 用户过滤条件对象。 + * @param orderBy order by从句的参数。 + * @return 和postId关联的用户列表。 + */ + List getSysUserListByPostId( + @Param("postId") Long postId, + @Param("sysUserFilter") SysUser sysUserFilter, + @Param("orderBy") String orderBy); + /** * 查询用户的权限资源地址列表。同时返回详细的分配路径。 * diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserPostMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserPostMapper.java similarity index 51% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserPostMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserPostMapper.java index c876543d..e044b447 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserPostMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysUserPost; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysUserPost; /** * 用户岗位数据操作访问接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserRoleMapper.java b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java similarity index 53% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserRoleMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java index 93b04971..a5abe77a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/SysUserRoleMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.webadmin.upms.dao; +package com.orangeforms.webadmin.upms.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.webadmin.upms.model.SysUserRole; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.webadmin.upms.model.SysUserRole; /** * 用户与角色关联关系数据访问操作接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml similarity index 64% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml index 22b6372e..d3b228e6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml similarity index 76% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml index b01c1acc..a7cebbe6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -12,10 +12,10 @@ - + + ofType="com.orangeforms.webadmin.upms.model.SysDataPermDept" notNullColumn="dept_id" + resultMap="com.orangeforms.webadmin.upms.dao.SysDataPermDeptMapper.BaseResultMap"> @@ -29,10 +29,10 @@ AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString} - AND zz_sys_data_perm.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - SELECT zz_sys_data_perm.* FROM @@ -45,7 +45,7 @@ - SELECT zz_sys_data_perm.*, zz_sys_data_perm_dept.* diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml similarity index 64% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml index 259f00ad..2530c39f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml index c6700eb7..ef63bdc9 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -41,8 +41,8 @@ - - AND zz_sys_dept.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_sys_dept.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -58,7 +58,7 @@ - SELECT * FROM zz_sys_dept diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptPostMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptPostMapper.xml similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptPostMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptPostMapper.xml index aad5efc8..cf332c9d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptPostMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptPostMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml index 9f7c2093..6dfc6df6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml index 9fb5725d..6aff9bf3 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ AND ur.user_id = #{userId} AND ur.role_id = rm.role_id AND rm.menu_id = m.menu_id - AND m.menu_type <= ${@com.flow.demo.webadmin.upms.model.constant.SysMenuType@TYPE_MENU} + AND m.menu_type <= ${@com.orangeforms.webadmin.upms.model.constant.SysMenuType@TYPE_MENU} ORDER BY m.show_order diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml similarity index 64% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml index 33446247..f3c00688 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml similarity index 95% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml index 84a45935..37ab7fd0 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodeMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml similarity index 64% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml index c2aeef33..2b35a883 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml index eabe9f32..e5fc3aee 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml similarity index 71% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml index 50f93342..b5ae216d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermModuleMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -14,10 +14,10 @@ - + + ofType="com.orangeforms.webadmin.upms.model.SysPerm" notNullColumn="perm_id" + resultMap="com.orangeforms.webadmin.upms.dao.SysPermMapper.BaseResultMap"> @@ -34,9 +34,9 @@ FROM zz_sys_perm_module pm LEFT JOIN - zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - AND pm.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND pm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} ORDER BY pm.show_order, p.show_order diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml similarity index 69% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml index ca7cef02..00d0c6d4 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPostMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml similarity index 82% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPostMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml index 4eb8348e..56fec569 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysPostMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,16 +13,16 @@ - + + notNullColumn="post_id" resultMap="com.orangeforms.webadmin.upms.dao.SysDeptPostMapper.BaseResultMap" /> - - AND zz_sys_post.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_sys_post.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -38,7 +38,7 @@ - SELECT * FROM zz_sys_post diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml index 62b5f581..950a176d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,10 +18,10 @@ AND role_name LIKE #{safeRoleName} - AND deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - SELECT * FROM zz_sys_role diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml similarity index 65% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml index 30fec4eb..6bf30195 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysUserMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml similarity index 83% rename from orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysUserMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml index 7f7a7f88..183b5f4a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/flow/demo/webadmin/upms/dao/mapper/SysUserMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -53,8 +53,8 @@ - - AND zz_sys_user.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + + AND zz_sys_user.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -83,7 +83,7 @@ - SELECT * FROM zz_sys_user @@ -149,6 +149,50 @@ + + + + + + + + + + SELECT a.* FROM zz_flow_message a + + a.task_finished = 0 + AND a.message_type = 0 + + AND a.task_assignee = #{loginName} + + + AND (a.task_assignee = #{loginName} OR EXISTS (SELECT * FROM zz_flow_message_candicate_identity b + WHERE a.message_id = b.message_id AND b.candidate_id in + + #{item} + )) + + + ORDER BY a.update_time DESC + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskCommentMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskCommentMapper.xml similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskCommentMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskCommentMapper.xml index 61cfb2b9..ceb7449d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskCommentMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskCommentMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskExtMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskExtMapper.xml similarity index 62% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskExtMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskExtMapper.xml index e2599500..79b03cd3 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowTaskExtMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowTaskExtMapper.xml @@ -1,13 +1,17 @@ - - + + + + + + @@ -18,7 +22,11 @@ #{item.operationListJson}, #{item.variableListJson}, #{item.assigneeListJson}, - #{item.groupType}) + #{item.groupType}, + #{item.deptPostListJson}, + #{item.roleIds}, + #{item.deptIds}, + #{item.candidateUsernames}) diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowWorkOrderMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowWorkOrderMapper.xml similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowWorkOrderMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowWorkOrderMapper.xml index 0b6f367a..fe1a1ba2 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dao/mapper/FlowWorkOrderMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dao/mapper/FlowWorkOrderMapper.xml @@ -1,13 +1,14 @@ - - + + + @@ -23,7 +24,7 @@ - AND zz_flow_work_order.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND zz_flow_work_order.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} @@ -47,7 +48,7 @@ - SELECT * FROM zz_flow_work_order diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowCategoryDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowCategoryDto.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowCategoryDto.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowCategoryDto.java index 3a2dfca7..e65f631c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowCategoryDto.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowCategoryDto.java @@ -1,6 +1,6 @@ -package com.flow.demo.common.flow.dto; +package com.orangeforms.common.flow.dto; -import com.flow.demo.common.core.validator.UpdateGroup; +import com.orangeforms.common.core.validator.UpdateGroup; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryDto.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryDto.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryDto.java index 733be510..32adb30e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryDto.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryDto.java @@ -1,9 +1,9 @@ -package com.flow.demo.common.flow.dto; +package com.orangeforms.common.flow.dto; -import com.flow.demo.common.core.validator.ConstDictRef; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.flow.model.constant.FlowBindFormType; -import com.flow.demo.common.flow.model.constant.FlowEntryStatus; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.flow.model.constant.FlowBindFormType; +import com.orangeforms.common.flow.model.constant.FlowEntryStatus; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryVariableDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryVariableDto.java similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryVariableDto.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryVariableDto.java index 8913c1ed..890aea29 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowEntryVariableDto.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowEntryVariableDto.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.flow.dto; +package com.orangeforms.common.flow.dto; -import com.flow.demo.common.core.validator.ConstDictRef; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.flow.model.constant.FlowVariableType; +import com.orangeforms.common.core.validator.ConstDictRef; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.flow.model.constant.FlowVariableType; import lombok.Data; import javax.validation.constraints.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowMessageDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowMessageDto.java new file mode 100644 index 00000000..357e3ec9 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowMessageDto.java @@ -0,0 +1,43 @@ +package com.orangeforms.common.flow.dto; + +import lombok.Data; + +/** + * 工作流通知消息Dto对象。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +public class FlowMessageDto { + + /** + * 消息类型。 + */ + private Integer messageType; + + /** + * 工单Id。 + */ + private Long workOrderId; + + /** + * 流程名称。 + */ + private String processDefinitionName; + + /** + * 流程任务名称。 + */ + private String taskName; + + /** + * 更新时间范围过滤起始值(>=)。 + */ + private String updateTimeStart; + + /** + * 更新时间范围过滤结束值(<=)。 + */ + private String updateTimeEnd; +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowTaskCommentDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowTaskCommentDto.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowTaskCommentDto.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowTaskCommentDto.java index dcca41b7..d7941c8a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowTaskCommentDto.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowTaskCommentDto.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.dto; +package com.orangeforms.common.flow.dto; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowWorkOrderDto.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowWorkOrderDto.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowWorkOrderDto.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowWorkOrderDto.java index 5c57e6b9..d74758f9 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/dto/FlowWorkOrderDto.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/dto/FlowWorkOrderDto.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.dto; +package com.orangeforms.common.flow.dto; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/exception/FlowOperationException.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/exception/FlowOperationException.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/exception/FlowOperationException.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/exception/FlowOperationException.java index d615c2a9..5ba2929b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/exception/FlowOperationException.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/exception/FlowOperationException.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.exception; +package com.orangeforms.common.flow.exception; /** * 流程操作异常。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/DeptPostLeaderListener.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/DeptPostLeaderListener.java similarity index 60% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/DeptPostLeaderListener.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/DeptPostLeaderListener.java index 244ef953..8c6de163 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/DeptPostLeaderListener.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/DeptPostLeaderListener.java @@ -1,12 +1,9 @@ -package com.flow.demo.common.flow.listener; +package com.orangeforms.common.flow.listener; -import com.flow.demo.common.core.util.ApplicationContextHolder; -import com.flow.demo.common.flow.constant.FlowConstant; -import com.flow.demo.common.flow.service.FlowApiService; +import com.orangeforms.common.flow.constant.FlowConstant; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.activiti.engine.history.HistoricProcessInstance; import java.util.Map; @@ -20,12 +17,8 @@ import java.util.Map; @Slf4j public class DeptPostLeaderListener implements TaskListener { - private final FlowApiService flowApiService = ApplicationContextHolder.getBean(FlowApiService.class); - @Override public void notify(DelegateTask delegateTask) { - HistoricProcessInstance instance = - flowApiService.getHistoricProcessInstance(delegateTask.getProcessInstanceId()); Map variables = delegateTask.getVariables(); if (variables.get(FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR) == null) { delegateTask.setAssignee(variables.get(FlowConstant.PROC_INSTANCE_START_USER_NAME_VAR).toString()); diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/FlowFinishedListener.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/FlowFinishedListener.java new file mode 100644 index 00000000..6faee6e3 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/FlowFinishedListener.java @@ -0,0 +1,41 @@ +package com.orangeforms.common.flow.listener; + +import cn.hutool.core.util.StrUtil; +import com.orangeforms.common.core.util.ApplicationContextHolder; +import com.orangeforms.common.flow.model.FlowWorkOrder; +import com.orangeforms.common.flow.service.FlowWorkOrderService; +import com.orangeforms.common.flow.constant.FlowTaskStatus; +import com.orangeforms.common.flow.util.FlowCustomExtFactory; +import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.delegate.DelegateExecution; +import org.activiti.engine.delegate.ExecutionListener; + +/** + * 流程实例监听器，在流程实例结束的时候，需要完成一些自定义的业务行为。如： + * 1. 更新流程工单表的审批状态字段。 + * 2. 业务数据同步。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Slf4j +public class FlowFinishedListener implements ExecutionListener { + + private final FlowWorkOrderService flowWorkOrderService = + ApplicationContextHolder.getBean(FlowWorkOrderService.class); + private final FlowCustomExtFactory flowCustomExtFactory = + ApplicationContextHolder.getBean(FlowCustomExtFactory.class); + + @Override + public void notify(DelegateExecution execution) { + if (!StrUtil.equals("end", execution.getEventName())) { + return; + } + String processInstanceId = execution.getProcessInstanceId(); + flowWorkOrderService.updateFlowStatusByProcessInstanceId(processInstanceId, FlowTaskStatus.FINISHED); + String businessKey = execution.getProcessInstanceBusinessKey(); + FlowWorkOrder workOrder = flowWorkOrderService.getFlowWorkOrderByProcessInstanceId(processInstanceId); + flowCustomExtFactory.getDataSyncExtHelper() + .triggerSync(workOrder.getProcessDefinitionKey(), processInstanceId, businessKey); + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/UpDeptPostLeaderListener.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/UpDeptPostLeaderListener.java similarity index 61% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/UpDeptPostLeaderListener.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/UpDeptPostLeaderListener.java index 6fc6ad01..09d9c963 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/listener/UpDeptPostLeaderListener.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/listener/UpDeptPostLeaderListener.java @@ -1,12 +1,9 @@ -package com.flow.demo.common.flow.listener; +package com.orangeforms.common.flow.listener; -import com.flow.demo.common.core.util.ApplicationContextHolder; -import com.flow.demo.common.flow.constant.FlowConstant; -import com.flow.demo.common.flow.service.FlowApiService; +import com.orangeforms.common.flow.constant.FlowConstant; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.activiti.engine.history.HistoricProcessInstance; import java.util.Map; @@ -20,12 +17,8 @@ import java.util.Map; @Slf4j public class UpDeptPostLeaderListener implements TaskListener { - private final FlowApiService flowApiService = ApplicationContextHolder.getBean(FlowApiService.class); - @Override public void notify(DelegateTask delegateTask) { - HistoricProcessInstance instance = - flowApiService.getHistoricProcessInstance(delegateTask.getProcessInstanceId()); Map variables = delegateTask.getVariables(); if (variables.get(FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR) == null) { delegateTask.setAssignee(variables.get(FlowConstant.PROC_INSTANCE_START_USER_NAME_VAR).toString()); diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowCategory.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowCategory.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowCategory.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowCategory.java index f5114eca..afdaeb2a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowCategory.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowCategory.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.base.mapper.BaseModelMapper; -import com.flow.demo.common.flow.vo.FlowCategoryVo; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.vo.FlowCategoryVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntry.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntry.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntry.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntry.java index 342747a4..01011dbc 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntry.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntry.java @@ -1,9 +1,9 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.annotation.RelationOneToOne; -import com.flow.demo.common.core.base.mapper.BaseModelMapper; -import com.flow.demo.common.flow.vo.FlowEntryVo; +import com.orangeforms.common.core.annotation.RelationOneToOne; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.vo.FlowEntryVo; import lombok.Data; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -136,8 +136,8 @@ public class FlowEntry { * @param flowEntryVo 域对象。 * @return 实体对象。 */ - @Mapping(target = "mainFlowEntryPublish", expression = "java(mapToBean(flowEntryVo.getMainFlowEntryPublish(), com.flow.demo.common.flow.model.FlowEntryPublish.class))") - @Mapping(target = "flowCategory", expression = "java(mapToBean(flowEntryVo.getFlowCategory(), com.flow.demo.common.flow.model.FlowCategory.class))") + @Mapping(target = "mainFlowEntryPublish", expression = "java(mapToBean(flowEntryVo.getMainFlowEntryPublish(), com.orangeforms.common.flow.model.FlowEntryPublish.class))") + @Mapping(target = "flowCategory", expression = "java(mapToBean(flowEntryVo.getFlowCategory(), com.orangeforms.common.flow.model.FlowCategory.class))") @Override FlowEntry toModel(FlowEntryVo flowEntryVo); /** diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublish.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublish.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublish.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublish.java index 41d621e0..06ea593a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublish.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublish.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublishVariable.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublishVariable.java similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublishVariable.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublishVariable.java index 5b7ef76b..53b45554 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryPublishVariable.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryPublishVariable.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryVariable.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryVariable.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryVariable.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryVariable.java index 5c43391f..e56aeb1f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowEntryVariable.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowEntryVariable.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.base.mapper.BaseModelMapper; -import com.flow.demo.common.flow.vo.FlowEntryVariableVo; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.vo.FlowEntryVariableVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessage.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessage.java new file mode 100644 index 00000000..9931b000 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessage.java @@ -0,0 +1,154 @@ +package com.orangeforms.common.flow.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.vo.FlowMessageVo; +import lombok.Data; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.Date; + +/** + * 工作流通知消息实体对象。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +@TableName(value = "zz_flow_message") +public class FlowMessage { + + /** + * 主键Id。 + */ + @TableId(value = "message_id") + private Long messageId; + + /** + * 消息类型。 + */ + @TableField(value = "message_type") + private Integer messageType; + + /** + * 消息内容。 + */ + @TableField(value = "message_content") + private String messageContent; + + /** + * 催办次数。 + */ + @TableField(value = "remind_count") + private Integer remindCount; + + /** + * 工单Id。 + */ + @TableField(value = "work_order_id") + private Long workOrderId; + + /** + * 流程定义Id。 + */ + @TableField(value = "process_definition_id") + private String processDefinitionId; + + /** + * 流程定义标识。 + */ + @TableField(value = "process_definition_key") + private String processDefinitionKey; + + /** + * 流程名称。 + */ + @TableField(value = "process_definition_name") + private String processDefinitionName; + + /** + * 流程实例Id。 + */ + @TableField(value = "process_instance_id") + private String processInstanceId; + + /** + * 流程实例发起者。 + */ + @TableField(value = "process_instance_initiator") + private String processInstanceInitiator; + + /** + * 流程任务Id。 + */ + @TableField(value = "task_id") + private String taskId; + + /** + * 流程任务定义标识。 + */ + @TableField(value = "task_definition_key") + private String taskDefinitionKey; + + /** + * 流程任务名称。 + */ + @TableField(value = "task_name") + private String taskName; + + /** + * 创建时间。 + */ + @TableField(value = "task_start_time") + private Date taskStartTime; + + /** + * 任务指派人登录名。 + */ + @TableField(value = "task_assignee") + private String taskAssignee; + + /** + * 任务是否已完成。 + */ + @TableField(value = "task_finished") + private Boolean taskFinished; + + /** + * 更新时间。 + */ + @TableField(value = "update_time") + private Date updateTime; + + /** + * 更新者Id。 + */ + @TableField(value = "update_user_id") + private Long updateUserId; + + /** + * 创建时间。 + */ + @TableField(value = "create_time") + private Date createTime; + + /** + * 创建者Id。 + */ + @TableField(value = "create_user_id") + private Long createUserId; + + /** + * 创建者显示名。 + */ + @TableField(value = "create_username") + private String createUsername; + + @Mapper + public interface FlowMessageModelMapper extends BaseModelMapper { + } + public static final FlowMessage.FlowMessageModelMapper INSTANCE = Mappers.getMapper(FlowMessage.FlowMessageModelMapper.class); +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessageCandidateIdentity.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessageCandidateIdentity.java new file mode 100644 index 00000000..b35c13af --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowMessageCandidateIdentity.java @@ -0,0 +1,41 @@ +package com.orangeforms.common.flow.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 流程任务消息的候选身份实体对象。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +@TableName(value = "zz_flow_message_candicate_identity") +public class FlowMessageCandidateIdentity { + + /** + * 主键Id。 + */ + @TableId(value = "id") + private Long id; + + /** + * 任务消息Id。 + */ + @TableField(value = "message_id") + private Long messageId; + + /** + * 候选身份类型。 + */ + @TableField(value = "candidate_type") + private String candidateType; + + /** + * 候选身份Id。 + */ + @TableField(value = "candidate_id") + private String candidateId; +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskComment.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskComment.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskComment.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskComment.java index 4e5153eb..c432a115 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskComment.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskComment.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.base.mapper.BaseModelMapper; -import com.flow.demo.common.flow.vo.FlowTaskCommentVo; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.vo.FlowTaskCommentVo; import lombok.Data; import lombok.NoArgsConstructor; import org.activiti.engine.task.TaskInfo; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskExt.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskExt.java similarity index 64% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskExt.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskExt.java index 5b7791b6..57588843 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowTaskExt.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowTaskExt.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -48,4 +48,28 @@ public class FlowTaskExt { */ @TableField(value = "group_type") private String groupType; + + /** + * 保存岗位相关的数据。 + */ + @TableField(value = "dept_post_list_json") + private String deptPostListJson; + + /** + * 逗号分隔的角色Id。 + */ + @TableField(value = "role_ids") + private String roleIds; + + /** + * 逗号分隔的部门Id。 + */ + @TableField(value = "dept_ids") + private String deptIds; + + /** + * 逗号分隔候选用户名。 + */ + @TableField(value = "candidate_usernames") + private String candidateUsernames; } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowWorkOrder.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowWorkOrder.java similarity index 83% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowWorkOrder.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowWorkOrder.java index dc41ce0b..a1de1f81 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/FlowWorkOrder.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/FlowWorkOrder.java @@ -1,11 +1,12 @@ -package com.flow.demo.common.flow.model; +package com.orangeforms.common.flow.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.annotation.DeptFilterColumn; -import com.flow.demo.common.core.annotation.RelationConstDict; -import com.flow.demo.common.core.base.mapper.BaseModelMapper; -import com.flow.demo.common.flow.constant.FlowTaskStatus; -import com.flow.demo.common.flow.vo.FlowWorkOrderVo; +import com.orangeforms.common.core.annotation.DeptFilterColumn; +import com.orangeforms.common.core.annotation.UserFilterColumn; +import com.orangeforms.common.core.annotation.RelationConstDict; +import com.orangeforms.common.core.base.mapper.BaseModelMapper; +import com.orangeforms.common.flow.constant.FlowTaskStatus; +import com.orangeforms.common.flow.vo.FlowWorkOrderVo; import lombok.Data; import org.mapstruct.*; import org.mapstruct.factory.Mappers; @@ -59,6 +60,12 @@ public class FlowWorkOrder { @TableField(value = "online_table_id") private Long onlineTableId; + /** + * 静态表单所使用的数据表名。 + */ + @TableField(value = "table_name") + private String tableName; + /** * 业务主键值。 */ @@ -105,6 +112,7 @@ public class FlowWorkOrder { /** * 创建者Id。 */ + @UserFilterColumn @TableField(value = "create_user_id") private Long createUserId; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowBindFormType.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowBindFormType.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowBindFormType.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowBindFormType.java index b9f13da9..e0a1f12f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowBindFormType.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowBindFormType.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model.constant; +package com.orangeforms.common.flow.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowEntryStatus.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowEntryStatus.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowEntryStatus.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowEntryStatus.java index b33e4858..8e272f9f 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowEntryStatus.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowEntryStatus.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model.constant; +package com.orangeforms.common.flow.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowMessageType.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowMessageType.java new file mode 100644 index 00000000..3a9a66f8 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowMessageType.java @@ -0,0 +1,39 @@ +package com.orangeforms.common.flow.model.constant; + +import java.util.HashMap; +import java.util.Map; + +/** + * 工作流消息类型。 + * + * @author Jerry + * @date 2021-06-06 + */ +public final class FlowMessageType { + + /** + * 催办消息。 + */ + public static final int REMIND_TYPE = 0; + + private static final Map DICT_MAP = new HashMap<>(2); + static { + DICT_MAP.put(REMIND_TYPE, "催办消息"); + } + + /** + * 判断参数是否为当前常量字典的合法值。 + * + * @param value 待验证的参数值。 + * @return 合法返回true，否则false。 + */ + public static boolean isValid(Integer value) { + return value != null && DICT_MAP.containsKey(value); + } + + /** + * 私有构造函数，明确标识该常量类的作用。 + */ + private FlowMessageType() { + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowVariableType.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowVariableType.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowVariableType.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowVariableType.java index d54fa2f9..0334e3b8 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/model/constant/FlowVariableType.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/model/constant/FlowVariableType.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.model.constant; +package com.orangeforms.common.flow.model.constant; import java.util.HashMap; import java.util.Map; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskMultiSignAssign.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskMultiSignAssign.java new file mode 100644 index 00000000..a69195b2 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskMultiSignAssign.java @@ -0,0 +1,28 @@ +package com.orangeforms.common.flow.object; + +import lombok.Data; + +/** + * 表示多实例任务的指派人信息。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +public class FlowTaskMultiSignAssign { + + public static final String ASSIGN_TYPE_USER = "USER_GROUP"; + public static final String ASSIGN_TYPE_ROLE = "ROLE_GROUP"; + public static final String ASSIGN_TYPE_DEPT = "DEPT_GROUP"; + public static final String ASSIGN_TYPE_POST = "POST_GROUP"; + public static final String ASSIGN_TYPE_DEPT_POST = "DEPT_POST_GROUP"; + + /** + * 指派人类型。 + */ + private String assigneeType; + /** + * 逗号分隔的指派人列表。 + */ + private String assigneeList; +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskOperation.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskOperation.java new file mode 100644 index 00000000..2004a5b4 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskOperation.java @@ -0,0 +1,34 @@ +package com.orangeforms.common.flow.object; + +import lombok.Data; + +/** + * 流程图中的用户任务操作数据。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +public class FlowTaskOperation { + + /** + * 操作Id。 + */ + private String id; + /** + * 操作的标签名。 + */ + private String label; + /** + * 操作类型。 + */ + private String type; + /** + * 显示顺序。 + */ + private Integer showOrder; + /** + * 在流程图中定义的多实例会签的指定人员信息。 + */ + private FlowTaskMultiSignAssign multiSignAssignee; +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskPostCandidateGroup.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskPostCandidateGroup.java new file mode 100644 index 00000000..ecd9a27b --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/object/FlowTaskPostCandidateGroup.java @@ -0,0 +1,61 @@ +package com.orangeforms.common.flow.object; + +import com.orangeforms.common.flow.constant.FlowConstant; +import lombok.Data; + +import java.util.LinkedList; +import java.util.List; + +/** + * 流程任务岗位候选组数据。仅用于流程任务的候选组类型为岗位时。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +public class FlowTaskPostCandidateGroup { + + /** + * 唯一值，目前仅前端使用。 + */ + private String id; + /** + * 岗位类型。 + * 1. 所有部门岗位审批变量，值为 (allDeptPost)。 + * 2. 本部门岗位审批变量，值为 (selfDeptPost)。 + * 3. 上级部门岗位审批变量，值为 (upDeptPost)。 + * 4. 任意部门关联的岗位审批变量，值为 (deptPost)。 + */ + private String type; + /** + * 岗位Id。type为(1,2,3)时使用该值。 + */ + private String postId; + /** + * 部门岗位Id。type为(4)时使用该值。 + */ + private String deptPostId; + + public static List buildCandidateGroupList(List groupDataList) { + List candidateGroupList = new LinkedList<>(); + for (FlowTaskPostCandidateGroup groupData : groupDataList) { + switch (groupData.getType()) { + case FlowConstant.GROUP_TYPE_ALL_DEPT_POST_VAR: + candidateGroupList.add(groupData.getPostId()); + break; + case FlowConstant.GROUP_TYPE_DEPT_POST_VAR: + candidateGroupList.add(groupData.getDeptPostId()); + break; + case FlowConstant.GROUP_TYPE_SELF_DEPT_POST_VAR: + candidateGroupList.add("${" + FlowConstant.SELF_DEPT_POST_PREFIX + groupData.getPostId() + "}"); + break; + case FlowConstant.GROUP_TYPE_UP_DEPT_POST_VAR: + candidateGroupList.add("${" + FlowConstant.UP_DEPT_POST_PREFIX + groupData.getPostId() + "}"); + break; + default: + break; + } + } + return candidateGroupList; + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowApiService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowApiService.java similarity index 82% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowApiService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowApiService.java index 3211c39b..0e100447 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowApiService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowApiService.java @@ -1,12 +1,13 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; import com.alibaba.fastjson.JSONObject; -import com.flow.demo.common.core.object.CallResult; -import com.flow.demo.common.core.object.MyPageData; -import com.flow.demo.common.core.object.MyPageParam; -import com.flow.demo.common.flow.model.FlowTaskComment; -import com.flow.demo.common.flow.vo.FlowTaskVo; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.object.MyPageData; +import com.orangeforms.common.core.object.MyPageParam; +import com.orangeforms.common.flow.model.FlowTaskComment; +import com.orangeforms.common.flow.vo.FlowTaskVo; import org.activiti.bpmn.model.BpmnModel; +import org.activiti.bpmn.model.FlowElement; import org.activiti.bpmn.model.UserTask; import org.activiti.engine.delegate.ExecutionListener; import org.activiti.engine.delegate.TaskListener; @@ -18,7 +19,9 @@ import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskInfo; +import javax.xml.stream.XMLStreamException; import java.text.ParseException; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -35,8 +38,10 @@ public interface FlowApiService { * 启动流程实例。 * * @param processDefinitionId 流程定义Id。 + * @param dataId 业务主键Id。 + * @return 新启动的流程实例。 */ - void start(String processDefinitionId); + ProcessInstance start(String processDefinitionId, Object dataId); /** * 启动流程实例，如果当前登录用户为第一个用户任务的指派者，或者Assginee为流程启动人变量时， @@ -93,6 +98,14 @@ public interface FlowApiService { */ boolean isAssigneeOrCandidate(TaskInfo task); + /** + * 获取指定流程定义的全部流程节点。 + * + * @param processDefinitionId 流程定义Id。 + * @return 当前流程定义的全部节点集合。 + */ + Collection getProcessAllElements(String processDefinitionId); + /** * 判断当前登录用户是否为流程实例的发起人。 * @@ -133,6 +146,14 @@ public interface FlowApiService { */ List getProcessInstanceList(Set processInstanceIdSet); + /** + * 根据流程定义Id查询流程定义对象。 + * + * @param processDefinitionId 流程定义Id。 + * @return 流程定义对象。 + */ + ProcessDefinition getProcessDefinitionById(String processDefinitionId); + /** * 根据流程部署Id查询流程定义对象。 * @@ -197,15 +218,26 @@ public interface FlowApiService { */ List getProcessInstanceActiveTaskList(String processInstanceId); + /** + * 根据任务Id，获取当前运行时任务。 + * + * @param taskId 任务Id。 + * @return 运行时任务对象。 + */ + Task getTaskById(String taskId); + /** * 获取用户的任务列表。这其中包括当前用户作为指派人和候选人。 * - * @param username 指派人。 - * @param definitionKey 流程定义的标识。 - * @param pageParam 分页对象。 + * @param username 指派人。 + * @param definitionKey 流程定义的标识。 + * @param definitionName 流程定义名。 + * @param taskName 任务名称。 + * @param pageParam 分页对象。 * @return 用户的任务列表。 */ - MyPageData getTaskListByUserName(String username, String definitionKey, MyPageParam pageParam); + MyPageData getTaskListByUserName( + String username, String definitionKey, String definitionName, String taskName, MyPageParam pageParam); /** * 获取用户的任务数量。这其中包括当前用户作为指派人和候选人。 @@ -293,6 +325,14 @@ public interface FlowApiService { */ List getHistoricActivityInstanceList(String processInstanceId); + /** + * 获取流程实例的已完成历史任务列表，同时按照每个活动实例的开始时间升序排序。 + * + * @param processInstanceId 流程实例Id。 + * @return 流程实例已完成的历史任务列表。 + */ + List getHistoricActivityInstanceListOrderByStartTime(String processInstanceId); + /** * 获取当前用户的历史已办理任务列表。 * @@ -351,4 +391,13 @@ public interface FlowApiService { * @return 变量值。 */ Object getTaskVariable(String taskId, String variableName); + + /** + * 将xml格式的流程模型字符串，转换为标准的流程模型。 + * + * @param bpmnXml xml格式的流程模型字符串。 + * @return 转换后的标准的流程模型。 + * @throws XMLStreamException XML流处理异常 + */ + BpmnModel convertToBpmnModel(String bpmnXml) throws XMLStreamException; } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowCategoryService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowCategoryService.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowCategoryService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowCategoryService.java index c9e6e3bd..9b0bcad2 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowCategoryService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowCategoryService.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; -import com.flow.demo.common.core.base.service.IBaseService; -import com.flow.demo.common.flow.model.*; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.flow.model.*; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryService.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryService.java index d5650880..9206652e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryService.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; -import com.flow.demo.common.core.base.service.IBaseService; -import com.flow.demo.common.core.object.CallResult; -import com.flow.demo.common.flow.model.*; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.flow.model.*; import javax.xml.stream.XMLStreamException; import java.util.List; @@ -133,13 +133,4 @@ public interface FlowEntryService extends IBaseService { * @param flowEntryPublish 待恢复的工作流发布对象。 */ void activateFlowEntryPublish(FlowEntryPublish flowEntryPublish); - - /** - * 主表的关联数据验证。 - * - * @param flowEntry 最新数据对象。 - * @param originalFlowEntry 原有数据对象。 - * @return 数据全部正确返回true，否则false。 - */ - CallResult verifyRelatedData(FlowEntry flowEntry, FlowEntry originalFlowEntry); } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryVariableService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryVariableService.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryVariableService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryVariableService.java index 27b778a4..c504cf96 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowEntryVariableService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowEntryVariableService.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.core.base.service.IBaseService; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowMessageService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowMessageService.java new file mode 100644 index 00000000..36de1575 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowMessageService.java @@ -0,0 +1,52 @@ +package com.orangeforms.common.flow.service; + +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.flow.model.FlowMessage; +import com.orangeforms.common.flow.model.FlowWorkOrder; + +import java.util.List; + +/** + * 工作流消息数据操作服务接口。 + * + * @author Jerry + * @date 2021-06-06 + */ +public interface FlowMessageService extends IBaseService { + + /** + * 保存新增对象。 + * + * @param flowMessage 新增对象。 + * @return 保存后的消息对象。 + */ + FlowMessage saveNew(FlowMessage flowMessage); + + /** + * 根据工单参数，保存催单消息对象。如果当前工单存在多个待办任务，则插入多条催办消息数据。 + * + * @param flowWorkOrder 待催办的工单。 + */ + void saveNewRemindMessage(FlowWorkOrder flowWorkOrder); + + /** + * 更新指定运行时任务Id的消费为已完成状态。 + * + * @param taskId 运行时任务Id。 + */ + void updateFinishedStatusByTaskId(String taskId); + + /** + * 更新指定流程实例Id的消费为已完成状态。 + * + * @param processInstanceId 流程实例IdId。 + */ + void updateFinishedStatusByProcessInstanceId(String processInstanceId); + + /** + * 获取当前用户的催办消息列表。 + * + * @return 查询后的催办消息列表。 + */ + List getRemindingMessageListByUser(); +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskCommentService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskCommentService.java new file mode 100644 index 00000000..a247dd85 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskCommentService.java @@ -0,0 +1,47 @@ +package com.orangeforms.common.flow.service; + +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.service.IBaseService; + +import java.util.*; + +/** + * 流程任务批注数据操作服务接口。 + * + * @author Jerry + * @date 2021-06-06 + */ +public interface FlowTaskCommentService extends IBaseService { + + /** + * 保存新增对象。 + * + * @param flowTaskComment 新增对象。 + * @return 返回新增对象。 + */ + FlowTaskComment saveNew(FlowTaskComment flowTaskComment); + + /** + * 查询指定流程实例Id下的所有审批任务的批注。 + * + * @param processInstanceId 流程实例Id。 + * @return 查询结果集。 + */ + List getFlowTaskCommentList(String processInstanceId); + + /** + * 查询与指定流程任务Id集合关联的所有审批任务的批注。 + * + * @param taskIdSet 流程任务Id集合。 + * @return 查询结果集。 + */ + List getFlowTaskCommentListByTaskIds(Set taskIdSet); + + /** + * 获取指定流程实例的最后一条审批任务。 + * + * @param processInstanceId 流程实例Id。 + * @return 查询结果。 + */ + FlowTaskComment getLatestFlowTaskComment(String processInstanceId); +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowTaskExtService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskExtService.java similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowTaskExtService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskExtService.java index b2f749de..9c12fbee 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowTaskExtService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowTaskExtService.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.core.base.service.IBaseService; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.service.IBaseService; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowWorkOrderService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowWorkOrderService.java similarity index 81% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowWorkOrderService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowWorkOrderService.java index 448a019d..0115a9d8 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/FlowWorkOrderService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/FlowWorkOrderService.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.flow.service; +package com.orangeforms.common.flow.service; -import com.flow.demo.common.core.base.service.IBaseService; -import com.flow.demo.common.flow.model.FlowWorkOrder; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.flow.model.FlowWorkOrder; import org.activiti.engine.runtime.ProcessInstance; import java.util.*; @@ -20,9 +20,10 @@ public interface FlowWorkOrderService extends IBaseService * @param instance 流程实例对象。 * @param dataId 流程实例的BusinessKey。 * @param onlineTableId 在线数据表的主键Id。 + * @param tableName 面向静态表单所使用的表名。 * @return 新增的工作流工单对象。 */ - FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId); + FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId, String tableName); /** * 删除指定数据。 @@ -68,18 +69,12 @@ public interface FlowWorkOrderService extends IBaseService /** * 根据业务主键，查询是否存在指定的工单。 * + * @param tableName 静态表单工作流使用的数据表。 * @param businessKey 业务数据主键Id。 * @param unfinished 是否为没有结束工单。 * @return 存在返回true，否则false。 */ - boolean existByBusinessKey(Object businessKey, boolean unfinished); - - /** - * 根据业务数据的主键Id，更新流程状态。 - * @param businessKey 业务数据主键Id。 - * @param flowStatus 新的流程状态值。 - */ - void updateFlowStatusByBusinessKey(String businessKey, int flowStatus); + boolean existByBusinessKey(String tableName, Object businessKey, boolean unfinished); /** * 根据流程实例Id，更新流程状态。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowApiServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowApiServiceImpl.java similarity index 71% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowApiServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowApiServiceImpl.java index cd174ef3..98d87150 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowApiServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowApiServiceImpl.java @@ -1,28 +1,34 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; -import com.flow.demo.common.core.object.CallResult; -import com.flow.demo.common.core.object.MyPageData; -import com.flow.demo.common.core.object.MyPageParam; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.flow.command.AddMultiInstanceExecutionCmd; -import com.flow.demo.common.flow.constant.FlowConstant; -import com.flow.demo.common.flow.constant.FlowApprovalType; -import com.flow.demo.common.flow.constant.FlowTaskStatus; -import com.flow.demo.common.flow.model.FlowEntryPublish; -import com.flow.demo.common.flow.model.FlowTaskComment; -import com.flow.demo.common.flow.model.FlowTaskExt; -import com.flow.demo.common.flow.service.*; -import com.flow.demo.common.flow.util.BaseFlowDeptPostExtHelper; -import com.flow.demo.common.flow.util.FlowCustomExtFactory; -import com.flow.demo.common.flow.vo.FlowTaskVo; +import com.orangeforms.common.flow.object.FlowTaskMultiSignAssign; +import com.orangeforms.common.flow.object.FlowTaskOperation; +import com.orangeforms.common.flow.object.FlowTaskPostCandidateGroup; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.object.MyPageData; +import com.orangeforms.common.core.object.MyPageParam; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.flow.command.AddMultiInstanceExecutionCmd; +import com.orangeforms.common.flow.constant.FlowConstant; +import com.orangeforms.common.flow.constant.FlowApprovalType; +import com.orangeforms.common.flow.constant.FlowTaskStatus; +import com.orangeforms.common.flow.model.FlowEntryPublish; +import com.orangeforms.common.flow.model.FlowTaskComment; +import com.orangeforms.common.flow.model.FlowTaskExt; +import com.orangeforms.common.flow.service.*; +import com.orangeforms.common.flow.util.BaseFlowIdentityExtHelper; +import com.orangeforms.common.flow.util.FlowCustomExtFactory; +import com.orangeforms.common.flow.vo.FlowTaskVo; +import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; +import org.activiti.bpmn.converter.BpmnXMLConverter; import org.activiti.bpmn.model.*; import org.activiti.bpmn.model.Process; import org.activiti.engine.*; @@ -39,6 +45,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -67,17 +79,20 @@ public class FlowApiServiceImpl implements FlowApiService { @Autowired private FlowWorkOrderService flowWorkOrderService; @Autowired + private FlowMessageService flowMessageService; + @Autowired private FlowCustomExtFactory flowCustomExtFactory; @Transactional(rollbackFor = Exception.class) @Override - public void start(String processDefinitionId) { + public ProcessInstance start(String processDefinitionId, Object dataId) { String loginName = TokenData.takeFromRequest().getLoginName(); Map variableMap = new HashMap<>(4); variableMap.put(FlowConstant.PROC_INSTANCE_INITIATOR_VAR, loginName); variableMap.put(FlowConstant.PROC_INSTANCE_START_USER_NAME_VAR, loginName); Authentication.setAuthenticatedUserId(loginName); - runtimeService.startProcessInstanceById(processDefinitionId, null, variableMap); + String businessKey = dataId == null ? null : dataId.toString(); + return runtimeService.startProcessInstanceById(processDefinitionId, businessKey, variableMap); } @Transactional(rollbackFor = Exception.class) @@ -126,9 +141,19 @@ public class FlowApiServiceImpl implements FlowApiService { // 这里处理多实例会签逻辑。 if (flowTaskComment.getApprovalType().equals(FlowApprovalType.MULTI_SIGN)) { String loginName = TokenData.takeFromRequest().getLoginName(); + if (taskVariableData == null) { + taskVariableData = new JSONObject(); + } String assigneeList = taskVariableData.getString(FlowConstant.MULTI_ASSIGNEE_LIST_VAR); - Assert.notNull(taskVariableData); - Assert.notNull(assigneeList); + if (StrUtil.isBlank(assigneeList)) { + FlowTaskExt flowTaskExt = flowTaskExtService.getByProcessDefinitionIdAndTaskId( + task.getProcessDefinitionId(), task.getTaskDefinitionKey()); + assigneeList = this.buildMutiSignAssigneeList(flowTaskExt.getOperationListJson()); + if (assigneeList != null) { + taskVariableData.put(FlowConstant.MULTI_ASSIGNEE_LIST_VAR, StrUtil.split(assigneeList,',')); + } + } + Assert.isTrue(StrUtil.isNotBlank(assigneeList)); taskVariableData.put(FlowConstant.MULTI_AGREE_COUNT_VAR, 0); taskVariableData.put(FlowConstant.MULTI_REFUSE_COUNT_VAR, 0); taskVariableData.put(FlowConstant.MULTI_ABSTAIN_COUNT_VAR, 0); @@ -156,6 +181,7 @@ public class FlowApiServiceImpl implements FlowApiService { } else { taskService.complete(task.getId(), taskVariableData, true); } + flowMessageService.updateFinishedStatusByTaskId(task.getId()); } @Transactional(rollbackFor = Exception.class) @@ -192,33 +218,88 @@ public class FlowApiServiceImpl implements FlowApiService { List flowTaskExtList = flowTaskExtService.getByProcessDefinitionId(processDefinitionId); boolean hasDeptPostLeader = false; boolean hasUpDeptPostLeader = false; + boolean hasPostCandidateGroup = false; for (FlowTaskExt flowTaskExt : flowTaskExtList) { if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER)) { hasUpDeptPostLeader = true; } else if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_DEPT_POST_LEADER)) { hasDeptPostLeader = true; + } else if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_POST)) { + hasPostCandidateGroup = true; } } - // 如果流程图的配置中包含部门岗位相关的变量(如：部门领导和上级领导审批)，flowDeptPostExtHelper就不能为null。 - // 这个需要子类去实现 BaseFlowDeptPostExtHelper 接口，并注册到FlowCustomExtFactory的工厂中。 - BaseFlowDeptPostExtHelper flowDeptPostExtHelper = flowCustomExtFactory.getFlowDeptPostExtHelper(); + // 如果流程图的配置中包含用户身份相关的变量(如：部门领导和上级领导审批)，flowIdentityExtHelper就不能为null。 + // 这个需要子类去实现 BaseFlowIdentityExtHelper 接口，并注册到FlowCustomExtFactory的工厂中。 + BaseFlowIdentityExtHelper flowIdentityExtHelper = flowCustomExtFactory.getFlowIdentityExtHelper(); if (hasUpDeptPostLeader) { - Assert.notNull(flowDeptPostExtHelper); - Object upLeaderDeptPostId = flowDeptPostExtHelper.getUpLeaderDeptPostId(tokenData.getDeptId()); + Assert.notNull(flowIdentityExtHelper); + Object upLeaderDeptPostId = flowIdentityExtHelper.getUpLeaderDeptPostId(tokenData.getDeptId()); if (upLeaderDeptPostId != null) { variableMap.put(FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR, upLeaderDeptPostId.toString()); } } if (hasDeptPostLeader) { - Assert.notNull(flowDeptPostExtHelper); - Object leaderDeptPostId = flowDeptPostExtHelper.getLeaderDeptPostId(tokenData.getDeptId()); + Assert.notNull(flowIdentityExtHelper); + Object leaderDeptPostId = flowIdentityExtHelper.getLeaderDeptPostId(tokenData.getDeptId()); if (leaderDeptPostId != null) { variableMap.put(FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR, leaderDeptPostId.toString()); } } + if (hasPostCandidateGroup) { + Assert.notNull(flowIdentityExtHelper); + Map postGroupDataMap = + this.buildPostCandidateGroupData(flowIdentityExtHelper, flowTaskExtList); + variableMap.putAll(postGroupDataMap); + } return variableMap; } + private Map buildPostCandidateGroupData( + BaseFlowIdentityExtHelper flowIdentityExtHelper, List flowTaskExtList) { + Map postVariableMap = new HashMap<>(); + Set selfPostIdSet = new HashSet<>(); + Set upPostIdSet = new HashSet<>(); + for (FlowTaskExt flowTaskExt : flowTaskExtList) { + if (flowTaskExt.getGroupType().equals(FlowConstant.GROUP_TYPE_POST)) { + Assert.notNull(flowTaskExt.getDeptPostListJson()); + List groupDataList = + JSONArray.parseArray(flowTaskExt.getDeptPostListJson(), FlowTaskPostCandidateGroup.class); + for (FlowTaskPostCandidateGroup groupData : groupDataList) { + if (groupData.getType().equals(FlowConstant.GROUP_TYPE_SELF_DEPT_POST_VAR)) { + selfPostIdSet.add(groupData.getPostId()); + } else if (groupData.getType().equals(FlowConstant.GROUP_TYPE_UP_DEPT_POST_VAR)) { + upPostIdSet.add(groupData.getPostId()); + } + } + } + } + if (CollUtil.isNotEmpty(selfPostIdSet)) { + Map deptPostIdMap = + flowIdentityExtHelper.getDeptPostIdMap(TokenData.takeFromRequest().getDeptId(), selfPostIdSet); + for (String postId : selfPostIdSet) { + if (MapUtil.isNotEmpty(deptPostIdMap) && deptPostIdMap.containsKey(postId)) { + String deptPostId = deptPostIdMap.get(postId); + postVariableMap.put(FlowConstant.SELF_DEPT_POST_PREFIX + postId, deptPostId); + } else { + postVariableMap.put(FlowConstant.SELF_DEPT_POST_PREFIX + postId, ""); + } + } + } + if (CollUtil.isNotEmpty(upPostIdSet)) { + Map upDeptPostIdMap = + flowIdentityExtHelper.getUpDeptPostIdMap(TokenData.takeFromRequest().getDeptId(), upPostIdSet); + for (String postId : upPostIdSet) { + if (MapUtil.isNotEmpty(upDeptPostIdMap) && upDeptPostIdMap.containsKey(postId)) { + String upDeptPostId = upDeptPostIdMap.get(postId); + postVariableMap.put(FlowConstant.UP_DEPT_POST_PREFIX + postId, upDeptPostId); + } else { + postVariableMap.put(FlowConstant.UP_DEPT_POST_PREFIX + postId, ""); + } + } + } + return postVariableMap; + } + @Override public boolean isAssigneeOrCandidate(TaskInfo task) { String loginName = TokenData.takeFromRequest().getLoginName(); @@ -230,6 +311,12 @@ public class FlowApiServiceImpl implements FlowApiService { return query.active().count() != 0; } + @Override + public Collection getProcessAllElements(String processDefinitionId) { + Process process = repositoryService.getBpmnModel(processDefinitionId).getProcesses().get(0); + return this.getAllElements(process.getFlowElements(), null); + } + @Override public boolean isProcessInstanceStarter(String processInstanceId) { String loginName = TokenData.takeFromRequest().getLoginName(); @@ -269,14 +356,26 @@ public class FlowApiServiceImpl implements FlowApiService { } @Override - public MyPageData getTaskListByUserName(String username, String definitionKey, MyPageParam pageParam) { + public Task getTaskById(String taskId) { + return taskService.createTaskQuery().taskId(taskId).singleResult(); + } + + @Override + public MyPageData getTaskListByUserName( + String username, String definitionKey, String definitionName, String taskName, MyPageParam pageParam) { TaskQuery query = taskService.createTaskQuery().active(); if (StrUtil.isNotBlank(definitionKey)) { query.processDefinitionKey(definitionKey); } + if (StrUtil.isNotBlank(definitionName)) { + query.processDefinitionNameLike("%" + definitionName + "%"); + } + if (StrUtil.isNotBlank(taskName)) { + query.taskNameLike("%" + taskName + "%"); + } this.buildCandidateCondition(query, username); - query.orderByTaskCreateTime().desc(); long totalCount = query.count(); + query.orderByTaskCreateTime().desc(); int firstResult = (pageParam.getPageNum() - 1) * pageParam.getPageSize(); List taskList = query.listPage(firstResult, pageParam.getPageSize()); return new MyPageData<>(taskList, totalCount); @@ -297,6 +396,11 @@ public class FlowApiServiceImpl implements FlowApiService { return runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdSet).list(); } + @Override + public ProcessDefinition getProcessDefinitionById(String processDefinitionId) { + return repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult(); + } + @Override public List getProcessDefinitionList(Set processDefinitionIdSet) { return repositoryService.createProcessDefinitionQuery().processDefinitionIds(processDefinitionIdSet).list(); @@ -367,6 +471,7 @@ public class FlowApiServiceImpl implements FlowApiService { processInstance.getId(), FlowConstant.PROC_INSTANCE_INITIATOR_VAR); flowTaskVo.setProcessInstanceInitiator(initiator.toString()); flowTaskVo.setProcessInstanceStartTime(processInstance.getStartTime()); + flowTaskVo.setBusinessKey(processInstance.getBusinessKey()); flowTaskVoList.add(flowTaskVo); } return flowTaskVoList; @@ -473,6 +578,12 @@ public class FlowApiServiceImpl implements FlowApiService { return historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).list(); } + @Override + public List getHistoricActivityInstanceListOrderByStartTime(String processInstanceId) { + return historyService.createHistoricActivityInstanceQuery() + .processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list(); + } + @Override public HistoricTaskInstance getHistoricTaskInstance(String processInstanceId, String taskId) { return historyService.createHistoricTaskInstanceQuery() @@ -507,8 +618,8 @@ public class FlowApiServiceImpl implements FlowApiService { } } } - EndEvent endEvent = - bpmnModel.getMainProcess().findFlowElementsOfType(EndEvent.class, false).get(0); + EndEvent endEvent = bpmnModel.getMainProcess() + .findFlowElementsOfType(EndEvent.class, false).get(0); if (!(currFlow.getParentContainer().equals(endEvent.getParentContainer()))) { return CallResult.error("数据验证失败，不能从子流程直接中止！"); } @@ -538,6 +649,7 @@ public class FlowApiServiceImpl implements FlowApiService { status = FlowTaskStatus.CANCELLED; } flowWorkOrderService.updateFlowStatusByProcessInstanceId(processInstanceId, status); + flowMessageService.updateFinishedStatusByProcessInstanceId(processInstanceId); return CallResult.ok(); } @@ -553,6 +665,14 @@ public class FlowApiServiceImpl implements FlowApiService { return taskService.getVariable(taskId, variableName); } + @Override + public BpmnModel convertToBpmnModel(String bpmnXml) throws XMLStreamException { + BpmnXMLConverter converter = new BpmnXMLConverter(); + InputStream in = new ByteArrayInputStream(bpmnXml.getBytes(StandardCharsets.UTF_8)); + @Cleanup XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(in); + return converter.convertToBpmnModel(reader); + } + private void handleMultiInstanceApprovalType(String executionId, String approvalType, JSONObject taskVariableData) { if (StrUtil.isBlank(approvalType)) { return; @@ -597,13 +717,20 @@ public class FlowApiServiceImpl implements FlowApiService { private void buildCandidateCondition(TaskQuery query, String loginName) { Set groupIdSet = new HashSet<>(); - // NOTE: 目前已经支持部门和岗位，如果今后需要支持角色，可将角色Id也加到groupIdSet中即可。 - // 需要注意的是，部门Id、部门岗位Id，或者其他类型的分组Id，他们之间一定不能重复。 + // NOTE: 需要注意的是，部门Id、部门岗位Id，或者其他类型的分组Id，他们之间一定不能重复。 TokenData tokenData = TokenData.takeFromRequest(); Object deptId = tokenData.getDeptId(); if (deptId != null) { groupIdSet.add(deptId.toString()); } + String roleIds = tokenData.getRoleIds(); + if (StrUtil.isNotBlank(tokenData.getRoleIds())) { + groupIdSet.addAll(Arrays.asList(StrUtil.split(roleIds, ","))); + } + String postIds = tokenData.getPostIds(); + if (StrUtil.isNotBlank(tokenData.getPostIds())) { + groupIdSet.addAll(Arrays.asList(StrUtil.split(postIds, ","))); + } String deptPostIds = tokenData.getDeptPostIds(); if (StrUtil.isNotBlank(deptPostIds)) { groupIdSet.addAll(Arrays.asList(StrUtil.split(deptPostIds, ","))); @@ -615,4 +742,50 @@ public class FlowApiServiceImpl implements FlowApiService { query.taskCandidateOrAssigned(loginName); } } + + private String buildMutiSignAssigneeList(String operationListJson) { + FlowTaskMultiSignAssign multiSignAssignee = null; + List taskOperationList = JSONArray.parseArray(operationListJson, FlowTaskOperation.class); + for (FlowTaskOperation taskOperation : taskOperationList) { + if ("multi_sign".equals(taskOperation.getType())) { + multiSignAssignee = taskOperation.getMultiSignAssignee(); + break; + } + } + Assert.notNull(multiSignAssignee); + if (FlowTaskMultiSignAssign.ASSIGN_TYPE_USER.equals(multiSignAssignee.getAssigneeType())) { + return multiSignAssignee.getAssigneeList(); + } + Set usernameSet = null; + BaseFlowIdentityExtHelper extHelper = flowCustomExtFactory.getFlowIdentityExtHelper(); + Set idSet = CollUtil.newHashSet(StrUtil.split(multiSignAssignee.getAssigneeList(), ",")); + switch (multiSignAssignee.getAssigneeType()) { + case FlowTaskMultiSignAssign.ASSIGN_TYPE_ROLE: + usernameSet = extHelper.getUsernameListByRoleIds(idSet); + break; + case FlowTaskMultiSignAssign.ASSIGN_TYPE_DEPT: + usernameSet = extHelper.getUsernameListByDeptIds(idSet); + break; + case FlowTaskMultiSignAssign.ASSIGN_TYPE_POST: + usernameSet = extHelper.getUsernameListByPostIds(idSet); + break; + case FlowTaskMultiSignAssign.ASSIGN_TYPE_DEPT_POST: + usernameSet = extHelper.getUsernameListByDeptPostIds(idSet); + break; + default: + break; + } + return CollUtil.isEmpty(usernameSet) ? null : CollUtil.join(usernameSet, ","); + } + + private Collection getAllElements(Collection flowElements, Collection allElements) { + allElements = allElements == null ? new ArrayList<>() : allElements; + for (FlowElement flowElement : flowElements) { + allElements.add(flowElement); + if (flowElement instanceof SubProcess) { + allElements = getAllElements(((SubProcess) flowElement).getFlowElements(), allElements); + } + } + return allElements; + } } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowCategoryServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowCategoryServiceImpl.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowCategoryServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowCategoryServiceImpl.java index 549d29ce..f7cb7448 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowCategoryServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowCategoryServiceImpl.java @@ -1,15 +1,15 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.core.object.MyRelationParam; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.flow.demo.common.flow.dao.*; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.flow.service.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.flow.dao.*; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.flow.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryServiceImpl.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryServiceImpl.java index 652dfbf4..c79c63f6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryServiceImpl.java @@ -1,26 +1,28 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.Page; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.core.object.CallResult; -import com.flow.demo.common.core.object.MyRelationParam; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; -import com.flow.demo.common.flow.util.BaseFlowDeptPostExtHelper; -import com.flow.demo.common.flow.util.FlowCustomExtFactory; -import com.flow.demo.common.flow.constant.FlowConstant; -import com.flow.demo.common.flow.dao.*; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.flow.service.*; -import com.flow.demo.common.flow.model.constant.FlowEntryStatus; -import com.flow.demo.common.flow.model.constant.FlowVariableType; -import com.flow.demo.common.flow.listener.UpdateFlowStatusListener; +import com.orangeforms.common.flow.object.FlowTaskPostCandidateGroup; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.flow.util.BaseFlowIdentityExtHelper; +import com.orangeforms.common.flow.util.FlowCustomExtFactory; +import com.orangeforms.common.flow.constant.FlowConstant; +import com.orangeforms.common.flow.dao.*; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.flow.service.*; +import com.orangeforms.common.flow.model.constant.FlowEntryStatus; +import com.orangeforms.common.flow.model.constant.FlowVariableType; +import com.orangeforms.common.flow.listener.FlowFinishedListener; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.activiti.bpmn.converter.BpmnXMLConverter; @@ -122,26 +124,33 @@ public class FlowEntryServiceImpl extends BaseService implement @Cleanup XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(xmlStream); BpmnXMLConverter converter = new BpmnXMLConverter(); BpmnModel bpmnModel = converter.convertToBpmnModel(reader); - flowApiService.addProcessInstanceEndListener(bpmnModel, UpdateFlowStatusListener.class); + flowApiService.addProcessInstanceEndListener(bpmnModel, FlowFinishedListener.class); Collection elementList = bpmnModel.getMainProcess().getFlowElements(); Map elementMap = elementList.stream().filter(e -> e instanceof UserTask).collect(Collectors.toMap(FlowElement::getId, c -> c)); if (CollUtil.isNotEmpty(flowTaskExtList)) { - BaseFlowDeptPostExtHelper flowDeptPostExtHelper = flowCustomExtFactory.getFlowDeptPostExtHelper(); + BaseFlowIdentityExtHelper flowIdentityExtHelper = flowCustomExtFactory.getFlowIdentityExtHelper(); for (FlowTaskExt t : flowTaskExtList) { UserTask userTask = (UserTask) elementMap.get(t.getTaskId()); // 如果流程图中包含部门领导审批和上级部门领导审批的选项，就需要注册 FlowCustomExtFactory 工厂中的 - // BaseFlowDeptPostExtHelper 对象，该注册操作需要业务模块中实现。 + // BaseFlowIdentityExtHelper 对象，该注册操作需要业务模块中实现。 if (StrUtil.equals(t.getGroupType(), FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER)) { userTask.setCandidateGroups( CollUtil.newArrayList("${" + FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR + "}")); - Assert.notNull(flowDeptPostExtHelper); - flowApiService.addTaskCreateListener(userTask, flowDeptPostExtHelper.getUpDeptPostLeaderListener()); + Assert.notNull(flowIdentityExtHelper); + flowApiService.addTaskCreateListener(userTask, flowIdentityExtHelper.getUpDeptPostLeaderListener()); } else if (StrUtil.equals(t.getGroupType(), FlowConstant.GROUP_TYPE_DEPT_POST_LEADER)) { userTask.setCandidateGroups( CollUtil.newArrayList("${" + FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR + "}")); - Assert.notNull(flowDeptPostExtHelper); - flowApiService.addTaskCreateListener(userTask, flowDeptPostExtHelper.getDeptPostLeaderListener()); + Assert.notNull(flowIdentityExtHelper); + flowApiService.addTaskCreateListener(userTask, flowIdentityExtHelper.getDeptPostLeaderListener()); + } else if (StrUtil.equals(t.getGroupType(), FlowConstant.GROUP_TYPE_POST)) { + Assert.notNull(t.getDeptPostListJson()); + List groupDataList = + JSONArray.parseArray(t.getDeptPostListJson(), FlowTaskPostCandidateGroup.class); + List candidateGroupList = + FlowTaskPostCandidateGroup.buildCandidateGroupList(groupDataList); + userTask.setCandidateGroups(candidateGroupList); } } } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryVariableServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryVariableServiceImpl.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryVariableServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryVariableServiceImpl.java index 744e49b7..4f07cd68 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowEntryVariableServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowEntryVariableServiceImpl.java @@ -1,14 +1,14 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.flow.demo.common.flow.service.*; -import com.flow.demo.common.flow.dao.*; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.object.MyRelationParam; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.flow.service.*; +import com.orangeforms.common.flow.dao.*; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowMessageServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowMessageServiceImpl.java new file mode 100644 index 00000000..54b88359 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowMessageServiceImpl.java @@ -0,0 +1,247 @@ +package com.orangeforms.common.flow.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.flow.constant.FlowConstant; +import com.orangeforms.common.flow.model.constant.FlowMessageType; +import com.orangeforms.common.flow.dao.FlowMessageCandidateIdentityMapper; +import com.orangeforms.common.flow.dao.FlowMessageMapper; +import com.orangeforms.common.flow.model.FlowMessage; +import com.orangeforms.common.flow.model.FlowMessageCandidateIdentity; +import com.orangeforms.common.flow.model.FlowTaskExt; +import com.orangeforms.common.flow.model.FlowWorkOrder; +import com.orangeforms.common.flow.object.FlowTaskPostCandidateGroup; +import com.orangeforms.common.flow.service.FlowApiService; +import com.orangeforms.common.flow.service.FlowMessageService; +import com.orangeforms.common.flow.service.FlowTaskExtService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; +import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.task.Task; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * 工作流消息数据操作服务接口。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Slf4j +@Service("flowMessageService") +public class FlowMessageServiceImpl extends BaseService implements FlowMessageService { + + @Autowired + private FlowMessageMapper flowMessageMapper; + @Autowired + private FlowMessageCandidateIdentityMapper flowMessageCandidateIdentityMapper; + @Autowired + private FlowTaskExtService flowTaskExtService; + @Autowired + private FlowApiService flowApiService; + @Autowired + private IdGeneratorWrapper idGenerator; + + /** + * 返回当前Service的主表Mapper对象。 + * + * @return 主表Mapper对象。 + */ + @Override + protected BaseDaoMapper mapper() { + return flowMessageMapper; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public FlowMessage saveNew(FlowMessage flowMessage) { + flowMessage.setMessageId(idGenerator.nextLongId()); + TokenData tokenData = TokenData.takeFromRequest(); + flowMessage.setCreateUserId(tokenData.getUserId()); + flowMessage.setCreateUsername(tokenData.getShowName()); + flowMessage.setCreateTime(new Date()); + flowMessage.setUpdateUserId(tokenData.getUserId()); + flowMessage.setUpdateTime(flowMessage.getCreateTime()); + flowMessageMapper.insert(flowMessage); + return flowMessage; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void saveNewRemindMessage(FlowWorkOrder flowWorkOrder) { + List taskList = + flowApiService.getProcessInstanceActiveTaskList(flowWorkOrder.getProcessInstanceId()); + for (Task task : taskList) { + FlowMessage filter = new FlowMessage(); + filter.setTaskId(task.getId()); + List messageList = flowMessageMapper.selectList(new QueryWrapper<>(filter)); + // 同一个任务只能催办一次，多次催办则累加催办次数。 + if (CollUtil.isNotEmpty(messageList)) { + for (FlowMessage flowMessage : messageList) { + flowMessage.setRemindCount(flowMessage.getRemindCount() + 1); + flowMessageMapper.updateById(flowMessage); + } + continue; + } + FlowMessage flowMessage = new FlowMessage(); + flowMessage.setMessageType(FlowMessageType.REMIND_TYPE); + flowMessage.setRemindCount(1); + flowMessage.setWorkOrderId(flowWorkOrder.getWorkOrderId()); + flowMessage.setProcessDefinitionId(flowWorkOrder.getProcessDefinitionId()); + flowMessage.setProcessDefinitionKey(flowWorkOrder.getProcessDefinitionKey()); + flowMessage.setProcessDefinitionName(flowWorkOrder.getProcessDefinitionName()); + flowMessage.setProcessInstanceId(flowWorkOrder.getProcessInstanceId()); + flowMessage.setProcessInstanceInitiator(flowWorkOrder.getSubmitUsername()); + flowMessage.setTaskId(task.getId()); + flowMessage.setTaskDefinitionKey(task.getTaskDefinitionKey()); + flowMessage.setTaskName(task.getName()); + flowMessage.setTaskStartTime(task.getCreateTime()); + flowMessage.setTaskAssignee(task.getAssignee()); + flowMessage.setTaskFinished(false); + this.saveNew(flowMessage); + FlowTaskExt flowTaskExt = flowTaskExtService.getByProcessDefinitionIdAndTaskId( + flowWorkOrder.getProcessDefinitionId(), task.getTaskDefinitionKey()); + if (flowTaskExt != null) { + this.saveMessageCandidateIdentityWithMessage( + flowWorkOrder.getProcessInstanceId(), flowTaskExt, flowMessage.getMessageId()); + } + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void updateFinishedStatusByTaskId(String taskId) { + FlowMessage flowMessage = new FlowMessage(); + flowMessage.setTaskFinished(true); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FlowMessage::getTaskId, taskId); + flowMessageMapper.update(flowMessage, queryWrapper); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void updateFinishedStatusByProcessInstanceId(String processInstanceId) { + FlowMessage flowMessage = new FlowMessage(); + flowMessage.setTaskFinished(true); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FlowMessage::getProcessInstanceId, processInstanceId); + flowMessageMapper.update(flowMessage, queryWrapper); + } + + @Override + public List getRemindingMessageListByUser() { + TokenData tokenData = TokenData.takeFromRequest(); + Set groupIdSet = new HashSet<>(1); + groupIdSet.add(tokenData.getLoginName()); + this.parseAndAddIdArray(groupIdSet, tokenData.getRoleIds()); + this.parseAndAddIdArray(groupIdSet, tokenData.getDeptPostIds()); + this.parseAndAddIdArray(groupIdSet, tokenData.getPostIds()); + if (tokenData.getDeptId() != null) { + groupIdSet.add(tokenData.getDeptId().toString()); + } + return flowMessageMapper.getRemindingMessageListByUser(tokenData.getLoginName(), groupIdSet); + } + + private void parseAndAddIdArray(Set groupIdSet, String idArray) { + if (StrUtil.isNotBlank(idArray)) { + if (groupIdSet == null) { + groupIdSet = new HashSet<>(); + } + groupIdSet.addAll(StrUtil.split(idArray, ',')); + } + } + + private void saveMessageCandidateIdentityWithMessage( + String processInstanceId, FlowTaskExt flowTaskExt, Long messageId) { + this.saveMessageCandidateIdentityList( + messageId, "username", flowTaskExt.getCandidateUsernames()); + this.saveMessageCandidateIdentityList( + messageId, "role", flowTaskExt.getRoleIds()); + this.saveMessageCandidateIdentityList( + messageId, "dept", flowTaskExt.getDeptIds()); + if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER)) { + Object v = flowApiService.getProcessInstanceVariable( + processInstanceId, FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR); + if (v != null) { + this.saveMessageCandidateIdentity( + messageId, FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR, v.toString()); + } + } else if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_DEPT_POST_LEADER)) { + Object v = flowApiService.getProcessInstanceVariable( + processInstanceId, FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR); + if (v != null) { + this.saveMessageCandidateIdentity( + messageId, FlowConstant.GROUP_TYPE_DEPT_POST_LEADER_VAR, v.toString()); + } + } else if (StrUtil.equals(flowTaskExt.getGroupType(), FlowConstant.GROUP_TYPE_POST)) { + Assert.notBlank(flowTaskExt.getDeptPostListJson()); + List groupDataList = + JSONArray.parseArray(flowTaskExt.getDeptPostListJson(), FlowTaskPostCandidateGroup.class); + for (FlowTaskPostCandidateGroup groupData : groupDataList) { + FlowMessageCandidateIdentity candidateIdentity = new FlowMessageCandidateIdentity(); + candidateIdentity.setId(idGenerator.nextLongId()); + candidateIdentity.setMessageId(messageId); + candidateIdentity.setCandidateType(groupData.getType()); + switch (groupData.getType()) { + case FlowConstant.GROUP_TYPE_ALL_DEPT_POST_VAR: + candidateIdentity.setCandidateId(groupData.getPostId()); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + break; + case FlowConstant.GROUP_TYPE_DEPT_POST_VAR: + candidateIdentity.setCandidateId(groupData.getDeptPostId()); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + break; + case FlowConstant.GROUP_TYPE_SELF_DEPT_POST_VAR: + Object v = flowApiService.getProcessInstanceVariable( + processInstanceId, FlowConstant.SELF_DEPT_POST_PREFIX + groupData.getPostId()); + if (v != null) { + candidateIdentity.setCandidateId(v.toString()); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + } + break; + case FlowConstant.GROUP_TYPE_UP_DEPT_POST_VAR: + Object v2 = flowApiService.getProcessInstanceVariable( + processInstanceId, FlowConstant.UP_DEPT_POST_PREFIX + groupData.getPostId()); + if (v2 != null) { + candidateIdentity.setCandidateId(v2.toString()); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + } + break; + default: + break; + } + } + } + } + + private void saveMessageCandidateIdentity(Long messageId, String candidateType, String candidateId) { + FlowMessageCandidateIdentity candidateIdentity = new FlowMessageCandidateIdentity(); + candidateIdentity.setId(idGenerator.nextLongId()); + candidateIdentity.setMessageId(messageId); + candidateIdentity.setCandidateType(FlowConstant.GROUP_TYPE_UP_DEPT_POST_LEADER_VAR); + candidateIdentity.setCandidateId(candidateId); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + } + + private void saveMessageCandidateIdentityList(Long messageId, String candidateType, String identityIds) { + if (StrUtil.isNotBlank(identityIds)) { + for (String identityId : StrUtil.split(identityIds, ',')) { + FlowMessageCandidateIdentity candidateIdentity = new FlowMessageCandidateIdentity(); + candidateIdentity.setId(idGenerator.nextLongId()); + candidateIdentity.setMessageId(messageId); + candidateIdentity.setCandidateType(candidateType); + candidateIdentity.setCandidateId(identityId); + flowMessageCandidateIdentityMapper.insert(candidateIdentity); + } + } + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskCommentServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskCommentServiceImpl.java similarity index 58% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskCommentServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskCommentServiceImpl.java index 9bc99f6b..22b92eef 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskCommentServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskCommentServiceImpl.java @@ -1,13 +1,16 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.flow.demo.common.flow.service.*; -import com.flow.demo.common.flow.dao.*; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.orangeforms.common.flow.service.*; +import com.orangeforms.common.flow.dao.*; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.annotation.Autowired; @@ -71,4 +74,21 @@ public class FlowTaskCommentServiceImpl extends BaseService getFlowTaskCommentListByTaskIds(Set taskIdSet) { + LambdaQueryWrapper queryWrapper = + new LambdaQueryWrapper().in(FlowTaskComment::getTaskId, taskIdSet); + queryWrapper.orderByDesc(FlowTaskComment::getId); + return flowTaskCommentMapper.selectList(queryWrapper); + } + + @Override + public FlowTaskComment getLatestFlowTaskComment(String processInstanceId) { + LambdaQueryWrapper queryWrapper = + new LambdaQueryWrapper().eq(FlowTaskComment::getProcessInstanceId, processInstanceId); + queryWrapper.orderByDesc(FlowTaskComment::getId); + IPage pageData = flowTaskCommentMapper.selectPage(new Page<>(1, 1), queryWrapper); + return CollUtil.isEmpty(pageData.getRecords()) ? null : pageData.getRecords().get(0); + } } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskExtServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskExtServiceImpl.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskExtServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskExtServiceImpl.java index 0085c27d..8352c23a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowTaskExtServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowTaskExtServiceImpl.java @@ -1,12 +1,12 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.flow.demo.common.flow.service.*; -import com.flow.demo.common.flow.dao.*; -import com.flow.demo.common.flow.model.*; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.base.service.BaseService; +import com.orangeforms.common.flow.service.*; +import com.orangeforms.common.flow.dao.*; +import com.orangeforms.common.flow.model.*; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowWorkOrderServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowWorkOrderServiceImpl.java similarity index 78% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowWorkOrderServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowWorkOrderServiceImpl.java index d69a1857..a4a76631 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/service/impl/FlowWorkOrderServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/service/impl/FlowWorkOrderServiceImpl.java @@ -1,17 +1,17 @@ -package com.flow.demo.common.flow.service.impl; +package com.orangeforms.common.flow.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.constant.GlobalDeletedFlag; -import com.flow.demo.common.core.object.MyRelationParam; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.flow.constant.FlowTaskStatus; -import com.flow.demo.common.flow.dao.FlowWorkOrderMapper; -import com.flow.demo.common.flow.model.FlowWorkOrder; -import com.flow.demo.common.flow.service.FlowWorkOrderService; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.constant.GlobalDeletedFlag; +import com.orangeforms.common.core.object.MyRelationParam; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.flow.constant.FlowTaskStatus; +import com.orangeforms.common.flow.dao.FlowWorkOrderMapper; +import com.orangeforms.common.flow.model.FlowWorkOrder; +import com.orangeforms.common.flow.service.FlowWorkOrderService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.runtime.ProcessInstance; import org.springframework.transaction.annotation.Transactional; @@ -51,11 +51,12 @@ public class FlowWorkOrderServiceImpl extends BaseService i * @param instance 流程实例对象。 * @param dataId 流程实例的BusinessKey。 * @param onlineTableId 在线数据表的主键Id。 + * @param tableName 面向静态表单所使用的表名。 * @return 新增的工作流工单对象。 */ @Transactional(rollbackFor = Exception.class) @Override - public FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId) { + public FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId, String tableName) { TokenData tokenData = TokenData.takeFromRequest(); Date now = new Date(); FlowWorkOrder flowWorkOrder = new FlowWorkOrder(); @@ -66,6 +67,7 @@ public class FlowWorkOrderServiceImpl extends BaseService i flowWorkOrder.setProcessInstanceId(instance.getId()); flowWorkOrder.setBusinessKey(dataId.toString()); flowWorkOrder.setOnlineTableId(onlineTableId); + flowWorkOrder.setTableName(tableName); flowWorkOrder.setFlowStatus(FlowTaskStatus.SUBMITTED); flowWorkOrder.setSubmitUsername(tokenData.getLoginName()); flowWorkOrder.setDeptId(tokenData.getDeptId()); @@ -118,9 +120,10 @@ public class FlowWorkOrderServiceImpl extends BaseService i } @Override - public boolean existByBusinessKey(Object businessKey, boolean unfinished) { + public boolean existByBusinessKey(String tableName, Object businessKey, boolean unfinished) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(FlowWorkOrder::getBusinessKey, businessKey.toString()); + queryWrapper.eq(FlowWorkOrder::getTableName, tableName); if (unfinished) { queryWrapper.notIn(FlowWorkOrder::getFlowStatus, FlowTaskStatus.FINISHED, FlowTaskStatus.CANCELLED, FlowTaskStatus.STOPPED); @@ -128,20 +131,6 @@ public class FlowWorkOrderServiceImpl extends BaseService i return flowWorkOrderMapper.selectCount(queryWrapper) > 0; } - @Transactional(rollbackFor = Exception.class) - @Override - public void updateFlowStatusByBusinessKey(String businessKey, int flowStatus) { - FlowWorkOrder flowWorkOrder = new FlowWorkOrder(); - flowWorkOrder.setFlowStatus(flowStatus); - if (FlowTaskStatus.FINISHED != flowStatus) { - flowWorkOrder.setUpdateTime(new Date()); - flowWorkOrder.setUpdateUserId(TokenData.takeFromRequest().getUserId()); - } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(FlowWorkOrder::getBusinessKey, businessKey); - flowWorkOrderMapper.update(flowWorkOrder, queryWrapper); - } - @Transactional(rollbackFor = Exception.class) @Override public void updateFlowStatusByProcessInstanceId(String processInstanceId, int flowStatus) { diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseDataSyncExtHelper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseDataSyncExtHelper.java new file mode 100644 index 00000000..5a2f3a4b --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseDataSyncExtHelper.java @@ -0,0 +1,59 @@ +package com.orangeforms.common.flow.util; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.orangeforms.common.flow.base.service.BaseFlowService; +import lombok.extern.slf4j.Slf4j; + +import java.util.HashMap; +import java.util.Map; + +/** + * 工作流实例执行结束之后，需要需要做业务表的数据同步，可实现该接口。 + * 该插件通常用于一张表单多次提交的场景。为了避免修改后的审批中数据，由于尚未通过审批，而此时依赖该业务作为关联表时， + * 关联到的数据往往是尚未通过审批的脏数据，因此需要做审批表和发布表的数据隔离。仅当审批流程完全结束且通过审批后，在 + * 将审批表及其一对一、一对多、多对多关联表中的数据，同步到发布表及其关联表中。至于具体需要同步那些表数据，需按需求而定。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Slf4j +public class BaseDataSyncExtHelper { + + private Map serviceMap = new HashMap<>(); + + /** + * 子类要基于自身所处理的流程定义标识，把子类的this对象，注册到父类的map中。 + * + * @param processDefinitionKey 流程定义标识。 + * @param service 流程服务实现基类。 + */ + public synchronized void doRegister(String processDefinitionKey, BaseFlowService service) { + Assert.isTrue(StrUtil.isNotBlank(processDefinitionKey)); + Assert.notNull(service); + serviceMap.put(processDefinitionKey, service); + } + + /** + * + * 流程结束监听器(FlowFinishedListener) 会在流程结束时调用该方法。 + * + * @param processDefinitionKey 流程定义标识。 + * @param processInstanceId 流程实例Id。 + * @param businessKey 业务主表的主键Id。 + */ + public void triggerSync(String processDefinitionKey, String processInstanceId, String businessKey) { + BaseFlowService service = serviceMap.get(processDefinitionKey); + if (service != null) { + try { + service.doSyncBusinessData(processInstanceId, businessKey); + } catch (Exception e) { + String errorMessage = String.format( + "Failed to call doSyncBusinessData with processDefinitionKey {%s}, businessKey {%s}", + processDefinitionKey, businessKey); + log.error(errorMessage, e); + throw e; + } + } + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseFlowIdentityExtHelper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseFlowIdentityExtHelper.java new file mode 100644 index 00000000..5f3e830e --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/BaseFlowIdentityExtHelper.java @@ -0,0 +1,162 @@ +package com.orangeforms.common.flow.util; + +import com.orangeforms.common.flow.listener.DeptPostLeaderListener; +import com.orangeforms.common.flow.listener.UpDeptPostLeaderListener; +import org.activiti.engine.delegate.TaskListener; + +import java.util.Map; +import java.util.Set; + +/** + * 工作流与用户身份相关的自定义扩展接口，需要业务模块自行实现该接口。也可以根据实际需求扩展该接口的方法。 + * 目前支持的主键类型为字符型和长整型，所以这里提供了两套实现接口。可根据实际情况实现其中一套即可。 + * + * @author Jerry + * @date 2021-06-06 + */ +public interface BaseFlowIdentityExtHelper { + + /** + * 根据(字符型)部门Id，获取当前用户部门领导所有的部门岗位Id。 + * + * @param deptId 用户所在部门Id。 + * @return 当前用户部门领导所有的部门岗位Id。 + */ + default String getLeaderDeptPostId(String deptId) { + return null; + } + + /** + * 根据(字符型)部门Id，获取当前用户上级部门领导所有的部门岗位Id。 + * + * @param deptId 用户所在部门Id。 + * @return 当前用户上级部门领导所有的部门岗位Id。 + */ + default String getUpLeaderDeptPostId(String deptId) { + return null; + } + + /** + * 获取(字符型)指定部门上级部门的指定岗位集合的DeptPostId集合。 + * + * @param deptId 指定的部门Id。 + * @param postIdSet 指定的岗位Id集合。 + * @return 与该部门Id上级部门关联的岗位Id集合，key对应参数中的postId，value是与key对应的deptPostId。 + */ + default Map getUpDeptPostIdMap(String deptId, Set postIdSet) { + return null; + } + + /** + * 获取(字符型)指定部门的指定岗位集合的DeptPostId集合。 + * + * @param deptId 指定的部门Id。 + * @param postIdSet 指定的岗位Id集合。 + * @return 与部门关联的岗位Id集合，key对应参数中的postId，value是与key对应的deptPostId。 + */ + default Map getDeptPostIdMap(String deptId, Set postIdSet) { + return null; + } + + /** + * 根据(长整型)部门Id，获取当前用户部门领导所有的部门岗位Id。 + * + * @param deptId 用户所在部门Id。 + * @return 当前用户部门领导所有的部门岗位Id。 + */ + default Long getLeaderDeptPostId(Long deptId) { + return null; + } + + /** + * 根据(长整型)部门Id，获取当前用户上级部门领导所有的部门岗位Id。 + * + * @param deptId 用户所在部门Id。 + * @return 当前用户上级部门领导所有的部门岗位Id。 + */ + default Long getUpLeaderDeptPostId(Long deptId) { + return null; + } + + /** + * 获取(长整型)指定部门的指定岗位集合的DeptPostId集合。 + * + * @param deptId 指定的部门Id。 + * @param postIdSet 指定的岗位Id集合。 + * @return 与部门关联的岗位Id集合，key对应参数中的postId，value是与key对应的deptPostId。 + */ + default Map getDeptPostIdMap(Long deptId, Set postIdSet) { + return null; + } + + /** + * 获取(长整型)指定部门上级部门的指定岗位集合的DeptPostId集合。 + * + * @param deptId 指定的部门Id。 + * @param postIdSet 指定的岗位Id集合。 + * @return 与该部门Id上级部门关联的岗位Id集合，key对应参数中的postId，value是与key对应的deptPostId。 + */ + default Map getUpDeptPostIdMap(Long deptId, Set postIdSet) { + return null; + } + + /** + * 根据角色Id集合，查询所属的用户名列表。 + * + * @param roleIdSet 角色Id集合。 + * @return 所属的用户列表。 + */ + default Set getUsernameListByRoleIds(Set roleIdSet) { + return null; + } + + /** + * 根据部门Id集合，查询所属的用户名列表。 + * + * @param deptIdSet 部门Id集合。 + * @return 所属的用户列表。 + */ + default Set getUsernameListByDeptIds(Set deptIdSet) { + return null; + } + + /** + * 根据岗位Id集合，查询所属的用户名列表。 + * + * @param postIdSet 岗位Id集合。 + * @return 所属的用户列表。 + */ + default Set getUsernameListByPostIds(Set postIdSet) { + return null; + } + + /** + * 根据部门岗位Id集合，查询所属的用户名列表。 + * + * @param deptPostIdSet 部门岗位Id集合。 + * @return 所属的用户列表。 + */ + default Set getUsernameListByDeptPostIds(Set deptPostIdSet) { + return null; + } + + /** + * 获取任务执行人是当前部门领导岗位的任务监听器。 + * 通常会在没有找到领导部门岗位Id的时候，为当前任务指定其他的指派人、候选人或候选组。 + * + * @return 任务监听器。 + */ + default Class getDeptPostLeaderListener() { + return DeptPostLeaderListener.class; + } + + /** + * 获取任务执行人是上级部门领导岗位的任务监听器。 + * 通常会在没有找到领导部门岗位Id的时候，为当前任务指定其他的指派人、候选人或候选组。 + * + * @return 任务监听器。 + */ + default Class getUpDeptPostLeaderListener() { + return UpDeptPostLeaderListener.class; + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowCustomExtFactory.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowCustomExtFactory.java new file mode 100644 index 00000000..60c7e5ce --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowCustomExtFactory.java @@ -0,0 +1,44 @@ +package com.orangeforms.common.flow.util; + +import org.springframework.stereotype.Component; + +/** + * 工作流自定义扩展工厂类。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Component +public class FlowCustomExtFactory { + + private BaseFlowIdentityExtHelper flowIdentityExtHelper; + + private BaseDataSyncExtHelper dataSyncExtHelper = new BaseDataSyncExtHelper(); + + /** + * 获取业务模块自行实现的用户身份相关的扩展帮助实现类。 + * + * @return 业务模块自行实现的用户身份相关的扩展帮助实现类。 + */ + public BaseFlowIdentityExtHelper getFlowIdentityExtHelper() { + return flowIdentityExtHelper; + } + + /** + * 注册业务模块自行实现的用户身份扩展帮助实现类。 + * + * @param helper 业务模块自行实现的用户身份扩展帮助实现类。 + */ + public void registerFlowIdentityExtHelper(BaseFlowIdentityExtHelper helper) { + this.flowIdentityExtHelper = helper; + } + + /** + * 获取流程结束后数据同步的帮助实现类。 + * + * @return 流程结束后数据同步的帮助实现类。 + */ + public BaseDataSyncExtHelper getDataSyncExtHelper() { + return dataSyncExtHelper; + } +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/util/FlowOperationHelper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowOperationHelper.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/util/FlowOperationHelper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowOperationHelper.java index 061cad02..a7633c29 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/util/FlowOperationHelper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/util/FlowOperationHelper.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.util; +package com.orangeforms.common.flow.util; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,24 +6,24 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.CallResult; -import com.flow.demo.common.core.object.ResponseResult; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.flow.constant.FlowApprovalType; -import com.flow.demo.common.flow.constant.FlowConstant; -import com.flow.demo.common.flow.constant.FlowTaskStatus; -import com.flow.demo.common.flow.dto.FlowTaskCommentDto; -import com.flow.demo.common.flow.dto.FlowWorkOrderDto; -import com.flow.demo.common.flow.model.FlowEntry; -import com.flow.demo.common.flow.model.FlowEntryPublish; -import com.flow.demo.common.flow.model.FlowWorkOrder; -import com.flow.demo.common.flow.model.constant.FlowEntryStatus; -import com.flow.demo.common.flow.service.FlowApiService; -import com.flow.demo.common.flow.service.FlowEntryService; -import com.flow.demo.common.flow.vo.FlowWorkOrderVo; -import com.flow.demo.common.flow.vo.TaskInfoVo; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.CallResult; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.flow.constant.FlowApprovalType; +import com.orangeforms.common.flow.constant.FlowConstant; +import com.orangeforms.common.flow.constant.FlowTaskStatus; +import com.orangeforms.common.flow.dto.FlowTaskCommentDto; +import com.orangeforms.common.flow.dto.FlowWorkOrderDto; +import com.orangeforms.common.flow.model.FlowEntry; +import com.orangeforms.common.flow.model.FlowEntryPublish; +import com.orangeforms.common.flow.model.FlowWorkOrder; +import com.orangeforms.common.flow.model.constant.FlowEntryStatus; +import com.orangeforms.common.flow.service.FlowApiService; +import com.orangeforms.common.flow.service.FlowEntryService; +import com.orangeforms.common.flow.vo.FlowWorkOrderVo; +import com.orangeforms.common.flow.vo.TaskInfoVo; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricTaskInstance; @@ -127,7 +127,7 @@ public class FlowOperationHelper { return ResponseResult.success(task); } String errorMessage; - if (StrUtil.equals(flowTaskComment.getApprovalType(), FlowApprovalType.TRANSFER)) { + if (flowTaskComment != null && StrUtil.equals(flowTaskComment.getApprovalType(), FlowApprovalType.TRANSFER)) { if (StrUtil.isBlank(flowTaskComment.getDelegateAssginee())) { errorMessage = "数据验证失败，加签或转办任务指派人不能为空！！"; return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowCategoryVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowCategoryVo.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowCategoryVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowCategoryVo.java index 9c36f2bd..9e528bb5 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowCategoryVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowCategoryVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryPublishVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryPublishVo.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryPublishVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryPublishVo.java index 7bf65df9..6c6d19d1 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryPublishVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryPublishVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVariableVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVariableVo.java similarity index 95% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVariableVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVariableVo.java index 2e33adfc..2be98838 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVariableVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVariableVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVo.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVo.java index f9f893a6..421b23cc 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowEntryVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowEntryVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowMessageVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowMessageVo.java new file mode 100644 index 00000000..184b9358 --- /dev/null +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowMessageVo.java @@ -0,0 +1,110 @@ +package com.orangeforms.common.flow.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * 工作流通知消息Vo对象。 + * + * @author Jerry + * @date 2021-06-06 + */ +@Data +public class FlowMessageVo { + + /** + * 主键Id。 + */ + private Long messageId; + + /** + * 消息类型。 + */ + private Integer messageType; + + /** + * 消息内容。 + */ + private String messageContent; + + /** + * 催办次数。 + */ + private Integer remindCount; + + /** + * 工单Id。 + */ + private Long workOrderId; + + /** + * 流程定义Id。 + */ + private String processDefinitionId; + + /** + * 流程定义标识。 + */ + private String processDefinitionKey; + + /** + * 流程名称。 + */ + private String processDefinitionName; + + /** + * 流程实例Id。 + */ + private String processInstanceId; + + /** + * 流程实例发起者。 + */ + private String processInstanceInitiator; + + /** + * 流程任务Id。 + */ + private String taskId; + + /** + * 流程任务定义标识。 + */ + private String taskDefinitionKey; + + /** + * 流程任务名称。 + */ + private String taskName; + + /** + * 创建时间。 + */ + private Date taskStartTime; + + /** + * 更新时间。 + */ + private Date updateTime; + + /** + * 更新者Id。 + */ + private Long updateUserId; + + /** + * 创建时间。 + */ + private Date createTime; + + /** + * 创建者Id。 + */ + private Long createUserId; + + /** + * 创建者显示名。 + */ + private String createUsername; +} diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskCommentVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskCommentVo.java similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskCommentVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskCommentVo.java index d73f0fb5..f751142e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskCommentVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskCommentVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskVo.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskVo.java index 9818892f..4357120c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowTaskVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowTaskVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import lombok.Data; @@ -72,4 +72,9 @@ public class FlowTaskVo { * 流程实例创建时间。 */ private Date processInstanceStartTime; + + /** + * 流程实例主表业务数据主键。 + */ + private String businessKey; } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowWorkOrderVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowWorkOrderVo.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowWorkOrderVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowWorkOrderVo.java index f4fbd4f6..6428c78a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/FlowWorkOrderVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/FlowWorkOrderVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import com.alibaba.fastjson.JSONArray; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/TaskInfoVo.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/TaskInfoVo.java similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/TaskInfoVo.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/TaskInfoVo.java index 585ff88e..a1665877 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/flow/demo/common/flow/vo/TaskInfoVo.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/java/com/orangeforms/common/flow/vo/TaskInfoVo.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.flow.vo; +package com.orangeforms.common.flow.vo; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/resources/META-INF/spring.factories b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/resources/META-INF/spring.factories index b6a8bca9..6d14614a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/resources/META-INF/spring.factories +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-flow/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.flow.demo.common.flow.config.FlowAutoConfig \ No newline at end of file +com.orangeforms.common.flow.config.FlowAutoConfig \ No newline at end of file diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/pom.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/pom.xml index f942612c..d5b6e39b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/pom.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.flow.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.flow.demo + com.orangeforms common-sequence 1.0.0 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/annotation/OperationLog.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java similarity index 82% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/annotation/OperationLog.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java index 7be072a4..b576e528 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/annotation/OperationLog.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java @@ -1,6 +1,6 @@ -package com.flow.demo.common.log.annotation; +package com.orangeforms.common.log.annotation; -import com.flow.demo.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.model.constant.SysOperationLogType; import java.lang.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/aop/OperationLogAspect.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/aop/OperationLogAspect.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java index 32b2d492..991f13ec 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/aop/OperationLogAspect.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java @@ -1,20 +1,20 @@ -package com.flow.demo.common.log.aop; +package com.orangeforms.common.log.aop; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.flow.demo.common.core.constant.ApplicationConstant; -import com.flow.demo.common.core.object.ResponseResult; -import com.flow.demo.common.core.object.TokenData; -import com.flow.demo.common.core.util.ContextUtil; -import com.flow.demo.common.core.util.IpUtil; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.log.annotation.OperationLog; -import com.flow.demo.common.log.config.OperationLogProperties; -import com.flow.demo.common.log.model.SysOperationLog; -import com.flow.demo.common.log.model.constant.SysOperationLogType; -import com.flow.demo.common.log.service.SysOperationLogService; -import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.object.TokenData; +import com.orangeforms.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.IpUtil; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.log.annotation.OperationLog; +import com.orangeforms.common.log.config.OperationLogProperties; +import com.orangeforms.common.log.model.SysOperationLog; +import com.orangeforms.common.log.model.constant.SysOperationLogType; +import com.orangeforms.common.log.service.SysOperationLogService; +import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; @@ -63,7 +63,7 @@ public class OperationLogAspect { /** * 所有controller方法。 */ - @Pointcut("execution(public * com.flow.demo..controller..*(..))") + @Pointcut("execution(public * com.orangeforms..controller..*(..))") public void operationLogPointCut() { // 空注释，避免sonar警告 } @@ -80,7 +80,7 @@ public class OperationLogAspect { response.setHeader(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId); MDC.put(ApplicationConstant.HTTP_HEADER_TRACE_ID, traceId); TokenData tokenData = TokenData.takeFromRequest(); - // 为log4j2日志设定变量，使日志可以输出更多有价值的信息。 + // 为日志框架设定变量，使日志可以输出更多有价值的信息。 if (tokenData != null) { MDC.put("sessionId", tokenData.getSessionId()); MDC.put("userId", tokenData.getUserId().toString()); @@ -129,6 +129,11 @@ public class OperationLogAspect { operationLog.setElapse(System.currentTimeMillis() - start); operationLogService.saveNewAsync(operationLog); } + MDC.remove(ApplicationConstant.HTTP_HEADER_TRACE_ID); + if (tokenData != null) { + MDC.remove("sessionId"); + MDC.remove("userId"); + } } return result; } diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/CommonLogAutoConfig.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/CommonLogAutoConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java index ca0eab7f..a1455d7b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/CommonLogAutoConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.log.config; +package com.orangeforms.common.log.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/OperationLogProperties.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/OperationLogProperties.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java index f7c08276..2267f3a7 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/config/OperationLogProperties.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.log.config; +package com.orangeforms.common.log.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/SysOperationLogMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java similarity index 84% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/SysOperationLogMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java index ab3a0ac2..468e0950 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/SysOperationLogMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.log.dao; +package com.orangeforms.common.log.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.log.model.SysOperationLog; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.log.model.SysOperationLog; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/mapper/SysOperationLogMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml similarity index 95% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/mapper/SysOperationLogMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml index 3ed7752d..891a882d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/dao/mapper/SysOperationLogMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -87,7 +87,7 @@ - SELECT * FROM zz_sys_operation_log diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/SysOperationLog.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/SysOperationLog.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java index bf382eca..4070453d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/SysOperationLog.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.log.model; +package com.orangeforms.common.log.model; import com.baomidou.mybatisplus.annotation.*; -import com.flow.demo.common.core.annotation.TenantFilterColumn; +import com.orangeforms.common.core.annotation.TenantFilterColumn; import lombok.Data; import java.util.Date; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/constant/SysOperationLogType.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java similarity index 84% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/constant/SysOperationLogType.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java index 1fdc5a04..bd6838da 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/model/constant/SysOperationLogType.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.log.model.constant; +package com.orangeforms.common.log.model.constant; import java.util.HashMap; import java.util.Map; @@ -86,23 +86,27 @@ public final class SysOperationLogType { /** * 启动流程。 */ - public static final int START_PROCESS = 100; + public static final int START_FLOW = 100; /** * 停止流程。 */ - public static final int STOP_PROCESS = 105; + public static final int STOP_FLOW = 105; /** * 删除流程。 */ - public static final int DELETE_PROCESS = 110; + public static final int DELETE_FLOW = 110; /** * 取消流程。 */ - public static final int CANCEL_PROCESS = 115; + public static final int CANCEL_FLOW = 115; /** * 提交任务。 */ public static final int SUBMIT_TASK = 120; + /** + * 催办任务。 + */ + public static final int REMIND_TASK = 125; private static final Map DICT_MAP = new HashMap<>(15); static { @@ -124,11 +128,12 @@ public final class SysOperationLogType { DICT_MAP.put(UNPUBLISH, "取消发布"); DICT_MAP.put(SUSPEND, "暂停"); DICT_MAP.put(RESUME, "恢复"); - DICT_MAP.put(START_PROCESS, "启动流程"); - DICT_MAP.put(STOP_PROCESS, "停止流程"); - DICT_MAP.put(DELETE_PROCESS, "删除流程"); - DICT_MAP.put(CANCEL_PROCESS, "取消流程"); + DICT_MAP.put(START_FLOW, "启动流程"); + DICT_MAP.put(STOP_FLOW, "停止流程"); + DICT_MAP.put(DELETE_FLOW, "删除流程"); + DICT_MAP.put(CANCEL_FLOW, "取消流程"); DICT_MAP.put(SUBMIT_TASK, "提交任务"); + DICT_MAP.put(REMIND_TASK, "催办任务"); } /** diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/SysOperationLogService.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/SysOperationLogService.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java index 77edbcc6..7798ee26 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/SysOperationLogService.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.log.service; +package com.orangeforms.common.log.service; -import com.flow.demo.common.core.base.service.IBaseService; -import com.flow.demo.common.log.model.SysOperationLog; +import com.orangeforms.common.core.base.service.IBaseService; +import com.orangeforms.common.log.model.SysOperationLog; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/impl/SysOperationLogServiceImpl.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/impl/SysOperationLogServiceImpl.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java index 0f39a673..8a6772f5 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/flow/demo/common/log/service/impl/SysOperationLogServiceImpl.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.flow.demo.common.log.service.impl; +package com.orangeforms.common.log.service.impl; -import com.flow.demo.common.core.annotation.MyDataSource; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.core.base.service.BaseService; -import com.flow.demo.common.core.constant.ApplicationConstant; -import com.flow.demo.common.log.dao.SysOperationLogMapper; -import com.flow.demo.common.log.model.SysOperationLog; -import com.flow.demo.common.log.service.SysOperationLogService; +import com.orangeforms.common.core.annotation.MyDataSource; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.core.base.service.BaseService; +import com.orangeforms.common.core.constant.ApplicationConstant; +import com.orangeforms.common.log.dao.SysOperationLogMapper; +import com.orangeforms.common.log.model.SysOperationLog; +import com.orangeforms.common.log.service.SysOperationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/resources/META-INF/spring.factories b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/resources/META-INF/spring.factories index f8856ec0..c1551ebc 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/resources/META-INF/spring.factories +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-log/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.flow.demo.common.log.config.CommonLogAutoConfig \ No newline at end of file +com.orangeforms.common.log.config.CommonLogAutoConfig \ No newline at end of file diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/pom.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/pom.xml index f79838d1..10097b10 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/pom.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.flow.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,7 +16,7 @@ - com.flow.demo + com.orangeforms common-online 1.0.0 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiAutoConfig.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiAutoConfig.java similarity index 84% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiAutoConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiAutoConfig.java index b4d2e47f..cfe07d7d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiAutoConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiAutoConfig.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.online.api.config; +package com.orangeforms.common.online.api.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiProperties.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiProperties.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiProperties.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiProperties.java index e39b804b..76c3501b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/config/OnlineApiProperties.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/config/OnlineApiProperties.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.online.api.config; +package com.orangeforms.common.online.api.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineColumnController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineColumnController.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineColumnController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineColumnController.java index c946cab6..530b8c99 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineColumnController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineColumnController.java @@ -1,23 +1,23 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import cn.hutool.core.collection.CollUtil; import cn.jimmyshi.beanquery.BeanQuery; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineColumnDto; -import com.flow.demo.common.online.dto.OnlineColumnRuleDto; -import com.flow.demo.common.online.dto.OnlineRuleDto; -import com.flow.demo.common.online.model.*; -import com.flow.demo.common.online.object.SqlTableColumn; -import com.flow.demo.common.online.service.*; -import com.flow.demo.common.online.vo.OnlineColumnRuleVo; -import com.flow.demo.common.online.vo.OnlineColumnVo; -import com.flow.demo.common.online.vo.OnlineRuleVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineColumnDto; +import com.orangeforms.common.online.dto.OnlineColumnRuleDto; +import com.orangeforms.common.online.dto.OnlineRuleDto; +import com.orangeforms.common.online.model.*; +import com.orangeforms.common.online.object.SqlTableColumn; +import com.orangeforms.common.online.service.*; +import com.orangeforms.common.online.vo.OnlineColumnRuleVo; +import com.orangeforms.common.online.vo.OnlineColumnVo; +import com.orangeforms.common.online.vo.OnlineRuleVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceController.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceController.java index 5d97ab61..691c0730 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceController.java @@ -1,21 +1,21 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import cn.hutool.core.collection.CollUtil; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.AddGroup; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineDatasourceDto; -import com.flow.demo.common.online.model.*; -import com.flow.demo.common.online.model.constant.PageType; -import com.flow.demo.common.online.object.SqlTable; -import com.flow.demo.common.online.object.SqlTableColumn; -import com.flow.demo.common.online.service.*; -import com.flow.demo.common.online.vo.OnlineDatasourceVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.AddGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineDatasourceDto; +import com.orangeforms.common.online.model.*; +import com.orangeforms.common.online.model.constant.PageType; +import com.orangeforms.common.online.object.SqlTable; +import com.orangeforms.common.online.object.SqlTableColumn; +import com.orangeforms.common.online.service.*; +import com.orangeforms.common.online.vo.OnlineDatasourceVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceRelationController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceRelationController.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceRelationController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceRelationController.java index 717db701..1e28acec 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDatasourceRelationController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDatasourceRelationController.java @@ -1,20 +1,20 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import cn.hutool.core.collection.CollUtil; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.AddGroup; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineDatasourceRelationDto; -import com.flow.demo.common.online.model.*; -import com.flow.demo.common.online.object.SqlTable; -import com.flow.demo.common.online.object.SqlTableColumn; -import com.flow.demo.common.online.service.*; -import com.flow.demo.common.online.vo.OnlineDatasourceRelationVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.AddGroup; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineDatasourceRelationDto; +import com.orangeforms.common.online.model.*; +import com.orangeforms.common.online.object.SqlTable; +import com.orangeforms.common.online.object.SqlTableColumn; +import com.orangeforms.common.online.service.*; +import com.orangeforms.common.online.vo.OnlineDatasourceRelationVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDblinkController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDblinkController.java similarity index 77% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDblinkController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDblinkController.java index 4d7631c7..cff4aa9c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDblinkController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDblinkController.java @@ -1,19 +1,19 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.MyOrderParam; -import com.flow.demo.common.core.object.MyPageData; -import com.flow.demo.common.core.object.MyPageParam; -import com.flow.demo.common.core.object.ResponseResult; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.online.dto.OnlineDblinkDto; -import com.flow.demo.common.online.model.OnlineDblink; -import com.flow.demo.common.online.object.SqlTable; -import com.flow.demo.common.online.object.SqlTableColumn; -import com.flow.demo.common.online.service.OnlineDblinkService; -import com.flow.demo.common.online.vo.OnlineDblinkVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.MyOrderParam; +import com.orangeforms.common.core.object.MyPageData; +import com.orangeforms.common.core.object.MyPageParam; +import com.orangeforms.common.core.object.ResponseResult; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.online.dto.OnlineDblinkDto; +import com.orangeforms.common.online.model.OnlineDblink; +import com.orangeforms.common.online.object.SqlTable; +import com.orangeforms.common.online.object.SqlTableColumn; +import com.orangeforms.common.online.service.OnlineDblinkService; +import com.orangeforms.common.online.vo.OnlineDblinkVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDictController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDictController.java similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDictController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDictController.java index 58811075..7731f3d0 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineDictController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineDictController.java @@ -1,16 +1,16 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineDictDto; -import com.flow.demo.common.online.model.OnlineDict; -import com.flow.demo.common.online.service.OnlineDictService; -import com.flow.demo.common.online.vo.OnlineDictVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineDictDto; +import com.orangeforms.common.online.model.OnlineDict; +import com.orangeforms.common.online.service.OnlineDictService; +import com.orangeforms.common.online.vo.OnlineDictVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineFormController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineFormController.java similarity index 94% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineFormController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineFormController.java index 07b32746..5e953c77 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineFormController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineFormController.java @@ -1,18 +1,18 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONObject; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineFormDto; -import com.flow.demo.common.online.model.*; -import com.flow.demo.common.online.service.*; -import com.flow.demo.common.online.vo.OnlineFormVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineFormDto; +import com.orangeforms.common.online.model.*; +import com.orangeforms.common.online.service.*; +import com.orangeforms.common.online.vo.OnlineFormVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlinePageController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlinePageController.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlinePageController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlinePageController.java index 6fbd7429..e5c0433c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlinePageController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlinePageController.java @@ -1,26 +1,26 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import com.alibaba.fastjson.JSONObject; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineDatasourceDto; -import com.flow.demo.common.online.dto.OnlinePageDatasourceDto; -import com.flow.demo.common.online.dto.OnlinePageDto; -import com.flow.demo.common.online.model.OnlineDatasource; -import com.flow.demo.common.online.model.OnlinePage; -import com.flow.demo.common.online.model.OnlinePageDatasource; -import com.flow.demo.common.online.model.constant.PageStatus; -import com.flow.demo.common.online.service.OnlineDatasourceService; -import com.flow.demo.common.online.service.OnlineFormService; -import com.flow.demo.common.online.service.OnlinePageService; -import com.flow.demo.common.online.vo.OnlineDatasourceVo; -import com.flow.demo.common.online.vo.OnlinePageDatasourceVo; -import com.flow.demo.common.online.vo.OnlinePageVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineDatasourceDto; +import com.orangeforms.common.online.dto.OnlinePageDatasourceDto; +import com.orangeforms.common.online.dto.OnlinePageDto; +import com.orangeforms.common.online.model.OnlineDatasource; +import com.orangeforms.common.online.model.OnlinePage; +import com.orangeforms.common.online.model.OnlinePageDatasource; +import com.orangeforms.common.online.model.constant.PageStatus; +import com.orangeforms.common.online.service.OnlineDatasourceService; +import com.orangeforms.common.online.service.OnlineFormService; +import com.orangeforms.common.online.service.OnlinePageService; +import com.orangeforms.common.online.vo.OnlineDatasourceVo; +import com.orangeforms.common.online.vo.OnlinePageDatasourceVo; +import com.orangeforms.common.online.vo.OnlinePageVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineRuleController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineRuleController.java similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineRuleController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineRuleController.java index 2eb66557..e5202fe5 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineRuleController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineRuleController.java @@ -1,16 +1,16 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineRuleDto; -import com.flow.demo.common.online.model.OnlineRule; -import com.flow.demo.common.online.service.OnlineRuleService; -import com.flow.demo.common.online.vo.OnlineRuleVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineRuleDto; +import com.orangeforms.common.online.model.OnlineRule; +import com.orangeforms.common.online.service.OnlineRuleService; +import com.orangeforms.common.online.vo.OnlineRuleVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineTableController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineTableController.java similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineTableController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineTableController.java index 6fb5a8f2..41b9cef6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineTableController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineTableController.java @@ -1,17 +1,17 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import cn.jimmyshi.beanquery.BeanQuery; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyModelUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineTableDto; -import com.flow.demo.common.online.model.OnlineTable; -import com.flow.demo.common.online.service.OnlineTableService; -import com.flow.demo.common.online.vo.OnlineTableVo; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyModelUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineTableDto; +import com.orangeforms.common.online.model.OnlineTable; +import com.orangeforms.common.online.service.OnlineTableService; +import com.orangeforms.common.online.vo.OnlineTableVo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineVirtualColumnController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineVirtualColumnController.java similarity index 92% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineVirtualColumnController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineVirtualColumnController.java index e0617663..b79cac32 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/flow/demo/common/online/api/controller/OnlineVirtualColumnController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/java/com/orangeforms/common/online/api/controller/OnlineVirtualColumnController.java @@ -1,16 +1,16 @@ -package com.flow.demo.common.online.api.controller; +package com.orangeforms.common.online.api.controller; import com.github.pagehelper.page.PageMethod; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.*; -import com.flow.demo.common.core.constant.*; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.validator.UpdateGroup; -import com.flow.demo.common.online.dto.OnlineVirtualColumnDto; -import com.flow.demo.common.online.model.OnlineVirtualColumn; -import com.flow.demo.common.online.model.constant.VirtualType; -import com.flow.demo.common.online.service.OnlineVirtualColumnService; -import com.flow.demo.common.online.vo.OnlineVirtualColumnVo; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.*; +import com.orangeforms.common.core.constant.*; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.validator.UpdateGroup; +import com.orangeforms.common.online.dto.OnlineVirtualColumnDto; +import com.orangeforms.common.online.model.OnlineVirtualColumn; +import com.orangeforms.common.online.model.constant.VirtualType; +import com.orangeforms.common.online.service.OnlineVirtualColumnService; +import com.orangeforms.common.online.vo.OnlineVirtualColumnVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/resources/META-INF/spring.factories b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/resources/META-INF/spring.factories index ebe5596f..a894d135 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/resources/META-INF/spring.factories +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online-api/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.flow.demo.common.online.api.config.OnlineApiAutoConfig \ No newline at end of file +com.orangeforms.common.online.api.config.OnlineApiAutoConfig \ No newline at end of file diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/pom.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/pom.xml index 4bdf4c27..92f4fc9c 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/pom.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> common - com.flow.demo + com.orangeforms 1.0.0 4.0.0 @@ -16,27 +16,27 @@ - com.flow.demo + com.orangeforms common-core 1.0.0 - com.flow.demo + com.orangeforms common-datafilter 1.0.0 - com.flow.demo + com.orangeforms common-redis 1.0.0 - com.flow.demo + com.orangeforms common-sequence 1.0.0 - com.flow.demo + com.orangeforms common-log 1.0.0 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineAutoConfig.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineAutoConfig.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineAutoConfig.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineAutoConfig.java index 6c93a151..14478448 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineAutoConfig.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineAutoConfig.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.online.config; +package com.orangeforms.common.online.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineProperties.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineProperties.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineProperties.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineProperties.java index 67adc368..e8b61571 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineProperties.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineProperties.java @@ -1,4 +1,4 @@ -package com.flow.demo.common.online.config; +package com.orangeforms.common.online.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/controller/OnlineOperationController.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/controller/OnlineOperationController.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/controller/OnlineOperationController.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/controller/OnlineOperationController.java index bdc5d113..70b7ca75 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/controller/OnlineOperationController.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/controller/OnlineOperationController.java @@ -1,23 +1,23 @@ -package com.flow.demo.common.online.controller; +package com.orangeforms.common.online.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.flow.demo.common.core.annotation.MyRequestBody; -import com.flow.demo.common.core.constant.ErrorCodeEnum; -import com.flow.demo.common.core.object.*; -import com.flow.demo.common.core.util.ContextUtil; -import com.flow.demo.common.core.util.MyCommonUtil; -import com.flow.demo.common.core.util.MyPageUtil; -import com.flow.demo.common.online.util.OnlineOperationHelper; -import com.flow.demo.common.online.dto.OnlineFilterDto; -import com.flow.demo.common.online.model.*; -import com.flow.demo.common.online.model.constant.DictType; -import com.flow.demo.common.online.model.constant.RelationType; -import com.flow.demo.common.online.object.ColumnData; -import com.flow.demo.common.online.service.*; -import com.flow.demo.common.online.util.OnlineConstant; +import com.orangeforms.common.core.annotation.MyRequestBody; +import com.orangeforms.common.core.constant.ErrorCodeEnum; +import com.orangeforms.common.core.object.*; +import com.orangeforms.common.core.util.ContextUtil; +import com.orangeforms.common.core.util.MyCommonUtil; +import com.orangeforms.common.core.util.MyPageUtil; +import com.orangeforms.common.online.util.OnlineOperationHelper; +import com.orangeforms.common.online.dto.OnlineFilterDto; +import com.orangeforms.common.online.model.*; +import com.orangeforms.common.online.model.constant.DictType; +import com.orangeforms.common.online.model.constant.RelationType; +import com.orangeforms.common.online.object.ColumnData; +import com.orangeforms.common.online.service.*; +import com.orangeforms.common.online.util.OnlineConstant; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnMapper.java similarity index 79% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnMapper.java index 60f7c604..abbd3b22 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineColumn; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineColumn; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnRuleMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnRuleMapper.java similarity index 78% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnRuleMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnRuleMapper.java index f411c5a5..86e52a09 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnRuleMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnRuleMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineColumnRule; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineColumnRule; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceMapper.java similarity index 93% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceMapper.java index 5df3ad52..04d2a01d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineDatasource; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineDatasource; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceRelationMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceRelationMapper.java similarity index 78% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceRelationMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceRelationMapper.java index a29cf4c1..a2cf1021 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceRelationMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceRelationMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineDatasourceRelation; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineDatasourceRelation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceTableMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceTableMapper.java similarity index 51% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceTableMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceTableMapper.java index 5ff316d0..8c219f9b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceTableMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceTableMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineDatasourceTable; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineDatasourceTable; /** * 数据操作访问接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDblinkMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDblinkMapper.java similarity index 96% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDblinkMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDblinkMapper.java index a63f8c30..3fb2e409 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDblinkMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDblinkMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineDblink; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineDblink; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDictMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDictMapper.java similarity index 79% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDictMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDictMapper.java index 96699b58..40b0937a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDictMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDictMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineDict; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineDict; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormDatasourceMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormDatasourceMapper.java similarity index 56% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormDatasourceMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormDatasourceMapper.java index c4511783..1f4a70c5 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormDatasourceMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormDatasourceMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineFormDatasource; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineFormDatasource; /** * 在线表单与数据源多对多关联的数据操作访问接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormMapper.java similarity index 79% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormMapper.java index d1ee9853..2140d67b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineForm; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineForm; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineOperationMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineOperationMapper.java similarity index 97% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineOperationMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineOperationMapper.java index 429832cc..c162d4ed 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineOperationMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineOperationMapper.java @@ -1,8 +1,8 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.online.dto.OnlineFilterDto; -import com.flow.demo.common.online.object.ColumnData; -import com.flow.demo.common.online.object.JoinTableInfo; +import com.orangeforms.common.online.dto.OnlineFilterDto; +import com.orangeforms.common.online.object.ColumnData; +import com.orangeforms.common.online.object.JoinTableInfo; import org.apache.ibatis.annotations.*; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageDatasourceMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageDatasourceMapper.java similarity index 56% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageDatasourceMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageDatasourceMapper.java index 44a337dd..15b1204e 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageDatasourceMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageDatasourceMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlinePageDatasource; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlinePageDatasource; /** * 在线表单页面和数据源关联对象的数据操作访问接口。 diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageMapper.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageMapper.java index 720ce089..ddcd34b6 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlinePage; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlinePage; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineRuleMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineRuleMapper.java similarity index 91% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineRuleMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineRuleMapper.java index b49a07c2..eb365b58 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineRuleMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineRuleMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineRule; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineRule; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineTableMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineTableMapper.java similarity index 85% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineTableMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineTableMapper.java index de884fe2..a897e7d0 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineTableMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineTableMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineTable; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineTable; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineVirtualColumnMapper.java b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineVirtualColumnMapper.java similarity index 79% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineVirtualColumnMapper.java rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineVirtualColumnMapper.java index 9df5f715..c2b5a4c9 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineVirtualColumnMapper.java +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineVirtualColumnMapper.java @@ -1,7 +1,7 @@ -package com.flow.demo.common.online.dao; +package com.orangeforms.common.online.dao; -import com.flow.demo.common.core.base.dao.BaseDaoMapper; -import com.flow.demo.common.online.model.OnlineVirtualColumn; +import com.orangeforms.common.core.base.dao.BaseDaoMapper; +import com.orangeforms.common.online.model.OnlineVirtualColumn; import org.apache.ibatis.annotations.Param; import java.util.*; diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnMapper.xml similarity index 90% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnMapper.xml index f225b2f2..c6bc89ac 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -29,7 +29,7 @@ - + @@ -44,7 +44,7 @@ - SELECT * FROM zz_online_column diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnRuleMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnRuleMapper.xml similarity index 70% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnRuleMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnRuleMapper.xml index c148f826..51911c7d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnRuleMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnRuleMapper.xml @@ -1,15 +1,15 @@ - - + + - + + notNullColumn="rule_id" resultMap="com.orangeforms.common.online.dao.OnlineRuleMapper.BaseResultMap" /> + + parameterType="com.orangeforms.common.online.model.OnlineDatasourceRelation"> SELECT * FROM zz_online_datasource_relation diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceTableMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceTableMapper.xml similarity index 71% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceTableMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceTableMapper.xml index 950cd44d..d3ba6aaa 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceTableMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceTableMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDblinkMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDblinkMapper.xml similarity index 81% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDblinkMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDblinkMapper.xml index 934d9c55..99ffaf81 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDblinkMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDblinkMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - SELECT * FROM zz_online_dblink diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDictMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDictMapper.xml similarity index 89% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDictMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDictMapper.xml index 4edf13c3..a0cd621b 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDictMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDictMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - SELECT * FROM zz_online_dict diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormDatasourceMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormDatasourceMapper.xml similarity index 68% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormDatasourceMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormDatasourceMapper.xml index 238817c1..5d0924ff 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormDatasourceMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormDatasourceMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormMapper.xml similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormMapper.xml index 1b149915..2cae7f70 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + @@ -39,7 +39,7 @@ - SELECT * FROM zz_online_form diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageDatasourceMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageDatasourceMapper.xml similarity index 68% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageDatasourceMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageDatasourceMapper.xml index 717508a7..47d8b88d 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageDatasourceMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageDatasourceMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageMapper.xml similarity index 87% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageMapper.xml index b1544811..9f72c41a 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ - SELECT * FROM zz_online_page diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineRuleMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineRuleMapper.xml similarity index 82% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineRuleMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineRuleMapper.xml index c4e90699..f9d1c8ba 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineRuleMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineRuleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -12,17 +12,17 @@ - + + notNullColumn="rule_id" resultMap="com.orangeforms.common.online.dao.OnlineColumnRuleMapper.BaseResultMap" /> - AND zz_online_rule.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL} + AND zz_online_rule.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - SELECT * FROM zz_online_rule diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineTableMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineTableMapper.xml similarity index 86% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineTableMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineTableMapper.xml index d940a3d3..4bc9b6be 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineTableMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineTableMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -31,7 +31,7 @@ - SELECT * FROM zz_online_table diff --git a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineVirtualColumnMapper.xml b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineVirtualColumnMapper.xml similarity index 88% rename from orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineVirtualColumnMapper.xml rename to orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineVirtualColumnMapper.xml index 7a5ca29c..1dbc69e8 100644 --- a/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineVirtualColumnMapper.xml +++ b/orange-demo-activiti/orange-demo-activiti-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineVirtualColumnMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,7 +19,7 @@ - + @@ -44,7 +44,7 @@