Merge branch 'master' of http://demo.ibizlab.cn/ibiz4jteam/ibzlite

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

@@ -364,6 +364,71 @@ mock.onPost(new RegExp(/^\/metaentities\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).
 
 
     
+// InitModels
+mock.onPost(new RegExp(/^\/dstsystems\/([a-zA-Z0-9\-\;]{1,35})\/metaentities\/([a-zA-Z0-9\-\;]{1,35})\/initmodels$/)).reply((config: any) => {
+    console.groupCollapsed("实体:metaentity 方法: InitModels");
+    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> = ['pssystemid','entity_id'];
+    const matchArray:any = new RegExp(/^\/dstsystems\/([a-zA-Z0-9\-\;]{1,35})\/metaentities\/([a-zA-Z0-9\-\;]{1,35})\/initmodels$/).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]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+        
+// InitModels
+mock.onPost(new RegExp(/^\/metaentities\/?([a-zA-Z0-9\-\;]{0,35})\/initmodels$/)).reply((config: any) => {
+    console.groupCollapsed("实体:metaentity 方法: InitModels");
+    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> = ['entity_id'];
+    const matchArray:any = new RegExp(/^\/metaentities\/([a-zA-Z0-9\-\;]{1,35})\/initmodels$/).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.entity_id, tempValue.entity_id));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['entity_id'] == tempValue['entity_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];
+});
+
+    
 // Save
 mock.onPost(new RegExp(/^\/dstsystems\/([a-zA-Z0-9\-\;]{1,35})\/metaentities\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
     console.groupCollapsed("实体:metaentity 方法: Save");

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

@@ -245,6 +245,45 @@ export default class MetaEntityServiceBase extends EntityService {
         return await Http.getInstance().post(`/metaentity/getdefaultmodelbatch`,tempData,isloading);
     }
 
+    /**
+     * InitModels接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MetaEntityServiceBase
+     */
+    public async InitModels(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.dstsystem && context.metaentity){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/dstsystems/${context.dstsystem}/metaentities/${context.metaentity}/initmodels`,data,isloading);
+            
+            return res;
+        }
+            let res:any = Http.getInstance().post(`/metaentities/${context.metaentity}/initmodels`,data,isloading);
+            return res;
+    }
+
+    /**
+     * InitModelsBatch接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MetaEntityServiceBase
+     */
+    public async InitModelsBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.dstsystem && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            return await Http.getInstance().post(`/dstsystems/${context.dstsystem}/metaentity/initmodelsbatch`,tempData,isloading);
+        }
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return await Http.getInstance().post(`/metaentity/initmodelsbatch`,tempData,isloading);
+    }
+
     /**
      * Save接口方法
      *

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaEntityService.java

@@ -36,6 +36,8 @@ public interface IMetaEntityService extends IService<MetaEntity> {
     boolean checkKey(MetaEntity et);
     MetaEntity getDefaultModel(MetaEntity et);
     boolean getDefaultModelBatch(List<MetaEntity> etList);
+    MetaEntity initModels(MetaEntity et);
+    boolean initModelsBatch(List<MetaEntity> etList);
     boolean save(MetaEntity et);
     void saveBatch(List<MetaEntity> list);
     Page<MetaEntity> searchDefault(MetaEntitySearchContext context);

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java

@@ -182,6 +182,22 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         return true;
     }
 
+    @Override
+    @Transactional
+    public MetaEntity initModels(MetaEntity et) {
+        //自定义代码
+        return et;
+    }
+
+    @Override
+    @Transactional
+    public boolean initModelsBatch(List<MetaEntity> etList) {
+        for(MetaEntity et : etList) {
+            initModels(et);
+        }
+        return true;
+    }
+
     @Override
     @Transactional
     public boolean save(MetaEntity et) {

ibzlite-core/src/main/resources/permission/systemResource.json

@@ -120,7 +120,7 @@
     "delogicname":"实体",
     "sysmoudle":{"id":"LITE","name":"lite"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
-    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GetDefaultModel" , "name":"GetDefaultModel" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"GetDefaultModel" , "name":"GetDefaultModel" , "type":"USERCUSTOM" },{"id":"InitModels" , "name":"行为" , "type":"USERCUSTOM" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}]
     }
     ,    {

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java

@@ -138,6 +138,23 @@ public class MetaEntityResource {
         return ResponseEntity.status(HttpStatus.OK).body(metaentityService.getDefaultModelBatch(metaentityMapping.toDomain(metaentitydtos)));
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-InitModels-all')")
+    @ApiOperation(value = "行为", tags = {"实体" },  notes = "行为")
+	@RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/initmodels")
+    public ResponseEntity<MetaEntityDTO> initModels(@PathVariable("metaentity_id") String metaentity_id, @RequestBody MetaEntityDTO metaentitydto) {
+        MetaEntity domain = metaentityMapping.toDomain(metaentitydto);
+        domain.setEntityId(metaentity_id);
+        domain = metaentityService.initModels(domain);
+        metaentitydto = metaentityMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(metaentitydto);
+    }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-InitModels-all')")
+    @ApiOperation(value = "批量处理[行为]", tags = {"实体" },  notes = "批量处理[行为]")
+	@RequestMapping(method = RequestMethod.POST, value = "/metaentities/{metaentity_id}/initmodelsbatch")
+    public ResponseEntity<Boolean> initModelsBatch(@RequestBody List<MetaEntityDTO> metaentitydtos) {
+        return ResponseEntity.status(HttpStatus.OK).body(metaentityService.initModelsBatch(metaentityMapping.toDomain(metaentitydtos)));
+    }
+
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-Save-all')")
     @ApiOperation(value = "保存实体", tags = {"实体" },  notes = "保存实体")
 	@RequestMapping(method = RequestMethod.POST, value = "/metaentities/save")
@@ -277,6 +294,21 @@ public class MetaEntityResource {
     public ResponseEntity<Boolean> getDefaultModelByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody List<MetaEntityDTO> metaentitydtos) {
         return ResponseEntity.status(HttpStatus.OK).body(metaentityService.getDefaultModelBatch(metaentityMapping.toDomain(metaentitydtos)));
     }
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-InitModels-all')")
+    @ApiOperation(value = "根据系统实体", tags = {"实体" },  notes = "根据系统实体")
+	@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/metaentities/{metaentity_id}/initmodels")
+    public ResponseEntity<MetaEntityDTO> initModelsByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("metaentity_id") String metaentity_id, @RequestBody MetaEntityDTO metaentitydto) {
+        MetaEntity domain = metaentityMapping.toDomain(metaentitydto);
+        domain.setSystemId(dstsystem_id);
+        domain = metaentityService.initModels(domain) ;
+        metaentitydto = metaentityMapping.toDto(domain);
+        return ResponseEntity.status(HttpStatus.OK).body(metaentitydto);
+    }
+    @ApiOperation(value = "批量处理[根据系统实体]", tags = {"实体" },  notes = "批量处理[根据系统实体]")
+	@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/metaentities/{metaentity_id}/initmodelsbatch")
+    public ResponseEntity<Boolean> initModelsByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody List<MetaEntityDTO> metaentitydtos) {
+        return ResponseEntity.status(HttpStatus.OK).body(metaentityService.initModelsBatch(metaentityMapping.toDomain(metaentitydtos)));
+    }
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-Save-all')")
     @ApiOperation(value = "根据系统保存实体", tags = {"实体" },  notes = "根据系统保存实体")
 	@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/metaentities/save")