yuefenglong 部署微服务应用 [ibz-dst，应用]

app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue

@@ -13,18 +13,18 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
+                                <i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
                                     <i class=''></i>
-                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
+                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
                                 </i-button>
-                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
+                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
                         </tooltip>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
+                                <i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
                                     <i class=''></i>
-                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
+                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
                                 </i-button>
-                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
+                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
                         </tooltip>
                         <span class='seperator'>|</span>
                         <tooltip :transfer="true" :max-width="600">
@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
      * @memberof MetaModelGridView
      */
     public toolBarModels: any = {
-        tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
-
         tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
 
+        tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
+
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
      * @memberof MetaModelGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem1_export')) {
-            this.toolbar_tbitem1_export_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem1_import')) {
             this.toolbar_tbitem1_import_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem1_export')) {
+            this.toolbar_tbitem1_export_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
         }
         // 界面行为
         const curUIService:MetaModelUIService  = new MetaModelUIService();
-        curUIService.MetaModel_export(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
+        curUIService.MetaModel_import(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**
@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
         }
         // 界面行为
         const curUIService:MetaModelUIService  = new MetaModelUIService();
-        curUIService.MetaModel_import(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
+        curUIService.MetaModel_export(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DABuildMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.analysis.domain.DABuild;
 import cn.ibizlab.core.analysis.filter.DABuildSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAChartMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.analysis.domain.DAChart;
 import cn.ibizlab.core.analysis.filter.DAChartSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAMetricMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.analysis.domain.DAMetric;
 import cn.ibizlab.core.analysis.filter.DAMetricSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/mapper/DAReportMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.analysis.domain.DAReport;
 import cn.ibizlab.core.analysis.filter.DAReportSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/DstDataSourceMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.DstDataSource;
 import cn.ibizlab.core.lite.filter.DstDataSourceSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/DstSystemMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.DstSystem;
 import cn.ibizlab.core.lite.filter.DstSystemSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDataSetMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaDataSet;
 import cn.ibizlab.core.lite.filter.MetaDataSetSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaEntityMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaEntity;
 import cn.ibizlab.core.lite.filter.MetaEntitySearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaFieldMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaField;
 import cn.ibizlab.core.lite.filter.MetaFieldSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModelMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaModel;
 import cn.ibizlab.core.lite.filter.MetaModelSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModuleMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaModule;
 import cn.ibizlab.core.lite.filter.MetaModuleSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaRelationshipMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.lite.domain.MetaRelationship;
 import cn.ibizlab.core.lite.filter.MetaRelationshipSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/ExecLogMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.rule.domain.ExecLog;
 import cn.ibizlab.core.rule.filter.ExecLogSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/ExecResultMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.rule.domain.ExecResult;
 import cn.ibizlab.core.rule.filter.ExecResultSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/RuleEngineMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.rule.domain.RuleEngine;
 import cn.ibizlab.core.rule.filter.RuleEngineSearchContext;

ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/RuleItemMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import java.util.HashMap;
+import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 import cn.ibizlab.core.rule.domain.RuleItem;
 import cn.ibizlab.core.rule.filter.RuleItemSearchContext;