ibizdev提交

app_web/src/engine/view/wfdyna-exp-grid-view-engine.ts

+import GridViewEngine from './grid-view-engine';
+
+/**
+ * 视图引擎基础
+ *
+ * @export
+ * @class WFDynaExpGridViewEngine
+ * @extends {GridViewEngine}
+ */
+export default class WFDynaExpGridViewEngine extends GridViewEngine {
+
+    /**
+     * Creates an instance of WFDynaExpGridViewEngine.
+     * @memberof WFDynaExpGridViewEngine
+     */
+    constructor() {
+        super();
+    }
+    
+    /**
+     * 引擎加载
+     *
+     * @param {*} [opts={}]
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public load(opts: any = {},isnotify:boolean=false): void {
+        this.view.getWFStepModel().then((res:any) =>{
+            if(!this.view.isformDruipart){
+                super.load(opts);
+            }else{
+                if(isnotify){
+                    super.load(opts);
+                }
+            }
+        })
+    }
+}
\ No newline at end of file

app_web/src/mock/entity/sys-permissions/sys-permissions.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_permissions\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_permission 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_permissions\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_permission 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_permission 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_permissions\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/sys_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_permission 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_permissions\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_permission 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-psappmenuitems/sys-psappmenuitems.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_psappmenuitems\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_psappmenuitem 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_psappmenuitems\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_psappmenuitem 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_psappmenuitems\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psappmenuitem 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_psappmenuitems\/batch$/)).reply((config: any) =>
 mock.onPut(new RegExp(/^\/sys_psappmenuitems\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psappmenuitem 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_psappmenuitems\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_psappmenuitems\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psappmenuitem 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-psdeopprivs/sys-psdeopprivs.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_psdeopprivs\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_psdeoppriv 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_psdeopprivs\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_psdeoppriv 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_psdeopprivs\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psdeoppriv 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_psdeopprivs\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/sys_psdeopprivs\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psdeoppriv 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_psdeopprivs\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_psdeopprivs\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_psdeoppriv 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-role-permissions/sys-role-permissions.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_role_permissions\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_role_permission 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_role_permissions\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_role_permission 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_role_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role_permission 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_role_permissions\/batch$/)).reply((config: any) =
 mock.onPut(new RegExp(/^\/sys_role_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role_permission 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_role_permissions\/batch$/)).reply((config: any) =>
 mock.onDelete(new RegExp(/^\/sys_role_permissions\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role_permission 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-roles/sys-roles.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_roles\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_role 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_roles\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_role 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_roles\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/sys_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_roles\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_role 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-user-roles/sys-user-roles.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_user_roles\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_user_role 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_user_roles\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_user_role 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_user_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user_role 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_user_roles\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/sys_user_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user_role 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_user_roles\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_user_roles\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user_role 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/mock/entity/sys-users/sys-users.ts

@@ -6,10 +6,55 @@ const mock = MockAdapter.getInstance();
 const mockDatas: Array<any> = [
 ];
 
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_users\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_user 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzuaa-app-web\/sys_users\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:sys_user 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
 // createBatch
 mock.onPost(new RegExp(/^\/sys_users\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user 方法: createBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -21,6 +66,7 @@ mock.onPost(new RegExp(/^\/sys_users\/batch$/)).reply((config: any) => {
 mock.onPut(new RegExp(/^\/sys_users\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user 方法: updateBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];
@@ -32,6 +78,7 @@ mock.onPut(new RegExp(/^\/sys_users\/batch$/)).reply((config: any) => {
 mock.onDelete(new RegExp(/^\/sys_users\/batch$/)).reply((config: any) => {
     console.groupCollapsed("实体:sys_user 方法: removeBatch");
     console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
     let status = MockAdapter.mockStatus(config);
     if (status !== 200) {
         return [status, {}];

app_web/src/service/entity-service.ts

@@ -75,6 +75,24 @@ export default class EntityService {
      */ 
     public APPDETEXT:string= '';
 
+    /**
+     * 当前系统名
+     * 
+     * @public
+     * @type {(string)}
+     * @memberof EntityService
+     */ 
+    public SYSTEMNAME:string= '';
+
+    /**
+     * 当前应用名
+     * 
+     * @public
+     * @type {(string)}
+     * @memberof EntityService
+     */ 
+    public APPNAME:string= '';
+
     /**
      * Creates an instance of EntityService.
      * 
@@ -610,14 +628,19 @@ export default class EntityService {
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isEmbeddedApp]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFStart(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    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);
+        }else{
             const requestData:any = {};
             Object.assign(requestData,{wfdata:data});
             return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfstart`,requestData,isloading);
         }
+    }
 
 
     /**
@@ -699,16 +722,60 @@ export default class EntityService {
         return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfreassign`,data,isloading);
     }
 
+
+    /**
+     * WFGetWorkFlow接口方法(获取工作流定义)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async WFGetWorkFlow(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions`);
+    }
+
+    /**
+     * WFGetWFStep接口方法(根据系统实体查找当前适配的工作流模型步骤)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async WFGetWFStep(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions-nodes`);
+    }
+
+    /**
+     * GetWFLink接口方法(根据业务主键和当前步骤获取操作路径)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async GetWFLink(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${data[this.APPDEKEY]}/usertasks/${data['taskDefinitionKey']}/ways`);
+    }
+
     /**
      * WFSubmit接口方法
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isEmbeddedApp]
      * @returns {Promise<any>}
      * @memberof EntityService
      */
-    public async WFSubmit(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public async WFSubmit(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]}/tasks/${data['taskId']}`);
+        }else{
             const requestData:any = {};
             if(data.srfwfmemo){
                 requestData.srfwfmemo = JSON.parse(JSON.stringify(data)).srfwfmemo;
@@ -721,6 +788,7 @@ export default class EntityService {
             Object.assign(requestData,{opdata:{srfwfiatag:context.srfwfiatag,srfwfstep:context.srfwfstep}});
             return Http.getInstance().post(`/${this.APPDENAME}/${data[this.APPDEKEY]}/wfsubmit`,requestData,isloading);
         }
+    }
 
     /**
      * WFGetProxyData接口方法

app_web/src/service/sys-permission/sys-permission-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_PERMISSIONServiceBase extends EntityService {
         this.APPDEKEY = 'permissionid';
         this.APPDENAME = 'sys_permissions';
         this.APPDETEXT = 'permissionname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-psappmenuitem/sys-psappmenuitem-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_PSAPPMENUITEMServiceBase extends EntityService {
         this.APPDEKEY = 'appmenuitemid';
         this.APPDENAME = 'sys_psappmenuitems';
         this.APPDETEXT = 'appmenuitemname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-psdeoppriv/sys-psdeoppriv-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_PSDEOPPRIVServiceBase extends EntityService {
         this.APPDEKEY = 'psdeopprivid';
         this.APPDENAME = 'sys_psdeopprivs';
         this.APPDETEXT = 'psdeopprivname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-role-permission/sys-role-permission-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_ROLE_PERMISSIONServiceBase extends EntityService {
         this.APPDEKEY = 'rolepermissionid';
         this.APPDENAME = 'sys_role_permissions';
         this.APPDETEXT = 'rolepermission';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-role/sys-role-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_ROLEServiceBase extends EntityService {
         this.APPDEKEY = 'roleid';
         this.APPDENAME = 'sys_roles';
         this.APPDETEXT = 'rolename';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-user-role/sys-user-role-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_USER_ROLEServiceBase extends EntityService {
         this.APPDEKEY = 'userroleid';
         this.APPDENAME = 'sys_user_roles';
         this.APPDETEXT = 'userrolename';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

app_web/src/service/sys-user/sys-user-service-base.ts

@@ -32,6 +32,8 @@ export default class SYS_USERServiceBase extends EntityService {
         this.APPDEKEY = 'userid';
         this.APPDENAME = 'sys_users';
         this.APPDETEXT = 'personname';
+        this.APPNAME = 'web';
+        this.SYSTEMNAME = 'ibzuaa';
     }
 
 // 实体接口

ibzuaa-app/ibzuaa-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -41,6 +41,15 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
     @Value("${ibiz.auth.path:v7/login}")
     private String loginPath;
 
+    @Value("${ibiz.file.uploadpath:ibizutil/upload}")
+    private String uploadpath;
+
+    @Value("${ibiz.file.downloadpath:ibizutil/download}")
+    private String downloadpath;
+
+    @Value("${ibiz.file.previewpath:ibizutil/preview}")
+    private String previewpath;
+
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth
@@ -97,6 +106,10 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
                 ).permitAll()
                 //放行登录请求
                 .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
+                // 文件操作
+                .antMatchers("/"+downloadpath+"/**").permitAll()
+                .antMatchers("/"+uploadpath).permitAll()
+                .antMatchers("/"+previewpath+"/**").permitAll()
                 // 所有请求都需要认证
                 .anyRequest().authenticated()
                 // 防止iframe 造成跨域

ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml

@@ -32,5 +32,9 @@ zuul:
       path: /sys_psdeopprivs/**
       serviceId: ibzuaa-api
       stripPrefix: false
+    wfcore:
+      path: /wfcore/**
+      serviceId: ibzwf-api
+      stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

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

 server:
   port: 8080
+

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PERMISSIONResource.java

@@ -80,7 +80,7 @@ public class SYS_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_permission_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_permission_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_PERMISSION" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{sys_permission_id}")
     @Transactional
@@ -98,7 +98,7 @@ public class SYS_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_permission_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_permission_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_PERMISSION" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{sys_permission_id}")
     @Transactional
@@ -110,7 +110,7 @@ public class SYS_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_permission_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_permission_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
@@ -121,7 +121,7 @@ public class SYS_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_PERMISSION" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions")
     @Transactional
@@ -132,7 +132,7 @@ public class SYS_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
@@ -152,7 +152,7 @@ public class SYS_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_permission_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_permission_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_PERMISSION" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}")
     public ResponseEntity<SYS_PERMISSIONDTO> get(@PathVariable("sys_permission_id") String sys_permission_id) {
@@ -161,7 +161,7 @@ public class SYS_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_PERMISSIONDTO>> fetchDefault(SYS_PERMISSIONSearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_PERMISSIONResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_PERMISSIONDTO>> searchDefault(SYS_PERMISSIONSearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSAPPMENUITEMResource.java

@@ -71,7 +71,7 @@ public class SYS_PSAPPMENUITEMResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_PSAPPMENUITEM" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems")
     @Transactional
@@ -82,7 +82,7 @@ public class SYS_PSAPPMENUITEMResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
@@ -93,7 +93,7 @@ public class SYS_PSAPPMENUITEMResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_PSAPPMENUITEM" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     @Transactional
@@ -105,7 +105,7 @@ public class SYS_PSAPPMENUITEMResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
@@ -134,7 +134,7 @@ public class SYS_PSAPPMENUITEMResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_psappmenuitem_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_psappmenuitem_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_PSAPPMENUITEM" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     @Transactional
@@ -152,7 +152,7 @@ public class SYS_PSAPPMENUITEMResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psappmenuitem_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_PSAPPMENUITEM" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
     public ResponseEntity<SYS_PSAPPMENUITEMDTO> get(@PathVariable("sys_psappmenuitem_id") String sys_psappmenuitem_id) {
@@ -161,7 +161,7 @@ public class SYS_PSAPPMENUITEMResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psappmenuitems/fetchdefault")
 	public ResponseEntity<List<SYS_PSAPPMENUITEMDTO>> fetchDefault(SYS_PSAPPMENUITEMSearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_PSAPPMENUITEMResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psappmenuitems/searchdefault")
 	public ResponseEntity<Page<SYS_PSAPPMENUITEMDTO>> searchDefault(SYS_PSAPPMENUITEMSearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSDEOPPRIVResource.java

@@ -55,7 +55,7 @@ public class SYS_PSDEOPPRIVResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_psdeoppriv_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_psdeoppriv_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_PSDEOPPRIV" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     @Transactional
@@ -91,7 +91,7 @@ public class SYS_PSDEOPPRIVResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_PSDEOPPRIV" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs")
     @Transactional
@@ -102,7 +102,7 @@ public class SYS_PSDEOPPRIVResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
@@ -113,7 +113,7 @@ public class SYS_PSDEOPPRIVResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_PSDEOPPRIV" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     public ResponseEntity<SYS_PSDEOPPRIVDTO> get(@PathVariable("sys_psdeoppriv_id") String sys_psdeoppriv_id) {
@@ -125,7 +125,7 @@ public class SYS_PSDEOPPRIVResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_PSDEOPPRIV" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
     @Transactional
@@ -137,7 +137,7 @@ public class SYS_PSDEOPPRIVResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_psdeoppriv_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
@@ -161,7 +161,7 @@ public class SYS_PSDEOPPRIVResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psdeopprivs/fetchdefault")
 	public ResponseEntity<List<SYS_PSDEOPPRIVDTO>> fetchDefault(SYS_PSDEOPPRIVSearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_PSDEOPPRIVResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_psdeopprivs/searchdefault")
 	public ResponseEntity<Page<SYS_PSDEOPPRIVDTO>> searchDefault(SYS_PSDEOPPRIVSearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLEResource.java

@@ -71,7 +71,7 @@ public class SYS_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_role_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_ROLE" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}")
     @Transactional
@@ -83,7 +83,7 @@ public class SYS_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_role_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
@@ -94,7 +94,7 @@ public class SYS_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_ROLE" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles")
     @Transactional
@@ -105,7 +105,7 @@ public class SYS_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
@@ -116,7 +116,7 @@ public class SYS_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_role_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_ROLE" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}")
     public ResponseEntity<SYS_ROLEDTO> get(@PathVariable("sys_role_id") String sys_role_id) {
@@ -128,7 +128,7 @@ public class SYS_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_role_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_role_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_ROLE" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}")
     @Transactional
@@ -161,7 +161,7 @@ public class SYS_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(sys_roleService.checkKey(sys_roleMapping.toDomain(sys_roledto)));
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/fetchdefault")
 	public ResponseEntity<List<SYS_ROLEDTO>> fetchDefault(SYS_ROLESearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_ROLEResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_roles/searchdefault")
 	public ResponseEntity<Page<SYS_ROLEDTO>> searchDefault(SYS_ROLESearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java

@@ -55,7 +55,7 @@ public class SYS_ROLE_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_role_permission_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_permission_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_ROLE_PERMISSION" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/{sys_role_permission_id}")
     public ResponseEntity<SYS_ROLE_PERMISSIONDTO> get(@PathVariable("sys_role_permission_id") String sys_role_permission_id) {
@@ -67,7 +67,7 @@ public class SYS_ROLE_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_role_permission_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_role_permission_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_ROLE_PERMISSION" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/{sys_role_permission_id}")
     @Transactional
@@ -94,7 +94,7 @@ public class SYS_ROLE_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_ROLE_PERMISSION" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions")
     @Transactional
@@ -105,7 +105,7 @@ public class SYS_ROLE_PERMISSIONResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -141,7 +141,7 @@ public class SYS_ROLE_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_role_permission_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_permission_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_ROLE_PERMISSION" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_role_permissions/{sys_role_permission_id}")
     @Transactional
@@ -153,7 +153,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_role_permission_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_role_permission_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLE_PERMISSIONDTO> sys_role_permissiondtos) {
@@ -161,7 +161,7 @@ public class SYS_ROLE_PERMISSIONResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchdefault")
 	public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchDefault(SYS_ROLE_PERMISSIONSearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_ROLE_PERMISSIONResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/searchdefault")
 	public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchDefault(SYS_ROLE_PERMISSIONSearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USERResource.java

@@ -55,7 +55,7 @@ public class SYS_USERResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_user_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_user_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_USER" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}")
     @Transactional
@@ -73,7 +73,7 @@ public class SYS_USERResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_user_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_USER" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}")
     @Transactional
@@ -85,7 +85,7 @@ public class SYS_USERResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_user_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
@@ -105,7 +105,7 @@ public class SYS_USERResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_user_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_USER" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}")
     public ResponseEntity<SYS_USERDTO> get(@PathVariable("sys_user_id") String sys_user_id) {
@@ -142,7 +142,7 @@ public class SYS_USERResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_USER" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users")
     @Transactional
@@ -153,7 +153,7 @@ public class SYS_USERResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_users/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
@@ -161,7 +161,7 @@ public class SYS_USERResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_users/fetchdefault")
 	public ResponseEntity<List<SYS_USERDTO>> fetchDefault(SYS_USERSearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_USERResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_users/searchdefault")
 	public ResponseEntity<Page<SYS_USERDTO>> searchDefault(SYS_USERSearchContext context) {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USER_ROLEResource.java

@@ -73,7 +73,7 @@ public class SYS_USER_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_user_role_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_role_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Update", tags = {"SYS_USER_ROLE" },  notes = "Update")
 	@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -85,7 +85,7 @@ public class SYS_USER_ROLEResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission(#sys_user_role_id,'UPDATE',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_role_id,'Update',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "UpdateBatch", tags = {"UpdateBatch" },  notes = "UpdateBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/updatebatch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -96,7 +96,7 @@ public class SYS_USER_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission('DELETE',{#sys_user_role_id,this.getEntity()})")
+    @PreAuthorize("hasPermission('Remove',{#sys_user_role_id,{this.getEntity(),'Sql'}})")
     @ApiOperation(value = "Remove", tags = {"SYS_USER_ROLE" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/{sys_user_role_id}")
     @Transactional
@@ -114,7 +114,7 @@ public class SYS_USER_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Create", tags = {"SYS_USER_ROLE" },  notes = "Create")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles")
     @Transactional
@@ -125,7 +125,7 @@ public class SYS_USER_ROLEResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','Create',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "createBatch", tags = {"createBatch" },  notes = "createBatch")
 	@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/createbatch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USER_ROLEDTO> sys_user_roledtos) {
@@ -136,7 +136,7 @@ public class SYS_USER_ROLEResource {
 
 
 
-    @PreAuthorize("hasPermission(#sys_user_role_id,'READ',this.getEntity())")
+    @PreAuthorize("hasPermission(#sys_user_role_id,'Get',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Get", tags = {"SYS_USER_ROLE" },  notes = "Get")
 	@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/{sys_user_role_id}")
     public ResponseEntity<SYS_USER_ROLEDTO> get(@PathVariable("sys_user_role_id") String sys_user_role_id) {
@@ -161,7 +161,7 @@ public class SYS_USER_ROLEResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/fetchdefault")
 	public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchDefault(SYS_USER_ROLESearchContext context) {
@@ -174,7 +174,7 @@ public class SYS_USER_ROLEResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasPermission('READ',{#context,'Default',this.getEntity()})")
+    @PreAuthorize("hasPermission('Get',{#context,'Default',this.getEntity(),'Sql'})")
 	@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/searchdefault")
 	public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchDefault(SYS_USER_ROLESearchContext context) {

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

@@ -14,6 +14,8 @@ public class FileItem
 {
 	private String id;
 	private String name;
+	private String fileid;
+	private String filename;
 	private long size;
 	private String ext;
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/rest/FileController.java

@@ -14,21 +14,20 @@ import java.io.*;
 
 
 @Slf4j
+@RestController
+@RequestMapping("/")
 public class FileController
 {
 
 	@Autowired
 	private FileService fileService;
 
-	@PostMapping(value = "${ibiz.uploadpath.path:ibizutil/upload}")
+	@PostMapping(value = "${ibiz.file.uploadpath:ibizutil/upload}")
 	public ResponseEntity<FileItem> upload(@RequestParam("file") MultipartFile multipartFile){
 		return ResponseEntity.ok().body(fileService.saveFile(multipartFile));
 	}
 
 	private final String defaultdownloadpath="ibizutil/download/{id}";
-	protected String getDefaultdownloadpath(){
-		return defaultdownloadpath;
-	}
 
 	@GetMapping(value = "${ibiz.file.downloadpath:"+defaultdownloadpath+"}")
 	@ResponseStatus(HttpStatus.OK)

ibzuaa-util/src/main/java/cn/ibizlab/util/service/SimpleFileService.java

@@ -3,6 +3,7 @@ package cn.ibizlab.util.service;
 import cn.ibizlab.util.domain.FileItem;
 import cn.ibizlab.util.errors.InternalServerErrorException;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.DigestUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
@@ -11,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.UUID;
 
 @Primary
 @Slf4j
@@ -21,26 +21,22 @@ public class SimpleFileService implements FileService {
     @Value("${ibiz.filePath:/app/file/}")
     private String fileRoot;
 
-
     @Override
     public FileItem saveFile(MultipartFile multipartFile) {
-
         FileItem item=null;
         // 获取文件名
         String fileName = multipartFile.getOriginalFilename();
         // 获取文件后缀
         String extname="."+getExtensionName(fileName);
-        // 用uuid作为文件名，防止生成的临时文件重复
-        String fileid= UUID.randomUUID().toString();
-        String fileFullPath = this.fileRoot+"ibztuit"+File.separator+fileid+File.separator+fileName;
-
+        try {
+            String fileid= DigestUtils.md5DigestAsHex(multipartFile.getInputStream());
+            String fileFullPath = this.fileRoot+"ibizutil"+File.separator+fileid+File.separator+fileName;
             File file = new File(fileFullPath);
             File parent = new File(file.getParent());
             if(!parent.exists())
                 parent.mkdirs();
-        try {
-            FileCopyUtils.copy(multipartFile.getInputStream() , Files.newOutputStream(file.toPath()));
-            item=new FileItem(fileid,fileName, (int)multipartFile.getSize() ,extname);
+            FileCopyUtils.copy(multipartFile.getInputStream(),Files.newOutputStream(file.toPath()));
+            item=new FileItem(fileid,fileName,fileid,fileName,(int)multipartFile.getSize(),extname);
         } catch (IOException e) {
             throw new InternalServerErrorException("文件上传失败");
         }
@@ -49,7 +45,7 @@ public class SimpleFileService implements FileService {
 
     @Override
     public File getFile(String fileid) {
-        String dirpath = this.fileRoot+"ibztuit"+File.separator+fileid;
+        String dirpath = this.fileRoot+"ibizutil"+File.separator+fileid;
         File parent = new File(dirpath);
         if (parent.exists() && parent.isDirectory() && parent.listFiles().length > 0) {
             return parent.listFiles()[0];