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

app_web/src/pages/lite/dst-index/router.ts

@@ -3,10 +3,11 @@ import Router from 'vue-router';
 import { AuthGuard } from '@/utils';
 import qs from 'qs';
 import { globalRoutes, indexRoutes} from '@/router'
-
+import { ProjectSetting } from '@/setting';
 Vue.use(Router);
 
 const router = new Router({
+    ...ProjectSetting.routeSetting,
     routes: [
         {
             path: '/dstindex/:dstindex?',

app_web/src/widgets/dabuild/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dachart/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dametric/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dareport/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dict-option/options-grid/options-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dst-data-source/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/dst-system/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/exec-log/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/exec-result/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-data-set/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-field/edit-main-grid/edit-main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-field/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-model/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-module/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-relationship/edit-main-grid/edit-main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/meta-relationship/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/rule-engine/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue

@@ -838,7 +838,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -874,7 +874,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/rule-item/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -392,20 +393,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -973,7 +960,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1068,7 +1055,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1174,7 +1161,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1990,7 +1977,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -2057,7 +2044,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -2128,7 +2115,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2136,7 +2123,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ruleitem){
@@ -2209,7 +2196,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/table-sync/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -276,12 +276,12 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(DABuild et){
+    public void fillParentData(DABuild et){
         //实体关系[DER1N_DA_BUILD_META_MODEL_MODELID]
         if(!ObjectUtils.isEmpty(et.getModelId())){
             cn.ibizlab.core.lite.domain.MetaModel model=et.getModel();
             if(ObjectUtils.isEmpty(model)){
-                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.get(et.getModelId());
+                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.getById(et.getModelId());
                 et.setModel(majorEntity);
                 model=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java

@@ -243,12 +243,12 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(DAMetric et){
+    public void fillParentData(DAMetric et){
         //实体关系[DER1N_DA_METRIC_DA_BUILD_BUILDID]
         if(!ObjectUtils.isEmpty(et.getBuildId())){
             cn.ibizlab.core.analysis.domain.DABuild build=et.getBuild();
             if(ObjectUtils.isEmpty(build)){
-                cn.ibizlab.core.analysis.domain.DABuild majorEntity=dabuildService.get(et.getBuildId());
+                cn.ibizlab.core.analysis.domain.DABuild majorEntity=dabuildService.getById(et.getBuildId());
                 et.setBuild(majorEntity);
                 build=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java

@@ -229,12 +229,12 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(DictOption et){
+    public void fillParentData(DictOption et){
         //实体关系[DER1N_DICT_OPTION_DICT_CATALOG_CID]
         if(!ObjectUtils.isEmpty(et.getCatalogId())){
             cn.ibizlab.core.dict.domain.DictCatalog catalog=et.getCatalog();
             if(ObjectUtils.isEmpty(catalog)){
-                cn.ibizlab.core.dict.domain.DictCatalog majorEntity=dictcatalogService.get(et.getCatalogId());
+                cn.ibizlab.core.dict.domain.DictCatalog majorEntity=dictcatalogService.getById(et.getCatalogId());
                 et.setCatalog(majorEntity);
                 catalog=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java

@@ -245,12 +245,12 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(MetaDataSet et){
+    public void fillParentData(MetaDataSet et){
         //实体关系[DER1N_META_DATASET_META_ENTITY_ENTITYID]
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }

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

@@ -281,12 +281,12 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(MetaEntity et){
+    public void fillParentData(MetaEntity et){
         //实体关系[DER1N_META_ENTITY_DST_DATASOURCE_DSID]
         if(!ObjectUtils.isEmpty(et.getDsId())){
             cn.ibizlab.core.lite.domain.DstDataSource dataSource=et.getDataSource();
             if(ObjectUtils.isEmpty(dataSource)){
-                cn.ibizlab.core.lite.domain.DstDataSource majorEntity=dstdatasourceService.get(et.getDsId());
+                cn.ibizlab.core.lite.domain.DstDataSource majorEntity=dstdatasourceService.getById(et.getDsId());
                 et.setDataSource(majorEntity);
                 dataSource=majorEntity;
             }
@@ -296,7 +296,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!ObjectUtils.isEmpty(et.getSystemId())){
             cn.ibizlab.core.lite.domain.DstSystem system=et.getSystem();
             if(ObjectUtils.isEmpty(system)){
-                cn.ibizlab.core.lite.domain.DstSystem majorEntity=dstsystemService.get(et.getSystemId());
+                cn.ibizlab.core.lite.domain.DstSystem majorEntity=dstsystemService.getById(et.getSystemId());
                 et.setSystem(majorEntity);
                 system=majorEntity;
             }
@@ -306,7 +306,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!ObjectUtils.isEmpty(et.getModuleId())){
             cn.ibizlab.core.lite.domain.MetaModule module=et.getModule();
             if(ObjectUtils.isEmpty(module)){
-                cn.ibizlab.core.lite.domain.MetaModule majorEntity=metamoduleService.get(et.getModuleId());
+                cn.ibizlab.core.lite.domain.MetaModule majorEntity=metamoduleService.getById(et.getModuleId());
                 et.setModule(majorEntity);
                 module=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java

@@ -268,12 +268,12 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(MetaField et){
+    public void fillParentData(MetaField et){
         //实体关系[DER1N_META_FIELD_META_ENTITY_ENTITYID]
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }
@@ -285,7 +285,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if(!ObjectUtils.isEmpty(et.getRefFieldId())){
             cn.ibizlab.core.lite.domain.MetaField reffield=et.getReffield();
             if(ObjectUtils.isEmpty(reffield)){
-                cn.ibizlab.core.lite.domain.MetaField majorEntity=metafieldService.get(et.getRefFieldId());
+                cn.ibizlab.core.lite.domain.MetaField majorEntity=metafieldService.getById(et.getRefFieldId());
                 et.setReffield(majorEntity);
                 reffield=majorEntity;
             }
@@ -296,7 +296,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if(!ObjectUtils.isEmpty(et.getRelationId())){
             cn.ibizlab.core.lite.domain.MetaRelationship relation=et.getRelation();
             if(ObjectUtils.isEmpty(relation)){
-                cn.ibizlab.core.lite.domain.MetaRelationship majorEntity=metarelationshipService.get(et.getRelationId());
+                cn.ibizlab.core.lite.domain.MetaRelationship majorEntity=metarelationshipService.getById(et.getRelationId());
                 et.setRelation(majorEntity);
                 relation=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java

@@ -286,12 +286,12 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(MetaRelationship et){
+    public void fillParentData(MetaRelationship et){
         //实体关系[DER1N_META_RELATION_META_ENTITY_ENTITYID]
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }
@@ -303,7 +303,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         if(!ObjectUtils.isEmpty(et.getRefEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity reference=et.getReference();
             if(ObjectUtils.isEmpty(reference)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getRefEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getRefEntityId());
                 et.setReference(majorEntity);
                 reference=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/TableSyncServiceImpl.java

@@ -236,12 +236,12 @@ public class TableSyncServiceImpl extends ServiceImpl<TableSyncMapper, TableSync
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(TableSync et){
+    public void fillParentData(TableSync et){
         //实体关系[DER1N_ETL_TABLE_SYNC_META_ENTITY_ENTITYID]
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }
@@ -252,7 +252,7 @@ public class TableSyncServiceImpl extends ServiceImpl<TableSyncMapper, TableSync
         if(!ObjectUtils.isEmpty(et.getSourceEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity sourceentity=et.getSourceentity();
             if(ObjectUtils.isEmpty(sourceentity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getSourceEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getSourceEntityId());
                 et.setSourceentity(majorEntity);
                 sourceentity=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/ExecResultServiceImpl.java

@@ -245,12 +245,12 @@ public class ExecResultServiceImpl extends ServiceImpl<ExecResultMapper, ExecRes
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(ExecResult et){
+    public void fillParentData(ExecResult et){
         //实体关系[DER1N_RU_EXECRESULT_RU_ITEM_RULEID]
         if(!ObjectUtils.isEmpty(et.getRuleId())){
             cn.ibizlab.core.rule.domain.RuleItem rule=et.getRule();
             if(ObjectUtils.isEmpty(rule)){
-                cn.ibizlab.core.rule.domain.RuleItem majorEntity=ruleitemService.get(et.getRuleId());
+                cn.ibizlab.core.rule.domain.RuleItem majorEntity=ruleitemService.getById(et.getRuleId());
                 et.setRule(majorEntity);
                 rule=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleEngineServiceImpl.java

@@ -257,12 +257,12 @@ public class RuleEngineServiceImpl extends ServiceImpl<RuleEngineMapper, RuleEng
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(RuleEngine et){
+    public void fillParentData(RuleEngine et){
         //实体关系[DER1N_RU_ENGINE_META_MODEL_MODELID]
         if(!ObjectUtils.isEmpty(et.getModelId())){
             cn.ibizlab.core.lite.domain.MetaModel model=et.getModel();
             if(ObjectUtils.isEmpty(model)){
-                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.get(et.getModelId());
+                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.getById(et.getModelId());
                 et.setModel(majorEntity);
                 model=majorEntity;
             }

ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java

@@ -262,12 +262,12 @@ public class RuleItemServiceImpl extends ServiceImpl<RuleItemMapper, RuleItem> i
      * 为当前实体填充父数据（外键值文本、外键值附加数据）
      * @param et
      */
-    private void fillParentData(RuleItem et){
+    public void fillParentData(RuleItem et){
         //实体关系[DER1N_RU_ITEM_META_MODEL_MODELID]
         if(!ObjectUtils.isEmpty(et.getModelId())){
             cn.ibizlab.core.lite.domain.MetaModel model=et.getModel();
             if(ObjectUtils.isEmpty(model)){
-                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.get(et.getModelId());
+                cn.ibizlab.core.lite.domain.MetaModel majorEntity=metamodelService.getById(et.getModelId());
                 et.setModel(majorEntity);
                 model=majorEntity;
             }