zhouweidong 发布系统代码 [ibz-dst，应用]

app_web/src/mock/entity/meta-models/meta-models.ts

@@ -87,6 +87,22 @@ mock.onDelete(new RegExp(/^\/metamodels\/batch$/)).reply((config: any) => {
 });
 
 
+// ExportFile
+mock.onPost(new RegExp(/^\/metamodels$/)).reply((config: any) => {
+    console.groupCollapsed("实体:metamodel 方法: ExportFile");
+    console.table({url:config.url, method: config.method, data:config.data});
+    // ExportFile
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
 // Select
 mock.onGet(new RegExp(/^\/metamodels\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
     console.groupCollapsed("实体:metamodel 方法: Select");
@@ -271,44 +287,6 @@ mock.onPost(new RegExp(/^\/metamodels\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).re
     return [status, data];
 });
         
-// ExportFile
-mock.onPost(new RegExp(/^\/metamodels\/?([a-zA-Z0-9\-\;]{0,35})\/exportfile$/)).reply((config: any) => {
-    console.groupCollapsed("实体:metamodel 方法: ExportFile");
-    console.table({url:config.url, method: config.method, data:config.data});
-    let status = MockAdapter.mockStatus(config);
-    if (status !== 200) {
-        return [status, null];
-    }    
-    const paramArray:Array<any> = ['id'];
-    const matchArray:any = new RegExp(/^\/metamodels\/([a-zA-Z0-9\-\;]{1,35})\/exportfile$/).exec(config.url);
-    let tempValue: any = {};
-    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
-        paramArray.forEach((item: any, index: number) => {
-            Object.defineProperty(tempValue, item, {
-                enumerable: true,
-                value: matchArray[index + 1]
-            });
-        });
-    }
-    //let items = mockDatas ? mockDatas : [];
-    //let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
-      let data = JSON.parse(config.data);
-    mockDatas.forEach((item)=>{
-        if(item['id'] == tempValue['id'] ){
-            for(let value in data){
-              if(item.hasOwnProperty(value)){
-                  item[value] = data[value];
-              }
-            }
-        }
-    })
-    console.groupCollapsed("response数据  status: "+status+" data: ");
-    console.table(data);
-    console.groupEnd();
-    console.groupEnd();
-    return [status, data];
-});
-        
 // ImportFile
 mock.onPost(new RegExp(/^\/metamodels\/?([a-zA-Z0-9\-\;]{0,35})\/importfile$/)).reply((config: any) => {
     console.groupCollapsed("实体:metamodel 方法: ImportFile");

app_web/src/service/meta-model/meta-model-service-base.ts

@@ -38,6 +38,36 @@ export default class MetaModelServiceBase extends EntityService {
 
 // 实体接口
 
+    /**
+     * ExportFile接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MetaModelServiceBase
+     */
+    public async ExportFile(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().post(`/metamodels`,isloading);
+        res.data.metamodel = data.metamodel;
+        
+        return res;
+    }
+
+    /**
+     * ExportFileBatch接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MetaModelServiceBase
+     */
+    public async ExportFileBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return await Http.getInstance().post(`/metamodelbatch`,tempData,isloading);
+    }
+
     /**
      * Select接口方法
      *
@@ -181,34 +211,6 @@ export default class MetaModelServiceBase extends EntityService {
             return res;
     }
 
-    /**
-     * ExportFile接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof MetaModelServiceBase
-     */
-    public async ExportFile(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-            let res:any = Http.getInstance().post(`/metamodels/${context.metamodel}/exportfile`,data,isloading);
-            return res;
-    }
-
-    /**
-     * ExportFileBatch接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof MetaModelServiceBase
-     */
-    public async ExportFileBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let tempData:any = JSON.parse(JSON.stringify(data));
-        return await Http.getInstance().post(`/metamodel/exportfilebatch`,tempData,isloading);
-    }
-
     /**
      * ImportFile接口方法
      *

ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModelResource.java

@@ -47,6 +47,23 @@ public class MetaModelResource {
     @Lazy
     public MetaModelMapping metamodelMapping;
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-ExportFile-all')")
+    @ApiOperation(value = "导出文件", tags = {"模型" },  notes = "导出文件")
+	@RequestMapping(method = RequestMethod.POST, value = "/metamodels/{metamodel_id}/exportfile")
+    public ResponseEntity<MetaModelDTO> exportFile(@PathVariable("metamodel_id") String metamodel_id, @RequestBody MetaModelDTO metamodeldto) {
+        MetaModel domain = metamodelMapping.toDomain(metamodeldto);
+        domain.setId(metamodel_id);
+        domain = metamodelService.exportFile(domain);
+        metamodeldto = metamodelMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(metamodeldto);
+    }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-ExportFile-all')")
+    @ApiOperation(value = "批量处理[导出文件]", tags = {"模型" },  notes = "批量处理[导出文件]")
+	@RequestMapping(method = RequestMethod.POST, value = "/metamodels/{metamodel_id}/exportfilebatch")
+    public ResponseEntity<Boolean> exportFileBatch(@RequestBody List<MetaModelDTO> metamodeldtos) {
+        return ResponseEntity.status(HttpStatus.OK).body(metamodelService.exportFileBatch(metamodelMapping.toDomain(metamodeldtos)));
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-Create-all')")
     @ApiOperation(value = "新建模型", tags = {"模型" },  notes = "新建模型")
 	@RequestMapping(method = RequestMethod.POST, value = "/metamodels")
@@ -138,23 +155,6 @@ public class MetaModelResource {
         return  ResponseEntity.status(HttpStatus.OK).body(metamodelService.checkKey(metamodelMapping.toDomain(metamodeldto)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-ExportFile-all')")
-    @ApiOperation(value = "导出文件", tags = {"模型" },  notes = "导出文件")
-	@RequestMapping(method = RequestMethod.POST, value = "/metamodels/{metamodel_id}/exportfile")
-    public ResponseEntity<MetaModelDTO> exportFile(@PathVariable("metamodel_id") String metamodel_id, @RequestBody MetaModelDTO metamodeldto) {
-        MetaModel domain = metamodelMapping.toDomain(metamodeldto);
-        domain.setId(metamodel_id);
-        domain = metamodelService.exportFile(domain);
-        metamodeldto = metamodelMapping.toDto(domain);
-        return ResponseEntity.status(HttpStatus.OK).body(metamodeldto);
-    }
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-ExportFile-all')")
-    @ApiOperation(value = "批量处理[导出文件]", tags = {"模型" },  notes = "批量处理[导出文件]")
-	@RequestMapping(method = RequestMethod.POST, value = "/metamodels/{metamodel_id}/exportfilebatch")
-    public ResponseEntity<Boolean> exportFileBatch(@RequestBody List<MetaModelDTO> metamodeldtos) {
-        return ResponseEntity.status(HttpStatus.OK).body(metamodelService.exportFileBatch(metamodelMapping.toDomain(metamodeldtos)));
-    }
-
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-MetaModel-ImportFile-all')")
     @ApiOperation(value = "导入文件", tags = {"模型" },  notes = "导入文件")
 	@RequestMapping(method = RequestMethod.POST, value = "/metamodels/{metamodel_id}/importfile")