ibizdev提交

app_web/src/service/entity-service.ts

@@ -628,13 +628,16 @@ export default class EntityService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
-     * @param {boolean} [isEmbeddedApp]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFStart(context: any = {},data: any = {}, isloading?: boolean,isEmbeddedApp?:boolean): Promise<any> {
-        if(isEmbeddedApp){
-            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,data,isloading);
+    public async WFStart(context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        if(localdata && Object.keys(localdata).length > 0){
+            const requestData:any = {};
+            Object.assign(requestData,{activedata:data});
+            Object.assign(requestData,localdata);
+            return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/process-instances`,requestData,isloading);
         }else{
             const requestData:any = {};
             Object.assign(requestData,{wfdata:data});

app_web/src/widgets/wfgroup/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfgroup/main-form/main-form-base.vue

@@ -1251,10 +1251,11 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.WFStartAction){
                 this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
@@ -1269,7 +1270,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1326,7 +1327,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!arg.wfgroup || Object.is(arg.wfgroup, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){

app_web/src/widgets/wfgroup/main-form/main-form-service.ts

@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfmember/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfmember/main-form/main-form-base.vue

@@ -1260,10 +1260,11 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.WFStartAction){
                 this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
@@ -1278,7 +1279,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1335,7 +1336,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!arg.wfmember || Object.is(arg.wfmember, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){

app_web/src/widgets/wfmember/main-form/main-form-service.ts

@@ -103,20 +103,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -1365,10 +1365,11 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.WFStartAction){
                 this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
@@ -1383,7 +1384,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1440,7 +1441,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!arg.wfprocessdefinition || Object.is(arg.wfprocessdefinition, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){

app_web/src/widgets/wfprocess-definition/main-form/main-form-service.ts

@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfuser/default-searchform/default-searchform-service.ts

@@ -91,20 +91,21 @@ export default class DefaultService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof DefaultService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

app_web/src/widgets/wfuser/main-form/main-form-base.vue

@@ -1209,10 +1209,11 @@ export default class MainBase extends Vue implements ControlInterface {
      * 工作流启动
      *
      * @param {*} [data={}]
+     * @param {*} [localdata={}]
      * @returns {Promise<any>}
      * @memberof Main
      */
-    protected async wfstart(data: any): Promise<any> {
+    protected async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.WFStartAction){
                 this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
@@ -1227,7 +1228,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
-                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+                const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
                         this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
@@ -1284,7 +1285,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!arg.wfuser || Object.is(arg.wfuser, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response:any) =>{
                 const arg:any = response.data;
                 if(this.viewparams){

app_web/src/widgets/wfuser/main-form/main-form-service.ts

@@ -91,20 +91,21 @@ export default class MainService extends ControlService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {*} [localdata]
      * @returns {Promise<any>}
      * @memberof MainService
      */
     @Errorlog
-    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
         data = this.handleWFData(data);
         context = this.handleRequestData(action,context,data).context;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
-                result = _appEntityService[action](context,data, isloading);
+                result = _appEntityService[action](context,data, isloading,localdata);
             } else {
-                result = this.appEntityService.Create(context,data, isloading);
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
             }
             result.then((response) => {
                 this.handleResponse(action, response);

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

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+import java.util.Set;
+
 @Component
 public class IBZOUFallback implements IBZOUFeignClient {
 
     @Override
-    public JSONObject getOrgInfo(String loginName) {
+    public Map<String, Set<String>> getOUMapsByUserId(String userId) {
         return null;
     }
 }

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

 package cn.ibizlab.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-@FeignClient(value = "ibzou",fallback = IBZOUFallback.class)
+import java.util.Map;
+import java.util.Set;
+
+@FeignClient(value = "ibzou-api",fallback = IBZOUFallback.class)
 public interface IBZOUFeignClient
 {
-
 	/**
 	 * 从ou中获取当前上下级组织、部门信息
-	 * @param loginName 登录名
+	 * @param userId
 	 * @return
 	 */
-	@GetMapping(value = "/ibzou/org/{loginname}")
-	JSONObject getOrgInfo(@PathVariable("loginname") String loginName);
+	@GetMapping("/ibzemployees/{userId}/oumaps")
+	Map<String, Set<String>> getOUMapsByUserId(@PathVariable("userId") String userId);
+
 }

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

@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
-@FeignClient(value = "ibzuaa",fallback = IBZUAAFallback.class)
+@FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
 public interface IBZUAAFeignClient
 {
 	/**
@@ -23,7 +23,7 @@ public interface IBZUAAFeignClient
 	 * @param authorizationLogin 登录信息
 	 * @return
 	 */
-	@PostMapping(value = "/uaa/authentication/login")
+	@PostMapping(value = "/uaa/login")
 	AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin);
 
 }