zhouweidong 发布系统代码 [ibz-wf，统一工作流]

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFMemberSearchContext.java

@@ -76,6 +76,20 @@ public class WFMemberSearchContext extends QueryWrapperContext<WFMember> {
             this.getSearchCond().like("personname", n_personname_like);
         }
     }
+	private String n_orgid_eq;//[单位]
+	public void setN_orgid_eq(String n_orgid_eq) {
+        this.n_orgid_eq = n_orgid_eq;
+        if(!ObjectUtils.isEmpty(this.n_orgid_eq)){
+            this.getSearchCond().eq("orgid", n_orgid_eq);
+        }
+    }
+	private String n_mdeptid_eq;//[主部门]
+	public void setN_mdeptid_eq(String n_mdeptid_eq) {
+        this.n_mdeptid_eq = n_mdeptid_eq;
+        if(!ObjectUtils.isEmpty(this.n_mdeptid_eq)){
+            this.getSearchCond().eq("mdeptid", n_mdeptid_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java

@@ -106,9 +106,8 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
     @Transactional
     public WFGroup get(String key) {
         WFGroup et = getById(key);
-        if(et == null){
-            et = new WFGroup();
-            et.setId(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
             et.setWfmember(wfmemberService.selectByGroupid(key));

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -110,9 +110,8 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
     @Transactional
     public WFMember get(String key) {
         WFMember et = getById(key);
-        if(et == null){
-            et = new WFMember();
-            et.setMemberid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessDefinitionServiceImpl.java

@@ -100,9 +100,8 @@ public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinit
     @Transactional
     public WFProcessDefinition get(String key) {
         WFProcessDefinition et = getById(key);
-        if(et == null){
-            et = new WFProcessDefinition();
-            et.setDefinitionkey(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFSystemServiceImpl.java

@@ -100,9 +100,8 @@ public class WFSystemServiceImpl extends ServiceImpl<WFSystemMapper, WFSystem> i
     @Transactional
     public WFSystem get(String key) {
         WFSystem et = getById(key);
-        if(et == null){
-            et = new WFSystem();
-            et.setPssystemid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java

@@ -103,9 +103,8 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
     @Transactional
     public WFUser get(String key) {
         WFUser et = getById(key);
-        if(et == null){
-            et = new WFUser();
-            et.setId(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzwf-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-9-1">
+    <changeSet author="root" id="tab-wf_group-9-1">
         <createTable tableName="IBZWFGROUP">
                 <column name="GROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
@@ -20,7 +20,7 @@
 
 
     <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-10-2">
+    <changeSet author="root" id="tab-wf_group_member-13-2">
         <createTable tableName="IBZWFMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[WF_DEFINITION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-1-3">
+    <changeSet author="root" id="tab-wf_definition-1-3">
         <createTable tableName="IBZWFDEFINITION">
                 <column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
@@ -79,7 +79,7 @@
 
         <!--输出实体[WF_GROUP]外键关系 -->
         <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-10-5">
+    <changeSet author="root" id="fk-wf_group_member-13-5">
        <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
     </changeSet>
         <!--输出实体[WF_DEFINITION]外键关系 -->

ibzwf-core/src/main/resources/mapper/workflow/wfgroup/WFGroupMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFGroupMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzwf-core/src/main/resources/mapper/workflow/wfmember/WFMemberMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFMemberMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzwf-core/src/main/resources/mapper/workflow/wfprocessdefinition/WFProcessDefinitionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFProcessDefinitionMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzwf-core/src/main/resources/mapper/workflow/wfsystem/WFSystemMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFSystemMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzwf-core/src/main/resources/mapper/workflow/wfuser/WFUserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFUserMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFGroupMapping.java

@@ -12,4 +12,3 @@ public interface WFGroupMapping extends MappingBase<WFGroupDTO, WFGroup> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFMemberMapping.java

@@ -12,4 +12,3 @@ public interface WFMemberMapping extends MappingBase<WFMemberDTO, WFMember> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFProcessDefinitionMapping.java

@@ -12,4 +12,3 @@ public interface WFProcessDefinitionMapping extends MappingBase<WFProcessDefinit
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFREModelMapping.java

@@ -12,4 +12,3 @@ public interface WFREModelMapping extends MappingBase<WFREModelDTO, WFREModel> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFSystemMapping.java

@@ -12,4 +12,3 @@ public interface WFSystemMapping extends MappingBase<WFSystemDTO, WFSystem> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFTaskMapping.java

@@ -12,4 +12,3 @@ public interface WFTaskMapping extends MappingBase<WFTaskDTO, WFTask> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFUserMapping.java

@@ -12,4 +12,3 @@ public interface WFUserMapping extends MappingBase<WFUserDTO, WFUser> {
 
 
 }
-

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFMemberResource.java

@@ -136,7 +136,6 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"成员" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchDefault(WFMemberSearchContext context) {
@@ -149,7 +148,6 @@ public class WFMemberResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "查询DEFAULT", tags = {"成员" } ,notes = "查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchDefault(@RequestBody WFMemberSearchContext context) {
@@ -265,7 +263,6 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "根据角色/用户组获取DEFAULT", tags = {"成员" } ,notes = "根据角色/用户组获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfgroups/{wfgroup_id}/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id,WFMemberSearchContext context) {
@@ -279,7 +276,6 @@ public class WFMemberResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "根据角色/用户组查询DEFAULT", tags = {"成员" } ,notes = "根据角色/用户组查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberSearchContext context) {
@@ -393,7 +389,6 @@ public class WFMemberResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "根据用户获取DEFAULT", tags = {"成员" } ,notes = "根据用户获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/fetchdefault")
 	public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) {
@@ -407,7 +402,6 @@ public class WFMemberResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzwf-WFMember-searchDefault-all') and hasPermission(#context,'ibzwf-WFMember-Get')")
 	@ApiOperation(value = "根据用户查询DEFAULT", tags = {"成员" } ,notes = "根据用户查询DEFAULT")
     @RequestMapping(method= RequestMethod.POST , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
 	public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberSearchContext context) {

ibzwf-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
 	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
+
 }

ibzwf-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
 
 import lombok.Data;
 import org.flowable.bpmn.model.Process;
+import org.springframework.core.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import java.io.File;
 import java.io.Serializable;
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
     Process process;
     KieContainer container;
     List<DELogic> refLogic;
-    List<File> refRuleFiles;
+    List<Resource> refRuleFiles;
     String md5;
 }

ibzwf-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
     /**
      * 获取工作流步骤标识
      */

ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -254,6 +254,7 @@ public class AuthenticationUser implements UserDetails
 		if(this.sessionParams==null)
 		{
 			sessionParams = getUserSessionParam();
+			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());
 			sessionParams.put("srforgsectorid", this.getMdeptid());

ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
 import io.jsonwebtoken.ExpiredJwtException;
 import lombok.extern.slf4j.Slf4j;
 import cn.ibizlab.util.service.AuthenticationUserService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @Component