ibizdev提交

config.xml

@@ -38,6 +38,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
+      mvn clean package -Papi
+      cd ibzuaa-provider/ibzuaa-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 40002
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PERMISSIONSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PSAPPMENUITEMSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PSDEOPPRIVSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PSSYSTEMSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_ROLESearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_ROLE_PERMISSIONSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_USERSearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_USER_ROLESearchContext.java

 package cn.ibizlab.core.uaa.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PERMISSIONServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_PERMISSIONMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[权限/资源] 服务对象接口实现
@@ -152,6 +153,7 @@ public class SYS_PERMISSIONServiceImpl extends ServiceImpl<SYS_PERMISSIONMapper,
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSAPPMENUITEMServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_PSAPPMENUITEMMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[系统菜单项] 服务对象接口实现
@@ -145,6 +146,7 @@ public class SYS_PSAPPMENUITEMServiceImpl extends ServiceImpl<SYS_PSAPPMENUITEMM
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSDEOPPRIVServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_PSDEOPPRIVMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[实体数据操作标识] 服务对象接口实现
@@ -145,6 +146,7 @@ public class SYS_PSDEOPPRIVServiceImpl extends ServiceImpl<SYS_PSDEOPPRIVMapper,
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSTEMServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_PSSYSTEMMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[实体] 服务对象接口实现
@@ -145,6 +146,7 @@ public class SYS_PSSYSTEMServiceImpl extends ServiceImpl<SYS_PSSYSTEMMapper, SYS
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLEServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_ROLEMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[系统角色] 服务对象接口实现
@@ -159,6 +160,7 @@ public class SYS_ROLEServiceImpl extends ServiceImpl<SYS_ROLEMapper, SYS_ROLE> i
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_ROLE_PERMISSIONServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_ROLE_PERMISSIONMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[角色权限关系] 服务对象接口实现
@@ -223,6 +224,7 @@ public class SYS_ROLE_PERMISSIONServiceImpl extends ServiceImpl<SYS_ROLE_PERMISS
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USERServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_USERMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[系统用户] 服务对象接口实现
@@ -152,6 +153,7 @@ public class SYS_USERServiceImpl extends ServiceImpl<SYS_USERMapper, SYS_USER> i
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_USER_ROLEServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.uaa.mapper.SYS_USER_ROLEMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[用户角色关系] 服务对象接口实现
@@ -223,6 +224,7 @@ public class SYS_USER_ROLEServiceImpl extends ServiceImpl<SYS_USER_ROLEMapper, S
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,11 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 8081
\ No newline at end of file
+  port: 40002
\ No newline at end of file

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40002

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

+package cn.ibizlab.util.client;
+
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@Component
+public class IBZWFFallback implements IBZWFFeignClient {
+
+    @Override
+    public List<String> getbusinesskeys(String system, String appname, String entity, String processDefinitionKey, String taskDefinitionKey) {
+        return null;
+    }
+
+    @Override
+    public List<String> getbusinesskeysByUserId(String system, String userId, String entity, String processDefinitionKey, String taskDefinitionKey) {
+        return null;
+    }
+}

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

+package cn.ibizlab.util.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
+public interface IBZWFFeignClient
+{
+	@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
+	List<String> getbusinesskeys(@PathVariable("system") String system, @PathVariable("appname") String appname,
+														@PathVariable("entity") String entity, @PathVariable("processDefinitionKey") String processDefinitionKey, @PathVariable("taskDefinitionKey") String taskDefinitionKey);
+
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
+	List<String> getbusinesskeysByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
+																@PathVariable("entity") String entity,@PathVariable("processDefinitionKey") String processDefinitionKey,@PathVariable("taskDefinitionKey") String taskDefinitionKey);
+}

ibzuaa-util/src/main/java/cn/ibizlab/util/domain/EntityBase.java

@@ -72,6 +72,8 @@ public class EntityBase implements Serializable {
         Hashtable<String,String> keys=DEFieldCacheMap.getFieldKeys(this.getClass().getName());
         if(keys.containsKey(field))
             return getMap().get(keys.get(field));
+        else if(keys.containsKey(field.replace("_","")))
+            return getMap().get(keys.get(field.replace("_","")));
         else
             return this.extensionparams.get(field);
     }
@@ -88,6 +90,8 @@ public class EntityBase implements Serializable {
         Hashtable<String,String> keys=DEFieldCacheMap.getFieldKeys(this.getClass().getName());
         if(keys.containsKey(field))
             getMap().put(keys.get(field),value);
+        else if(keys.containsKey(field.replace("_","")))
+            getMap().put(keys.get(field.replace("_","")),value);
         else
             this.extensionparams.put(field,value);
     }

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

@@ -55,6 +55,14 @@ public class SearchContextBase implements ISearchContext{
      * 排序对象
      */
     public Sort pageSort;
+    /**
+     * 工作流步骤标识
+     */
+    public String userTaskId;
+    /**
+     * 工作流流程标识
+     */
+    public String processDefinitionKey;
     /**
      * 获取分页参数
      * @return