lab_gzf 部署微服务应用

app_AssetManagement/public/assets/json/view-config.json

@@ -80,7 +80,7 @@
         "memo": "系统自动添加"
     },
     "eamassetstatemodelgridview": {
-        "title": "资产状态模型表格视图",
+        "title": "资产状态模型信息",
         "caption": "资产状态模型",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Asset",
@@ -119,6 +119,16 @@
         "viewtag": "4c95ec14aa2de5370d9d81f7d85f4bd5",
         "memo": ""
     },
+    "eamassetsummaryview": {
+        "title": "资产数据看板视图",
+        "caption": "资产",
+        "viewtype": "DEPORTALVIEW",
+        "viewmodule": "Asset",
+        "viewname": "EAMAssetSummaryView",
+        "viewfilename": "eamasset-summary-view",
+        "viewtag": "4db903dc10459c98d4834775020d8b74",
+        "memo": ""
+    },
     "eamapplystategridview": {
         "title": "维护申请状态表格视图",
         "caption": "维护申请状态",
@@ -170,7 +180,7 @@
         "memo": ""
     },
     "eamlocationstatelistexpview": {
-        "title": "功能位置状态列表导航视图",
+        "title": "功能位置状态信息",
         "caption": "功能位置状态",
         "viewtype": "DELISTEXPVIEW",
         "viewmodule": "Location",
@@ -229,6 +239,16 @@
         "viewtag": "aec3c3b9b959ac67bf41fe45cca7808b",
         "memo": "系统自动添加"
     },
+    "eamassetinfo_mainview": {
+        "title": "资产信息",
+        "caption": "资产",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Asset",
+        "viewname": "EAMAssetInfo_MainView",
+        "viewfilename": "eamasset-info-main-view",
+        "viewtag": "afb13d98ae97ebb876598388432f8c1d",
+        "memo": ""
+    },
     "eamlocationchildgridview": {
         "title": "功能位置表格视图",
         "caption": "功能位置",
@@ -249,6 +269,16 @@
         "viewtag": "b3d85711a6feb998249451ba167895d2",
         "memo": "系统自动添加"
     },
+    "eamassettypegridview": {
+        "title": "资产类型信息",
+        "caption": "资产类型",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Asset",
+        "viewname": "EAMAssetTypeGridView",
+        "viewfilename": "eamasset-type-grid-view",
+        "viewtag": "b4c8e0e90e3940abee6c5f4909fd0e00",
+        "memo": ""
+    },
     "eamlocationstatepickupgridview": {
         "title": "功能位置状态信息",
         "caption": "功能位置状态",
@@ -279,6 +309,16 @@
         "viewtag": "cc29cbcb0398aa069d4b05f3469f0377",
         "memo": ""
     },
+    "eamassettypeeditview": {
+        "title": "资产类型信息",
+        "caption": "资产类型",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Asset",
+        "viewname": "EAMAssetTypeEditView",
+        "viewfilename": "eamasset-type-edit-view",
+        "viewtag": "d1b8ecb4e8fc6808282289a1ee763fb8",
+        "memo": "系统自动添加"
+    },
     "eamlocationinfoview": {
         "title": "功能位置信息",
         "caption": "功能位置",

app_AssetManagement/src/components/app-rich-text-editor/app-rich-text-editor.vue

@@ -256,10 +256,12 @@ export default class AppRichTextEditor extends Vue {
     public mounted() {
         this.init();
         const ele: any = this.isDrawer(this.$el);
-        let index: number = ele.style.transform.indexOf('translateX');
-        if(index >= 0) {
-            let num: string = ele.style.transform.substring(index + 12, index + 15);
-            this.editorClass = this.editorClass + (-parseInt(num));
+        if(ele) {
+            let index: number = ele.style.transform.indexOf('translateX');
+            if(index >= 0) {
+                let num: string = ele.style.transform.substring(index + 12, index + 15);
+                this.editorClass = this.editorClass + (-parseInt(num));
+            }
         }
     }
     
@@ -273,7 +275,7 @@ export default class AppRichTextEditor extends Vue {
         if(!pele) {
             return false;
         }
-        if(pele.className.indexOf('studio-drawer-content') >= 0) {
+        if(pele.className && pele.className.indexOf('studio-drawer-content') >= 0) {
             return pele;
         }
         return this.isDrawer(pele);

app_AssetManagement/src/interface/entity/eamasset.ts

@@ -77,4 +77,52 @@ export interface EAMAsset {
      * @memberof EAMAsset
      */
     passetid?: any;
+
+    /**
+     * 资产类型
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    eamassettypename?: any;
+
+    /**
+     * 功能位置
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    eamlocationname?: any;
+
+    /**
+     * 资产状态标识
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    eamassetstateid?: any;
+
+    /**
+     * 资产状态
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    eamassetstatename?: any;
+
+    /**
+     * 上级资产
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    passetname?: any;
+
+    /**
+     * 资产编号
+     *
+     * @returns {*}
+     * @memberof EAMAsset
+     */
+    assetnumber?: any;
 }
\ No newline at end of file

app_AssetManagement/src/locale/lang/en-US.ts

@@ -142,6 +142,7 @@ export default {
                 menuitem2: "资产管理",
                 menuitem10: "资产状态",
                 menuitem11: "资产状态模型",
+                menuitem12: "资产类型",
                 menuitem3: "维护申请",
                 menuitem4: "工单管理",
                 menuitem5: "维护计划",

app_AssetManagement/src/locale/lang/zh-CN.ts

@@ -142,6 +142,7 @@ export default {
                 menuitem2: "资产管理",
                 menuitem10: "资产状态",
                 menuitem11: "资产状态模型",
+                menuitem12: "资产类型",
                 menuitem3: "维护申请",
                 menuitem4: "工单管理",
                 menuitem5: "维护计划",

app_AssetManagement/src/locale/lanres/entities/eamasset-state-model/eamasset-state-model_en_US.ts

@@ -11,7 +11,7 @@ export default {
 	views: {
 		gridview: {
 			caption: "资产状态模型",
-      		title: "资产状态模型表格视图",
+      		title: "资产状态模型信息",
 		},
 		editview: {
 			caption: "资产状态模型",

app_AssetManagement/src/locale/lanres/entities/eamasset-state-model/eamasset-state-model_zh_CN.ts

@@ -10,7 +10,7 @@ export default {
 	views: {
 		gridview: {
 			caption: "资产状态模型",
-      		title: "资产状态模型表格视图",
+      		title: "资产状态模型信息",
 		},
 		editview: {
 			caption: "资产状态模型",

app_AssetManagement/src/locale/lanres/entities/eamasset-type/eamasset-type_en_US.ts

@@ -11,4 +11,107 @@ export default {
     eamassetstatemodelname: "资产状态模型",
     assettypenumber: "资产类型编号",
   },
+	views: {
+		gridview: {
+			caption: "资产类型",
+      		title: "资产类型信息",
+		},
+		editview: {
+			caption: "资产类型",
+      		title: "资产类型信息",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "资产类型基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "资产类型标识", 
+			srfmajortext: "资产类型名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			assettypenumber: "资产类型编号", 
+			eamassettypename: "资产类型名称", 
+			eamassetstatemodelname: "资产状态模型", 
+			eamassetstatemodelid: "资产状态模型标识", 
+			eamassettypeid: "资产类型标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			assettypenumber: "资产类型编号",
+			eamassettypename: "资产类型名称",
+			eamassetstatemodelname: "资产状态模型",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "New",
+			tip: "New",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem10: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamasset-type/eamasset-type_zh_CN.ts

@@ -10,4 +10,107 @@ export default {
     eamassetstatemodelname: "资产状态模型",
     assettypenumber: "资产类型编号",
   },
+	views: {
+		gridview: {
+			caption: "资产类型",
+      		title: "资产类型信息",
+		},
+		editview: {
+			caption: "资产类型",
+      		title: "资产类型信息",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "资产类型基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "资产类型标识", 
+			srfmajortext: "资产类型名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			assettypenumber: "资产类型编号", 
+			eamassettypename: "资产类型名称", 
+			eamassetstatemodelname: "资产状态模型", 
+			eamassetstatemodelid: "资产状态模型标识", 
+			eamassettypeid: "资产类型标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			assettypenumber: "资产类型编号",
+			eamassettypename: "资产类型名称",
+			eamassetstatemodelname: "资产状态模型",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "新建",
+			tip: "新建",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem10: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_en_US.ts

@@ -10,5 +10,43 @@ export default {
     eamassettypeid: "资产类型标识",
     eamlocationid: "功能位置标识",
     passetid: "上级资产标识",
+    eamassettypename: "资产类型",
+    eamlocationname: "功能位置",
+    eamassetstateid: "资产状态标识",
+    eamassetstatename: "资产状态",
+    passetname: "上级资产",
+    assetnumber: "资产编号",
   },
+	views: {
+		summaryview: {
+			caption: "资产",
+      		title: "资产数据看板视图",
+		},
+		info_mainview: {
+			caption: "资产",
+      		title: "资产信息",
+		},
+	},
+	info_main_form: {
+		details: {
+			group1: "基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "资产标识", 
+			srfmajortext: "资产名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			assetnumber: "资产编号", 
+			assetname: "资产名称", 
+			eamassettypename: "资产类型", 
+			eamlocationname: "功能位置", 
+			passetname: "上级资产", 
+			assetid: "资产标识", 
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamasset/eamasset_zh_CN.ts

@@ -9,5 +9,43 @@ export default {
     eamassettypeid: "资产类型标识",
     eamlocationid: "功能位置标识",
     passetid: "上级资产标识",
+    eamassettypename: "资产类型",
+    eamlocationname: "功能位置",
+    eamassetstateid: "资产状态标识",
+    eamassetstatename: "资产状态",
+    passetname: "上级资产",
+    assetnumber: "资产编号",
   },
+	views: {
+		summaryview: {
+			caption: "资产",
+      		title: "资产数据看板视图",
+		},
+		info_mainview: {
+			caption: "资产",
+      		title: "资产信息",
+		},
+	},
+	info_main_form: {
+		details: {
+			group1: "基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "资产标识", 
+			srfmajortext: "资产名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			assetnumber: "资产编号", 
+			assetname: "资产名称", 
+			eamassettypename: "资产类型", 
+			eamlocationname: "功能位置", 
+			passetname: "上级资产", 
+			assetid: "资产标识", 
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_en_US.ts

@@ -17,7 +17,7 @@ export default {
 		},
 		listexpview: {
 			caption: "功能位置状态",
-      		title: "功能位置状态列表导航视图",
+      		title: "功能位置状态信息",
 		},
 		pickupview: {
 			caption: "功能位置状态",
@@ -70,6 +70,28 @@ export default {
 		uiactions: {
 		},
 	},
+	listexpviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem23: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "New",

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN.ts

@@ -16,7 +16,7 @@ export default {
 		},
 		listexpview: {
 			caption: "功能位置状态",
-      		title: "功能位置状态列表导航视图",
+      		title: "功能位置状态信息",
 		},
 		pickupview: {
 			caption: "功能位置状态",
@@ -69,6 +69,28 @@ export default {
 		uiactions: {
 		},
 	},
+	listexpviewtoolbar_toolbar: {
+		tbitem5: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem23: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "新建",

app_AssetManagement/src/mock/app/app-index-view-appmenu/app-index-view-appmenu.ts

@@ -151,7 +151,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
 	iconcls: 'fa fa-navicon',
 	icon: '',
 	textcls: '',
-	appfunctag: '_7',
+	appfunctag: '_8',
 	resourcetag: '',
 },
 	],
@@ -209,6 +209,24 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: '_3',
 	resourcetag: '',
+},
+		{
+	id: '6EC21D36-D7FB-4684-8448-DACEFCE5B0A5',
+	name: 'menuitem12',
+	text: '资产类型',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '资产类型',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: 'fa fa-legal',
+	icon: '',
+	textcls: '',
+	appfunctag: '_7',
+	resourcetag: '',
 },
 	],
 },

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -72,7 +72,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "2b28313d0f3925fa44b8683eb5ea54d6"
         },
         "eamassetstatemodelgridview": {
-            "title": "资产状态模型表格视图",
+            "title": "资产状态模型信息",
             "caption": "资产状态模型",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Asset",
@@ -103,6 +103,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationTypeGridView",
             "viewtag": "4c95ec14aa2de5370d9d81f7d85f4bd5"
         },
+        "eamassetsummaryview": {
+            "title": "资产数据看板视图",
+            "caption": "资产",
+            "viewtype": "DEPORTALVIEW",
+            "viewmodule": "Asset",
+            "viewname": "EAMAssetSummaryView",
+            "viewtag": "4db903dc10459c98d4834775020d8b74"
+        },
         "eamapplystategridview": {
             "title": "维护申请状态表格视图",
             "caption": "维护申请状态",
@@ -144,7 +152,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9e9b3600ba892d31757bacef1dcc9458"
         },
         "eamlocationstatelistexpview": {
-            "title": "功能位置状态列表导航视图",
+            "title": "功能位置状态信息",
             "caption": "功能位置状态",
             "viewtype": "DELISTEXPVIEW",
             "viewmodule": "Location",
@@ -191,6 +199,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMAssetStatePickupGridView",
             "viewtag": "aec3c3b9b959ac67bf41fe45cca7808b"
         },
+        "eamassetinfo_mainview": {
+            "title": "资产信息",
+            "caption": "资产",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Asset",
+            "viewname": "EAMAssetInfo_MainView",
+            "viewtag": "afb13d98ae97ebb876598388432f8c1d"
+        },
         "eamlocationchildgridview": {
             "title": "功能位置表格视图",
             "caption": "功能位置",
@@ -207,6 +223,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationStateModelLineEditView",
             "viewtag": "b3d85711a6feb998249451ba167895d2"
         },
+        "eamassettypegridview": {
+            "title": "资产类型信息",
+            "caption": "资产类型",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Asset",
+            "viewname": "EAMAssetTypeGridView",
+            "viewtag": "b4c8e0e90e3940abee6c5f4909fd0e00"
+        },
         "eamlocationstatepickupgridview": {
             "title": "功能位置状态信息",
             "caption": "功能位置状态",
@@ -231,6 +255,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationSummaryView",
             "viewtag": "cc29cbcb0398aa069d4b05f3469f0377"
         },
+        "eamassettypeeditview": {
+            "title": "资产类型信息",
+            "caption": "资产类型",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Asset",
+            "viewname": "EAMAssetTypeEditView",
+            "viewtag": "d1b8ecb4e8fc6808282289a1ee763fb8"
+        },
         "eamlocationinfoview": {
             "title": "功能位置信息",
             "caption": "功能位置",

app_AssetManagement/src/pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view-base.tsx

@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 资产状态模型表格视图视图基类
+ * 资产状态模型信息视图基类
  *
  * @export
  * @class EAMAssetStateModelGridViewBase

app_AssetManagement/src/pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.html

-<studio-view-style2 viewName="eamassetstatemodelgridview" viewTitle="资产状态模型表格视图" class='degridview eamasset-state-model-grid-view'>
+<studio-view-style2 viewName="eamassetstatemodelgridview" viewTitle="资产状态模型信息" class='degridview eamasset-state-model-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_AssetManagement/src/pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.vue

@@ -7,7 +7,7 @@ import view_grid from '@widgets/eamasset-state-model/main-grid/main-grid.vue';
 import view_searchform from '@widgets/eamasset-state-model/default-searchform/default-searchform.vue';
 
 /**
- * 资产状态模型表格视图视图
+ * 资产状态模型信息视图
  *
  * @export
  * @class EAMAssetStateModelGridView

app_AssetManagement/src/pages/base/app-index-view/page-register.ts

@@ -3,6 +3,7 @@ export const PageComponents = {
                 Vue.component('eamlocation-info-view', () => import('@pages/location/eamlocation-info-view/eamlocation-info-view.vue'));
         Vue.component('eamlocation-type-pickup-grid-view', () => import('@pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.vue'));
         Vue.component('eamasset-state-model-line-edit-view', () => import('@pages/asset/eamasset-state-model-line-edit-view/eamasset-state-model-line-edit-view.vue'));
+        Vue.component('eamasset-type-edit-view', () => import('@pages/asset/eamasset-type-edit-view/eamasset-type-edit-view.vue'));
         Vue.component('eamasset-state-model-line-grid-view', () => import('@pages/asset/eamasset-state-model-line-grid-view/eamasset-state-model-line-grid-view.vue'));
         Vue.component('eamlocation-tree-exp-view', () => import('@pages/location/eamlocation-tree-exp-view/eamlocation-tree-exp-view.vue'));
         Vue.component('eamlocation-edit-view', () => import('@pages/location/eamlocation-edit-view/eamlocation-edit-view.vue'));
@@ -19,8 +20,8 @@ export const PageComponents = {
         Vue.component('eamlocation-child-grid-view', () => import('@pages/location/eamlocation-child-grid-view/eamlocation-child-grid-view.vue'));
         Vue.component('eamlocation-state-model-line-edit-view', () => import('@pages/location/eamlocation-state-model-line-edit-view/eamlocation-state-model-line-edit-view.vue'));
         Vue.component('eamlocation-state-list-exp-view', () => import('@pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view.vue'));
-        Vue.component('eamlocation-state-model-line-grid-view', () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'));
         Vue.component('eamlocation-pickup-view', () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'));
+        Vue.component('eamlocation-state-model-line-grid-view', () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'));
         Vue.component('eamlocation-type-edit-view', () => import('@pages/location/eamlocation-type-edit-view/eamlocation-type-edit-view.vue'));
         Vue.component('eamlocation-state-model-pickup-view', () => import('@pages/location/eamlocation-state-model-pickup-view/eamlocation-state-model-pickup-view.vue'));
         Vue.component('eamlocation-state-pickup-view', () => import('@pages/location/eamlocation-state-pickup-view/eamlocation-state-pickup-view.vue'));
@@ -28,10 +29,11 @@ export const PageComponents = {
         Vue.component('eamlocation-pickup-grid-view', () => import('@pages/location/eamlocation-pickup-grid-view/eamlocation-pickup-grid-view.vue'));
         Vue.component('eamlocation-summary-view', () => import('@pages/location/eamlocation-summary-view/eamlocation-summary-view.vue'));
         Vue.component('eamasset-state-pickup-view', () => import('@pages/asset/eamasset-state-pickup-view/eamasset-state-pickup-view.vue'));
-        Vue.component('eamasset-state-grid-view', () => import('@pages/asset/eamasset-state-grid-view/eamasset-state-grid-view.vue'));
         Vue.component('eamlocation-type-pickup-view', () => import('@pages/location/eamlocation-type-pickup-view/eamlocation-type-pickup-view.vue'));
+        Vue.component('eamasset-state-grid-view', () => import('@pages/asset/eamasset-state-grid-view/eamasset-state-grid-view.vue'));
         Vue.component('eamasset-state-model-grid-view', () => import('@pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.vue'));
         Vue.component('eamlocation-grid-view', () => import('@pages/location/eamlocation-grid-view/eamlocation-grid-view.vue'));
+        Vue.component('eamasset-type-grid-view', () => import('@pages/asset/eamasset-type-grid-view/eamasset-type-grid-view.vue'));
         Vue.component('eamasset-state-model-pickup-grid-view', () => import('@pages/asset/eamasset-state-model-pickup-grid-view/eamasset-state-model-pickup-grid-view.vue'));
         Vue.component('eamlocation-state-model-grid-view', () => import('@pages/location/eamlocation-state-model-grid-view/eamlocation-state-model-grid-view.vue'));
     }

app_AssetManagement/src/pages/base/app-index-view/router.ts

@@ -85,6 +85,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/asset/eamasset-state-model-line-edit-view/eamasset-state-model-line-edit-view.vue'),
                 },
+                {
+                    path: 'eamassettypes/:eamassettype?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamassettype.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassettypes', parameterName: 'eamassettype' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/asset/eamasset-type-edit-view/eamasset-type-edit-view.vue'),
+                },
                 {
                     path: 'eamassetstatemodellines/:eamassetstatemodelline?/gridview/:gridview?',
                     meta: {
@@ -310,32 +324,32 @@ const router = new Router({
                     component: () => import('@pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view.vue'),
                 },
                 {
-                    path: 'eamlocationstatemodellines/:eamlocationstatemodelline?/gridview/:gridview?',
+                    path: 'eamlocations/:eamlocation?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.eamlocationstatemodelline.views.gridview.title',
+                        caption: 'entities.eamlocation.views.pickupview.title',
                         info:'',
                         parameters: [
                             { pathName: 'appindexview', parameterName: 'appindexview' },
-                            { pathName: 'eamlocationstatemodellines', parameterName: 'eamlocationstatemodelline' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'),
+                    component: () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'),
                 },
                 {
-                    path: 'eamlocations/:eamlocation?/pickupview/:pickupview?',
+                    path: 'eamlocationstatemodellines/:eamlocationstatemodelline?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.eamlocation.views.pickupview.title',
+                        caption: 'entities.eamlocationstatemodelline.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'appindexview', parameterName: 'appindexview' },
-                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'eamlocationstatemodellines', parameterName: 'eamlocationstatemodelline' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'),
+                    component: () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'),
                 },
                 {
                     path: 'eamlocationtypes/:eamlocationtype?/editview/:editview?',
@@ -436,32 +450,32 @@ const router = new Router({
                     component: () => import('@pages/asset/eamasset-state-pickup-view/eamasset-state-pickup-view.vue'),
                 },
                 {
-                    path: 'eamassetstates/:eamassetstate?/gridview/:gridview?',
+                    path: 'eamlocationtypes/:eamlocationtype?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.eamassetstate.views.gridview.title',
+                        caption: 'entities.eamlocationtype.views.pickupview.title',
                         info:'',
                         parameters: [
                             { pathName: 'appindexview', parameterName: 'appindexview' },
-                            { pathName: 'eamassetstates', parameterName: 'eamassetstate' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'eamlocationtypes', parameterName: 'eamlocationtype' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/asset/eamasset-state-grid-view/eamasset-state-grid-view.vue'),
+                    component: () => import('@pages/location/eamlocation-type-pickup-view/eamlocation-type-pickup-view.vue'),
                 },
                 {
-                    path: 'eamlocationtypes/:eamlocationtype?/pickupview/:pickupview?',
+                    path: 'eamassetstates/:eamassetstate?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.eamlocationtype.views.pickupview.title',
+                        caption: 'entities.eamassetstate.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'appindexview', parameterName: 'appindexview' },
-                            { pathName: 'eamlocationtypes', parameterName: 'eamlocationtype' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'eamassetstates', parameterName: 'eamassetstate' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/location/eamlocation-type-pickup-view/eamlocation-type-pickup-view.vue'),
+                    component: () => import('@pages/asset/eamasset-state-grid-view/eamasset-state-grid-view.vue'),
                 },
                 {
                     path: 'eamassetstatemodels/:eamassetstatemodel?/gridview/:gridview?',
@@ -491,6 +505,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/location/eamlocation-grid-view/eamlocation-grid-view.vue'),
                 },
+                {
+                    path: 'eamassettypes/:eamassettype?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.eamassettype.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassettypes', parameterName: 'eamassettype' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/asset/eamasset-type-grid-view/eamasset-type-grid-view.vue'),
+                },
                 {
                     path: 'eamassetstatemodels/:eamassetstatemodel?/pickupgridview/:pickupgridview?',
                     meta: {

app_AssetManagement/src/pages/location/eamlocation-grid-view/eamlocation-grid-view.html

 <studio-view-style2 viewName="eamlocationgridview" viewTitle="功能位置信息" class='degridview eamlocation-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="功能位置名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_AssetManagement/src/pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view-base.tsx

@@ -6,7 +6,7 @@ import ListExpViewEngine from '@engine/view/list-exp-view-engine';
 import EAMLocationStateUIService from '@/uiservice/eamlocation-state/eamlocation-state-ui-service';
 
 /**
- * 功能位置状态列表导航视图视图基类
+ * 功能位置状态信息视图基类
  *
  * @export
  * @class EAMLocationStateListExpViewBase
@@ -88,9 +88,28 @@ export class EAMLocationStateListExpViewBase extends ListExpViewBase {
      * @memberof EAMLocationStateListExpViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_listexpbar: { name: 'listexpbar', type: 'LISTEXPBAR' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMLocationStateListExpView
+     */
+    public toolBarModels: any = {
+        tbitem5: { name: 'tbitem5', caption: '新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '新建', iconcls: 'fa fa-file-text-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '', class: '' } },
+
+        tbitem15: {  name: 'tbitem15', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem2: { name: 'tbitem2', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY', class: '' } },
+
+        tbitem23: {  name: 'tbitem23', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem8: { name: 'tbitem8', caption: '删除', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -127,6 +146,28 @@ export class EAMLocationStateListExpViewBase extends ListExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMLocationStateListExpViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem2')) {
+            this.toolbar_tbitem2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem10')) {
+            this.toolbar_tbitem10_click(null, '', $event2);
+        }
+    }
+
     /**
      * listexpbar 部件 selectionchange 事件
      *
@@ -160,6 +201,114 @@ export class EAMLocationStateListExpViewBase extends ListExpViewBase {
         this.engine.onCtrlEvent('listexpbar', 'load', $event);
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.New(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationState");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationState");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationState");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationState");
+    }
+
     /**
      * 打开新建数据视图
      *
@@ -192,6 +341,88 @@ export class EAMLocationStateListExpViewBase extends ListExpViewBase {
     }
 
 
+    /**
+     * 新建
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationStateListExpViewBase
+     */
+    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+         const _this: any = this;
+        if (_this.newdata && _this.newdata instanceof Function) {
+            const data: any = {};
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationStateListExpViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { eamlocationstate: args[0].eamlocationstate })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationStateListExpViewBase
+     */
+    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.remove instanceof Function)) {
+            return ;
+        }
+        xData.remove(args);
+    }
+
+    /**
+     * 过滤
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationStateListExpViewBase
+     */
+    public ToggleFilter(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (_this.hasOwnProperty('isExpandSearchForm')) {
+            _this.isExpandSearchForm = !_this.isExpandSearchForm;
+        }
+    }
 
 
     /**

app_AssetManagement/src/pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view.html

-<studio-view-style2 viewName="eamlocationstatelistexpview" viewTitle="功能位置状态列表导航视图" class='delistexpview eamlocation-state-list-exp-view'>
+<studio-view-style2 viewName="eamlocationstatelistexpview" viewTitle="功能位置状态信息" class='delistexpview eamlocation-state-list-exp-view'>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_listexpbar 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_AssetManagement/src/pages/location/eamlocation-state-list-exp-view/eamlocation-state-list-exp-view.vue

@@ -6,7 +6,7 @@ import { EAMLocationStateListExpViewBase } from './eamlocation-state-list-exp-vi
 import view_listexpbar from '@widgets/eamlocation-state/list-exp-viewlistexpbar-listexpbar/list-exp-viewlistexpbar-listexpbar.vue';
 
 /**
- * 功能位置状态列表导航视图视图
+ * 功能位置状态信息视图
  *
  * @export
  * @class EAMLocationStateListExpView

app_AssetManagement/src/store/modules/view-action/state.ts

@@ -293,6 +293,7 @@ export const viewstate: any = {
                 '00fcbd6336b5d40a31a2c3d5c346d16c',
                 '30027967566375f388f110149cf48b49',
                 '135343573fd869053d84ecc2f48ffd49',
+                'b4c8e0e90e3940abee6c5f4909fd0e00',
                 '4c95ec14aa2de5370d9d81f7d85f4bd5',
                 'a3d6a9a21765dd59afa2d3d20a99096c',
                 '9e9b3600ba892d31757bacef1dcc9458',

app_AssetManagement/src/uiservice/eamasset-type/eamasset-type-ui-service-base.ts

@@ -89,6 +89,8 @@ export default class EAMAssetTypeUIServiceBase extends UIService {
      * @memberof  EAMAssetTypeUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamassettypes'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamassettypes'});
     }
 
     /**

app_AssetManagement/src/uiservice/eamasset/eamasset-ui-service-base.ts

@@ -89,6 +89,8 @@ export default class EAMAssetUIServiceBase extends UIService {
      * @memberof  EAMAssetUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'summaryview',srfappde:'eamassets'});
+        this.allViewMap.set(':',{viewname:'info_mainview',srfappde:'eamassets'});
     }
 
     /**

app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.tsx

@@ -17,6 +17,8 @@ export class AppIndexViewBase extends Vue {
             switch (item.appfunctag) {
                 case '_7': 
                     this.click_7(item); break;
+                case '_8': 
+                    this.click_8(item); break;
                 case '_4': 
                     this.click_4(item); break;
                 case '_2': 
@@ -38,12 +40,35 @@ export class AppIndexViewBase extends Vue {
     }
     
     /**
-     * 功能位置
+     * 资产类型
      *
      * @param {*} [item={}]
      * @memberof AppIndexView
      */
     public click_7(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'eamassettypes', parameterName: 'eamassettype' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
+    /**
+     * 功能位置
+     *
+     * @param {*} [item={}]
+     * @memberof AppIndexView
+     */
+    public click_8(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-model.ts

@@ -168,7 +168,7 @@ export default class AppIndexViewModel {
                         	iconcls: 'fa fa-navicon',
                         	icon: '',
                         	textcls: '',
-                        	appfunctag: '_7',
+                        	appfunctag: '_8',
                         	appfuncyype: 'APPVIEW',
                         	viewname: 'eamlocation-tree-exp-view',
                         	resourcetag: '',
@@ -236,6 +236,27 @@ export default class AppIndexViewModel {
                         	viewname: 'eamasset-state-model-grid-view',
                         	resourcetag: '',
                         }
+                        ,
+                        		        {
+                        	id: '6EC21D36-D7FB-4684-8448-DACEFCE5B0A5',
+                        	name: 'menuitem12',
+                        	text: '资产类型',
+                        	type: 'MENUITEM',
+                        	counterid: '',
+                        	tooltip: '资产类型',
+                        	expanded: false,
+                        	separator: false,
+                        	hidden: false,
+                        	hidesidebar: false,
+                        	opendefault: false,
+                        	iconcls: 'fa fa-legal',
+                        	icon: '',
+                        	textcls: '',
+                        	appfunctag: '_7',
+                        	appfuncyype: 'APPVIEW',
+                        	viewname: 'eamasset-type-grid-view',
+                        	resourcetag: '',
+                        }
                         ,
                 	],
                 }
@@ -314,6 +335,18 @@ export default class AppIndexViewModel {
             appfunctag: '_7',
             appfuncyype: 'APPVIEW',
             openmode: '',
+            codename: 'eamassettypegridview',
+            deResParameters: [],
+            routepath: '/appindexview/:appindexview?/eamassettypes/:eamassettype?/gridview/:gridview?',
+            parameters: [
+                { pathName: 'eamassettypes', parameterName: 'eamassettype' },
+                { pathName: 'gridview', parameterName: 'gridview' },
+            ],
+        },
+        {
+            appfunctag: '_8',
+            appfuncyype: 'APPVIEW',
+            openmode: '',
             codename: 'eamlocationtreeexpview',
             deResParameters: [],
             routepath: '/appindexview/:appindexview?/eamlocations/:eamlocation?/treeexpview/:treeexpview?',

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml

@@ -15,11 +15,12 @@ services:
       - SPRING_REDIS_DATABASE=0
       - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
       - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
       - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
       - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
       - CAS=https://passport.ibizlab.cn
       - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
       - SEATA_ENABLED=true
     deploy:
       resources:

assetmanagement-boot/src/main/java/cn/ibizlab/assetmanagement/config/DevBootAutoConfiguration.java

 package cn.ibizlab.assetmanagement.config;
 
-import com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Import({SeataFeignClientAutoConfiguration.class})
 public class DevBootAutoConfiguration {
 
 }

assetmanagement-core/pom.xml

@@ -98,28 +98,6 @@
             <artifactId>jobs-spring-boot-starter</artifactId>
         </dependency>
 
-        <!--  阿里seata分布式事务 -->
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>druid</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.seata</groupId>
-                    <artifactId>seata-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
 	</dependencies>
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/service/impl/EAMApplyServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.apply.domain.EAMApply;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/service/impl/EAMApplyStateModelLineServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.apply.domain.EAMApplyStateModelLine;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/service/impl/EAMApplyStateModelServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.apply.domain.EAMApplyStateModel;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/service/impl/EAMApplyStateServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.apply.domain.EAMApplyState;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/service/impl/EAMApplyTypeServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.apply.domain.EAMApplyType;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMAsset.java

@@ -110,6 +110,56 @@ public class EAMAsset extends EntityMP implements Serializable {
     @JSONField(name = "passetid")
     @JsonProperty("passetid")
     private String passetid;
+    /**
+     * 资产类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "eamassettypename")
+    @JsonProperty("eamassettypename")
+    private String eamassettypename;
+    /**
+     * 功能位置
+     */
+    @TableField(exist = false)
+    @JSONField(name = "eamlocationname")
+    @JsonProperty("eamlocationname")
+    private String eamlocationname;
+    /**
+     * 资产状态标识
+     */
+    @TableField(value = "eamassetstateid")
+    @JSONField(name = "eamassetstateid")
+    @JsonProperty("eamassetstateid")
+    private String eamassetstateid;
+    /**
+     * 资产状态
+     */
+    @TableField(exist = false)
+    @JSONField(name = "eamassetstatename")
+    @JsonProperty("eamassetstatename")
+    private String eamassetstatename;
+    /**
+     * 上级资产
+     */
+    @TableField(exist = false)
+    @JSONField(name = "passetname")
+    @JsonProperty("passetname")
+    private String passetname;
+    /**
+     * 资产编号
+     */
+    @TableField(value = "assetnumber")
+    @JSONField(name = "assetnumber")
+    @JsonProperty("assetnumber")
+    private String assetnumber;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetState eamassetstate;
 
     /**
      * 
@@ -169,6 +219,22 @@ public class EAMAsset extends EntityMP implements Serializable {
         this.modify("passetid",passetid);
     }
 
+    /**
+     * 设置 [资产状态标识]
+     */
+    public void setEamassetstateid(String eamassetstateid){
+        this.eamassetstateid = eamassetstateid ;
+        this.modify("eamassetstateid",eamassetstateid);
+    }
+
+    /**
+     * 设置 [资产编号]
+     */
+    public void setAssetnumber(String assetnumber){
+        this.assetnumber = assetnumber ;
+        this.modify("assetnumber",assetnumber);
+    }
+
 
 }
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/filter/EAMAssetSearchContext.java

@@ -55,6 +55,69 @@ public class EAMAssetSearchContext extends QueryWrapperContext<EAMAsset> {
             this.getSearchCond().eq("passetid", n_passetid_eq);
         }
     }
+	private String n_eamassettypename_eq;//[资产类型]
+	public void setN_eamassettypename_eq(String n_eamassettypename_eq) {
+        this.n_eamassettypename_eq = n_eamassettypename_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamassettypename_eq)){
+            this.getSearchCond().eq("eamassettypename", n_eamassettypename_eq);
+        }
+    }
+	private String n_eamassettypename_like;//[资产类型]
+	public void setN_eamassettypename_like(String n_eamassettypename_like) {
+        this.n_eamassettypename_like = n_eamassettypename_like;
+        if(!ObjectUtils.isEmpty(this.n_eamassettypename_like)){
+            this.getSearchCond().like("eamassettypename", n_eamassettypename_like);
+        }
+    }
+	private String n_eamlocationname_eq;//[功能位置]
+	public void setN_eamlocationname_eq(String n_eamlocationname_eq) {
+        this.n_eamlocationname_eq = n_eamlocationname_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamlocationname_eq)){
+            this.getSearchCond().eq("eamlocationname", n_eamlocationname_eq);
+        }
+    }
+	private String n_eamlocationname_like;//[功能位置]
+	public void setN_eamlocationname_like(String n_eamlocationname_like) {
+        this.n_eamlocationname_like = n_eamlocationname_like;
+        if(!ObjectUtils.isEmpty(this.n_eamlocationname_like)){
+            this.getSearchCond().like("eamlocationname", n_eamlocationname_like);
+        }
+    }
+	private String n_eamassetstateid_eq;//[资产状态标识]
+	public void setN_eamassetstateid_eq(String n_eamassetstateid_eq) {
+        this.n_eamassetstateid_eq = n_eamassetstateid_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamassetstateid_eq)){
+            this.getSearchCond().eq("eamassetstateid", n_eamassetstateid_eq);
+        }
+    }
+	private String n_eamassetstatename_eq;//[资产状态]
+	public void setN_eamassetstatename_eq(String n_eamassetstatename_eq) {
+        this.n_eamassetstatename_eq = n_eamassetstatename_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamassetstatename_eq)){
+            this.getSearchCond().eq("eamassetstatename", n_eamassetstatename_eq);
+        }
+    }
+	private String n_eamassetstatename_like;//[资产状态]
+	public void setN_eamassetstatename_like(String n_eamassetstatename_like) {
+        this.n_eamassetstatename_like = n_eamassetstatename_like;
+        if(!ObjectUtils.isEmpty(this.n_eamassetstatename_like)){
+            this.getSearchCond().like("eamassetstatename", n_eamassetstatename_like);
+        }
+    }
+	private String n_passetname_eq;//[上级资产]
+	public void setN_passetname_eq(String n_passetname_eq) {
+        this.n_passetname_eq = n_passetname_eq;
+        if(!ObjectUtils.isEmpty(this.n_passetname_eq)){
+            this.getSearchCond().eq("passetname", n_passetname_eq);
+        }
+    }
+	private String n_passetname_like;//[上级资产]
+	public void setN_passetname_like(String n_passetname_like) {
+        this.n_passetname_like = n_passetname_like;
+        if(!ObjectUtils.isEmpty(this.n_passetname_like)){
+            this.getSearchCond().like("passetname", n_passetname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/mapper/EAMAssetMapper.java

@@ -62,6 +62,8 @@ public interface EAMAssetMapper extends BaseMapper<EAMAsset>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<EAMAsset> selectByEamassetstateid(@Param("eamassetstateid") Serializable eamassetstateid) ;
+
     List<EAMAsset> selectByEamassettypeid(@Param("eamassettypeid") Serializable eamassettypeid) ;
 
     List<EAMAsset> selectByPassetid(@Param("assetid") Serializable assetid) ;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/IEAMAssetService.java

@@ -37,6 +37,8 @@ public interface IEAMAssetService extends IService<EAMAsset>{
     boolean save(EAMAsset et) ;
     void saveBatch(List<EAMAsset> list) ;
     Page<EAMAsset> searchDefault(EAMAssetSearchContext context) ;
+    List<EAMAsset> selectByEamassetstateid(String eamassetstateid) ;
+    void removeByEamassetstateid(String eamassetstateid) ;
     List<EAMAsset> selectByEamassettypeid(String eamassettypeid) ;
     void removeByEamassettypeid(String eamassettypeid) ;
     List<EAMAsset> selectByPassetid(String assetid) ;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.asset.domain.EAMAsset;
@@ -62,6 +61,9 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
     protected cn.ibizlab.assetmanagement.core.workorder.service.IEAMWorkOrderService eamworkorderService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetStateService eamassetstateService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetTypeService eamassettypeService;
     @Autowired
     @Lazy
@@ -72,6 +74,7 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
     @Override
     @Transactional
     public boolean create(EAMAsset et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getAssetid()),et);
@@ -80,12 +83,14 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
 
     @Override
     public void createBatch(List<EAMAsset> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean update(EAMAsset et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("assetid",et.getAssetid())))
             return false;
         CachedBeanCopier.copy(get(et.getAssetid()),et);
@@ -94,6 +99,7 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
 
     @Override
     public void updateBatch(List<EAMAsset> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -124,6 +130,7 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
 
     @Override
     public EAMAsset getDraft(EAMAsset et) {
+        fillParentData(et);
         return et;
     }
 
@@ -151,16 +158,28 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
 
     @Override
     public boolean saveBatch(Collection<EAMAsset> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<EAMAsset> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
 
+	@Override
+    public List<EAMAsset> selectByEamassetstateid(String eamassetstateid) {
+        return baseMapper.selectByEamassetstateid(eamassetstateid);
+    }
+
+    @Override
+    public void removeByEamassetstateid(String eamassetstateid) {
+        this.remove(new QueryWrapper<EAMAsset>().eq("eamassetstateid",eamassetstateid));
+    }
+
 	@Override
     public List<EAMAsset> selectByEamassettypeid(String eamassettypeid) {
         return baseMapper.selectByEamassettypeid(eamassettypeid);
@@ -203,6 +222,52 @@ public class EAMAssetServiceImpl extends ServiceImpl<EAMAssetMapper, EAMAsset> i
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(EAMAsset et){
+        //实体关系[DER1N_EAMASSET_EAMASSETSTATE_EAMASSETSTATEID]
+        if(!ObjectUtils.isEmpty(et.getEamassetstateid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetState eamassetstate=et.getEamassetstate();
+            if(ObjectUtils.isEmpty(eamassetstate)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetState majorEntity=eamassetstateService.get(et.getEamassetstateid());
+                et.setEamassetstate(majorEntity);
+                eamassetstate=majorEntity;
+            }
+            et.setEamassetstatename(eamassetstate.getEamassetstatename());
+        }
+        //实体关系[DER1N_EAMASSET_EAMASSETTYPE_EAMASSETTYPEID]
+        if(!ObjectUtils.isEmpty(et.getEamassettypeid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType eamassettype=et.getEamassettype();
+            if(ObjectUtils.isEmpty(eamassettype)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType majorEntity=eamassettypeService.get(et.getEamassettypeid());
+                et.setEamassettype(majorEntity);
+                eamassettype=majorEntity;
+            }
+            et.setEamassettypename(eamassettype.getEamassettypename());
+        }
+        //实体关系[DER1N_EAMASSET_EAMASSET_PASSETID]
+        if(!ObjectUtils.isEmpty(et.getPassetid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMAsset passet=et.getPasset();
+            if(ObjectUtils.isEmpty(passet)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMAsset majorEntity=eamassetService.get(et.getPassetid());
+                et.setPasset(majorEntity);
+                passet=majorEntity;
+            }
+            et.setPassetname(passet.getAssetname());
+        }
+        //实体关系[DER1N_EAMASSET_EAMLOCATION_EAMLOCATIONID]
+        if(!ObjectUtils.isEmpty(et.getEamlocationid())){
+            cn.ibizlab.assetmanagement.core.location.domain.EAMLocation eamlocation=et.getEamlocation();
+            if(ObjectUtils.isEmpty(eamlocation)){
+                cn.ibizlab.assetmanagement.core.location.domain.EAMLocation majorEntity=eamlocationService.get(et.getEamlocationid());
+                et.setEamlocation(majorEntity);
+                eamlocation=majorEntity;
+            }
+            et.setEamlocationname(eamlocation.getEamlocationname());
+        }
+    }
 
 
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetStateModelLineServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetStateModelLine;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetStateModelServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetStateModel;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetStateServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetState;
@@ -49,6 +48,9 @@ public class EAMAssetStateServiceImpl extends ServiceImpl<EAMAssetStateMapper, E
     @Autowired
     @Lazy
     protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetStateModelLineService eamassetstatemodellineService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetService eamassetService;
 
     protected int batchSize = 500;
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetTypeServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.location.domain.EAMLocation;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationStateModelLineServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.location.domain.EAMLocationStateModelLine;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationStateModelServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.location.domain.EAMLocationStateModel;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationStateServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.location.domain.EAMLocationState;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationTypeServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.location.domain.EAMLocationType;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/impl/EAMPlanCDTServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.plan.domain.EAMPlanCDT;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/impl/EAMPlanLineServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.plan.domain.EAMPlanLine;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/impl/EAMPlanScheduleServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.plan.domain.EAMPlanSchedule;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/plan/service/impl/EAMPlanServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.plan.domain.EAMPlan;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMWOStateModelLineServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.workorder.domain.EAMWOStateModelLine;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMWOStateModelServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.workorder.domain.EAMWOStateModel;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMWOStateServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.workorder.domain.EAMWOState;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMWOTypeServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.workorder.domain.EAMWOType;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/service/impl/EAMWorkOrderServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.assetmanagement.core.workorder.domain.EAMWorkOrder;

assetmanagement-core/src/main/resources/liquibase/h2_table.xml

@@ -116,7 +116,7 @@
 
 
     <!--输出实体[EAMASSET]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-17-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamasset-33-6">
         <createTable tableName="ASSET">
                 <column name="ASSETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMASSET_ASSETID"/>
@@ -137,12 +137,16 @@
                 </column>
                 <column name="PASSETID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="EAMASSETSTATEID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ASSETNUMBER" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[EAMASSETSTATE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstate-22-7">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstate-24-7">
         <createTable tableName="EAMASSETSTATE">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -164,7 +168,7 @@
 
 
     <!--输出实体[EAMASSETSTATEMODEL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodel-16-8">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodel-17-8">
         <createTable tableName="EAMASSETSTATEMODEL">
                 <column name="EAMASSETSTATEMODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMASSETSTATEMODEL_EAMASSET"/>
@@ -184,7 +188,7 @@
 
 
     <!--输出实体[EAMASSETSTATEMODELLINE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodelline-17-9">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodelline-18-9">
         <createTable tableName="EAMASSETSTATEMODELLINE">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -208,7 +212,7 @@
 
 
     <!--输出实体[EAMASSETTYPE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassettype-14-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamassettype-19-10">
         <createTable tableName="EAMASSETTYPE">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -232,7 +236,7 @@
 
 
     <!--输出实体[EAMLOCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-82-11">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-83-11">
         <createTable tableName="EAMLOCATION">
                 <column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
@@ -260,7 +264,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-41-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-44-12">
         <createTable tableName="EAMLOCATIONSTATE">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -577,91 +581,94 @@
        <addForeignKeyConstraint baseColumnNames="EAMAPPLYSTATEMODELID" baseTableName="EAMAPPLYTYPE" constraintName="DER1N_EAMAPPLYTYPE_EAMAPPLYSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMAPPLYSTATEMODELID" referencedTableName="EAMAPPLYSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMASSET]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-17-31">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-33-31">
+       <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETSTATE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEID" referencedTableName="EAMASSETSTATE" validate="true"/>
+    </changeSet>
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-33-32">
        <addForeignKeyConstraint baseColumnNames="EAMASSETTYPEID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSETTYPE_EA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETTYPEID" referencedTableName="EAMASSETTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-17-32">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-33-33">
        <addForeignKeyConstraint baseColumnNames="PASSETID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMASSET_PASSET" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-17-33">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamasset-33-34">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="ASSET" constraintName="DER1N_EAMASSET_EAMLOCATION_EAM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMASSETSTATE]外键关系 -->
         <!--输出实体[EAMASSETSTATEMODEL]外键关系 -->
         <!--输出实体[EAMASSETSTATEMODELLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamassetstatemodelline-17-34">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamassetstatemodelline-18-35">
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETSTATEMODELLINE" constraintName="DER1N_EAMASSETSTATEMODELLINE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMASSETTYPE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamassettype-14-36">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamassettype-19-37">
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETTYPE" constraintName="DER1N_EAMASSETTYPE_EAMASSETSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-82-37">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-83-38">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEID" referencedTableName="EAMLOCATIONSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-82-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-83-39">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONTYPEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONTYPEID" referencedTableName="EAMLOCATIONTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-82-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-83-40">
        <addForeignKeyConstraint baseColumnNames="PEAMLOCATIONID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODEL]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODELLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-29-40">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-29-41">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONTYPE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-22-42">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-22-43">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONTYPE" constraintName="DER1N_EAMLOCATIONTYPE_EAMLOCAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLAN]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-10-43">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-10-44">
        <addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="EAMPLAN" constraintName="DER1N_EAMPLAN_EAMASSET_ASSETID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-10-44">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-10-45">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="EAMPLAN" constraintName="DER1N_EAMPLAN_EAMLOCATION_EAML" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLANCDT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplancdt-6-45">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplancdt-6-46">
        <addForeignKeyConstraint baseColumnNames="EAMPLANID" baseTableName="EAMPLANCDT" constraintName="DER1N_EAMPLANCDT_EAMPLAN_EAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMPLANID" referencedTableName="EAMPLAN" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLANLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-46">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-47">
        <addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="EAMPLANLINE" constraintName="DER1N_EAMPLANLINE_EAMASSET_ASS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-48">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="EAMPLANLINE" constraintName="DER1N_EAMPLANLINE_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-48">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanline-8-49">
        <addForeignKeyConstraint baseColumnNames="EAMPLANID" baseTableName="EAMPLANLINE" constraintName="DER1N_EAMPLANLINE_EAMPLAN_EAMP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMPLANID" referencedTableName="EAMPLAN" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLANSCHEDULE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanschedule-6-49">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplanschedule-6-50">
        <addForeignKeyConstraint baseColumnNames="EAMPLANID" baseTableName="EAMPLANSCHEDULE" constraintName="DER1N_EAMPLANSCHEDULE_EAMPLAN_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMPLANID" referencedTableName="EAMPLAN" validate="true"/>
     </changeSet>
         <!--输出实体[EAMWOSTATE]外键关系 -->
         <!--输出实体[EAMWOSTATEMODEL]外键关系 -->
         <!--输出实体[EAMWOSTATEMODELLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamwostatemodelline-7-50">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamwostatemodelline-7-51">
        <addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOSTATEMODELLINE" constraintName="DER1N_EAMWOSTATEMODELLINE_EAMW" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMWOTYPE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-7-52">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-7-53">
        <addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOTYPE" constraintName="DER1N_EAMWOTYPE_EAMWOSTATEMODE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMWORKORDER]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-53">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-54">
        <addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMASSET_AS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-54">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-55">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMLOCATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-55">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-56">
        <addForeignKeyConstraint baseColumnNames="PWORKORDERID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWORKORDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WORKORDERID" referencedTableName="WORKORDER" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-56">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-12-57">
        <addForeignKeyConstraint baseColumnNames="EAMWOTYPEID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOTYPE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOTYPEID" referencedTableName="EAMWOTYPE" validate="true"/>
     </changeSet>
 

assetmanagement-core/src/main/resources/mapper/asset/eamasset/EAMAssetMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EAMAssetResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETTYPEID`, t1.`EAMLOCATIONID`, t1.`PASSETID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  ) t1 where assetid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  ) t1 where assetid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -14,8 +14,11 @@
 		<result property="eamassettypeid" column="eamassettypeid" />
 		<result property="eamlocationid" column="eamlocationid" />
 		<result property="passetid" column="passetid" />
+		<result property="eamassetstateid" column="eamassetstateid" />
             
 		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="eamassetstate" javaType="cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetState" column="eamassetstateid" select="cn.ibizlab.assetmanagement.core.asset.mapper.EAMAssetStateMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="eamassettype" javaType="cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType" column="eamassettypeid" select="cn.ibizlab.assetmanagement.core.asset.mapper.EAMAssetTypeMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
@@ -24,6 +27,13 @@
 		<association property="eamlocation" javaType="cn.ibizlab.assetmanagement.core.location.domain.EAMLocation" column="eamlocationid" select="cn.ibizlab.assetmanagement.core.location.mapper.EAMLocationMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMASSET_EAMASSETSTATE_EAMASSETSTATEID] -->
+	 <select id="selectByEamassetstateid" resultMap="EAMAssetResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  eamassetstateid=#{eamassetstateid}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMASSET_EAMASSETTYPE_EAMASSETTYPEID] -->
 	 <select id="selectByEamassettypeid" resultMap="EAMAssetResultMap">
          select t1.* from (
@@ -57,12 +67,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETTYPEID`, t1.`EAMLOCATIONID`, t1.`PASSETID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETTYPEID`, t1.`EAMLOCATIONID`, t1.`PASSETID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 			]]>
     </sql>
 </mapper>

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

@@ -113,7 +113,7 @@
             {
                "appid":"AssetManagement",
                "appname":"资产管理",
-               "appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" },{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" }]},{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem4" , "name":"工单管理" },{ "id":"menuitem5" , "name":"维护计划" }]}] }]
+               "appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" },{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" },{ "id":"menuitem12" , "name":"资产类型" }]},{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem4" , "name":"工单管理" },{ "id":"menuitem5" , "name":"维护计划" }]}] }]
             }
             ]
     }

assetmanagement-dependencies/pom.xml

@@ -268,30 +268,6 @@
                 <version>${baomidou-jobs.version}</version>
             </dependency>
 
-            <!--  阿里seata分布式事务 -->
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-spring-boot-starter</artifactId>
-                <version>${alibaba-seata.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.alibaba</groupId>
-                        <artifactId>druid</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-                <version> ${spring-cloud-alibaba.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.seata</groupId>
-                        <artifactId>seata-spring-boot-starter</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
 
         </dependencies>
     </dependencyManagement>

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/config/AssetApiAutoConfiguration.java

@@ -15,9 +15,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 import org.springframework.context.annotation.Import;
 
-@Import({
-    com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
-})
 @Configuration
 @ConditionalOnClass(AssetApiRestConfiguration.class)
 @ConditionalOnWebApplication

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMAssetDTO.java

@@ -97,6 +97,54 @@ public class EAMAssetDTO extends DTOBase implements Serializable {
     @JsonProperty("passetid")
     private String passetid;
 
+    /**
+     * 属性 [EAMASSETTYPENAME]
+     *
+     */
+    @JSONField(name = "eamassettypename")
+    @JsonProperty("eamassettypename")
+    private String eamassettypename;
+
+    /**
+     * 属性 [EAMLOCATIONNAME]
+     *
+     */
+    @JSONField(name = "eamlocationname")
+    @JsonProperty("eamlocationname")
+    private String eamlocationname;
+
+    /**
+     * 属性 [EAMASSETSTATEID]
+     *
+     */
+    @JSONField(name = "eamassetstateid")
+    @JsonProperty("eamassetstateid")
+    private String eamassetstateid;
+
+    /**
+     * 属性 [EAMASSETSTATENAME]
+     *
+     */
+    @JSONField(name = "eamassetstatename")
+    @JsonProperty("eamassetstatename")
+    private String eamassetstatename;
+
+    /**
+     * 属性 [PASSETNAME]
+     *
+     */
+    @JSONField(name = "passetname")
+    @JsonProperty("passetname")
+    private String passetname;
+
+    /**
+     * 属性 [ASSETNUMBER]
+     *
+     */
+    @JSONField(name = "assetnumber")
+    @JsonProperty("assetnumber")
+    private String assetnumber;
+
 
     /**
      * 设置 [ASSETNAME]
@@ -130,6 +178,22 @@ public class EAMAssetDTO extends DTOBase implements Serializable {
         this.modify("passetid",passetid);
     }
 
+    /**
+     * 设置 [EAMASSETSTATEID]
+     */
+    public void setEamassetstateid(String  eamassetstateid){
+        this.eamassetstateid = eamassetstateid ;
+        this.modify("eamassetstateid",eamassetstateid);
+    }
+
+    /**
+     * 设置 [ASSETNUMBER]
+     */
+    public void setAssetnumber(String  assetnumber){
+        this.assetnumber = assetnumber ;
+        this.modify("assetnumber",assetnumber);
+    }
+
 
 }
 

assetmanagement-provider/pom.xml

@@ -25,28 +25,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-        <!--  阿里seata分布式事务 -->
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>druid</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.seata</groupId>
-                    <artifactId>seata-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
 	</dependencies>
 

assetmanagement-util/src/main/resources/application-sys.yml

@@ -17,10 +17,14 @@ spring:
         max-wait: 300ms
         max-idle: 16
         min-idle: 8
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
   datasource:
     username: a_LAB01_e85d8801c
     password: 'b1@@@772'
-    url: jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    url: jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大
@@ -103,20 +107,4 @@ server:
     mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
     min-response-size: 10240
 
-seata:
-  enabled: true    #是否开启全局事务
-  application-id: iBizAssetManagement        #服务标识
-  tx-service-group: iBizAssetManagementgroup #事务组
-  service:
-    vgroup-mapping:
-      iBizAssetManagementgroup: default   #指定事务组对应的Tc Server集群
-  registry:
-    type: nacos   #注册中心
-    nacos:
-      application: seata-server  #Tc Server服务标识
-      server-addr: localhost     #注册中心地址
-      group: DEFAULT_GROUP             #服务组
-      namespace:      #服务命名空间
-      userName: ""     #用户名
-      password: ""     #密码