Skip to content

资
资产管理
提交 00397d6f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_gzf 部署微服务应用

上级 222ce9d9
隐藏空白字符变更
内嵌 并排
正在显示 包含 1187 行增加 和 11 行删除
app_AssetManagement/public/assets/json/view-config.json
浏览文件 @ 00397d6f
...@@ -9,6 +9,76 @@ ...@@ -9,6 +9,76 @@
"viewtag": "0b6fa9e6ebc1f6d1afaf3c19585840b0", "viewtag": "0b6fa9e6ebc1f6d1afaf3c19585840b0",
"memo": "系统自动添加" "memo": "系统自动添加"
}, },
"eamlocationstatemodelpickupview": {
"title": "功能位置状态模型数据选择视图",
"caption": "功能位置状态模型",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelPickupView",
"viewfilename": "eamlocation-state-model-pickup-view",
"viewtag": "3d676a12800fca23bec463d5c5217413",
"memo": "系统自动添加"
},
"eamlocationstatemodeleditview": {
"title": "功能位置状态模型编辑视图",
"caption": "功能位置状态模型",
"viewtype": "DEEDITVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelEditView",
"viewfilename": "eamlocation-state-model-edit-view",
"viewtag": "7bf1327f579d782d5cdb98528999a5e0",
"memo": "系统自动添加"
},
"eamlocationstatemodelgridview": {
"title": "功能位置状态模型表格视图",
"caption": "功能位置状态模型",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelGridView",
"viewfilename": "eamlocation-state-model-grid-view",
"viewtag": "9e9b3600ba892d31757bacef1dcc9458",
"memo": ""
},
"eamlocationstatepickupview": {
"title": "功能位置状态数据选择视图",
"caption": "功能位置状态",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStatePickupView",
"viewfilename": "eamlocation-state-pickup-view",
"viewtag": "a9f7eb2645c6505a232a0a13742c42a7",
"memo": "系统自动添加"
},
"eamlocationstatemodellineeditview": {
"title": "功能位置状态模型明细编辑视图",
"caption": "功能位置状态模型明细",
"viewtype": "DEEDITVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelLineEditView",
"viewfilename": "eamlocation-state-model-line-edit-view",
"viewtag": "b3d85711a6feb998249451ba167895d2",
"memo": "系统自动添加"
},
"eamlocationstatepickupgridview": {
"title": "功能位置状态选择表格视图",
"caption": "功能位置状态",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStatePickupGridView",
"viewfilename": "eamlocation-state-pickup-grid-view",
"viewtag": "b56347aaab650c59a8338876600c21e4",
"memo": "系统自动添加"
},
"eamlocationstatemodelpickupgridview": {
"title": "功能位置状态模型选择表格视图",
"caption": "功能位置状态模型",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelPickupGridView",
"viewfilename": "eamlocation-state-model-pickup-grid-view",
"viewtag": "bb8b4b03a77ed63b8eb4ef3d62b669a6",
"memo": "系统自动添加"
},
"appindexview": { "appindexview": {
"title": "应用首页视图", "title": "应用首页视图",
"caption": "资产管理", "caption": "资产管理",
...@@ -19,6 +89,16 @@ ...@@ -19,6 +89,16 @@
"viewtag": "D44132B9-5261-4008-A146-6287A80D5D31", "viewtag": "D44132B9-5261-4008-A146-6287A80D5D31",
"memo": "" "memo": ""
}, },
"eamlocationstatemodellinegridview": {
"title": "功能位置状态模型明细表格视图",
"caption": "功能位置状态模型明细",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelLineGridView",
"viewfilename": "eamlocation-state-model-line-grid-view",
"viewtag": "ecd1ec6299b5b24e2004fa15c4eef92d",
"memo": "系统自动添加"
},
"eamlocationstategridview": { "eamlocationstategridview": {
"title": "功能位置状态信息", "title": "功能位置状态信息",
"caption": "功能位置状态", "caption": "功能位置状态",
......
app_AssetManagement/src/interface/entity/eamlocation-state-model-line.ts
浏览文件 @ 00397d6f
...@@ -69,4 +69,20 @@ export interface EAMLocationStateModelLine { ...@@ -69,4 +69,20 @@ export interface EAMLocationStateModelLine {
* @memberof EAMLocationStateModelLine * @memberof EAMLocationStateModelLine
*/ */
eamlocationstateid?: any; eamlocationstateid?: any;
/**
* 功能位置状态
*
* @returns {*}
* @memberof EAMLocationStateModelLine
*/
eamlocationstatename?: any;
/**
* 功能位置状态模型
*
* @returns {*}
* @memberof EAMLocationStateModelLine
*/
eamlocationstatemodelname?: any;
} }
\ No newline at end of file
app_AssetManagement/src/locale/lang/en-US.ts
浏览文件 @ 00397d6f
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
left_exp: "左侧菜单", left_exp: "左侧菜单",
menuitem1: "功能位置", menuitem1: "功能位置",
menuitem6: "功能位置状态管理", menuitem6: "功能位置状态管理",
menuitem7: "功能位置状态模型管理",
menuitem2: "资产管理", menuitem2: "资产管理",
menuitem3: "维护申请", menuitem3: "维护申请",
menuitem4: "工单管理", menuitem4: "工单管理",
......
app_AssetManagement/src/locale/lang/zh-CN.ts
浏览文件 @ 00397d6f
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
left_exp: "左侧菜单", left_exp: "左侧菜单",
menuitem1: "功能位置", menuitem1: "功能位置",
menuitem6: "功能位置状态管理", menuitem6: "功能位置状态管理",
menuitem7: "功能位置状态模型管理",
menuitem2: "资产管理", menuitem2: "资产管理",
menuitem3: "维护申请", menuitem3: "维护申请",
menuitem4: "工单管理", menuitem4: "工单管理",
......
app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model-line/eamlocation-state-model-line_en_US.ts
浏览文件 @ 00397d6f
...@@ -9,5 +9,177 @@ export default { ...@@ -9,5 +9,177 @@ export default {
updatedate: "更新时间", updatedate: "更新时间",
eamlocationstatemodelid: "功能位置状态模型标识", eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstateid: "功能位置状态标识", eamlocationstateid: "功能位置状态标识",
eamlocationstatename: "功能位置状态",
eamlocationstatemodelname: "功能位置状态模型",
}, },
views: {
editview: {
caption: "功能位置状态模型明细",
title: "功能位置状态模型明细编辑视图",
},
gridview: {
caption: "功能位置状态模型明细",
title: "功能位置状态模型明细表格视图",
},
},
main_form: {
details: {
group1: "功能位置状态模型明细基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "功能位置状态模型明细标识",
srfmajortext: "功能位置状态模型明细名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatename: "功能位置状态",
eamlocationstatemodelname: "功能位置状态模型",
eamlocationstateid: "功能位置状态标识",
eamlocationstatemodellineid: "功能位置状态模型明细标识",
},
uiactions: {
},
},
main_grid: {
columns: {
eamlocationstatemodelname: "功能位置状态模型",
eamlocationstatename: "功能位置状态",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "New",
tip: "New",
},
tbitem2: {
caption: "Edit",
tip: "Edit {0}",
},
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: "",
},
tbitem20: {
caption: "其它",
tip: "其它",
},
tbitem24: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem25: {
caption: "数据导入",
tip: "数据导入",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "Filter",
tip: "Filter",
},
tbitem4: {
caption: "Help",
tip: "Help",
},
},
editviewtoolbar_toolbar: {
tbitem10: {
caption: "Save",
tip: "Save",
},
tbitem12: {
caption: "Save And New",
tip: "Save And New",
},
tbitem11: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem18: {
caption: "-",
tip: "",
},
tbitem9: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem19: {
caption: "-",
tip: "",
},
tbitem5: {
caption: "New",
tip: "New",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem2: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem7: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem6: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem4: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem25: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "Help",
tip: "Help",
},
},
}; };
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model-line/eamlocation-state-model-line_zh_CN.ts
浏览文件 @ 00397d6f
...@@ -8,5 +8,177 @@ export default { ...@@ -8,5 +8,177 @@ export default {
updatedate: "更新时间", updatedate: "更新时间",
eamlocationstatemodelid: "功能位置状态模型标识", eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstateid: "功能位置状态标识", eamlocationstateid: "功能位置状态标识",
eamlocationstatename: "功能位置状态",
eamlocationstatemodelname: "功能位置状态模型",
}, },
views: {
editview: {
caption: "功能位置状态模型明细",
title: "功能位置状态模型明细编辑视图",
},
gridview: {
caption: "功能位置状态模型明细",
title: "功能位置状态模型明细表格视图",
},
},
main_form: {
details: {
group1: "功能位置状态模型明细基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "功能位置状态模型明细标识",
srfmajortext: "功能位置状态模型明细名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatename: "功能位置状态",
eamlocationstatemodelname: "功能位置状态模型",
eamlocationstateid: "功能位置状态标识",
eamlocationstatemodellineid: "功能位置状态模型明细标识",
},
uiactions: {
},
},
main_grid: {
columns: {
eamlocationstatemodelname: "功能位置状态模型",
eamlocationstatename: "功能位置状态",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "编辑",
tip: "编辑",
},
tbitem1: {
caption: "拷贝",
tip: "拷贝",
},
tbitem15: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "导出",
tip: "导出",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem20: {
caption: "其它",
tip: "其它",
},
tbitem24: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem25: {
caption: "数据导入",
tip: "数据导入",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "过滤",
tip: "过滤",
},
tbitem4: {
caption: "帮助",
tip: "帮助",
},
},
editviewtoolbar_toolbar: {
tbitem10: {
caption: "保存",
tip: "保存",
},
tbitem12: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem11: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem18: {
caption: "-",
tip: "",
},
tbitem9: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem19: {
caption: "-",
tip: "",
},
tbitem5: {
caption: "新建",
tip: "新建",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "拷贝",
tip: "拷贝",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem2: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem7: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem6: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem4: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem25: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "帮助",
tip: "帮助",
},
},
}; };
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_en_US.ts
浏览文件 @ 00397d6f
...@@ -8,4 +8,181 @@ export default { ...@@ -8,4 +8,181 @@ export default {
updateman: "更新人", updateman: "更新人",
updatedate: "更新时间", updatedate: "更新时间",
}, },
views: {
pickupview: {
caption: "功能位置状态模型",
title: "功能位置状态模型数据选择视图",
},
editview: {
caption: "功能位置状态模型",
title: "功能位置状态模型编辑视图",
},
gridview: {
caption: "功能位置状态模型",
title: "功能位置状态模型表格视图",
},
pickupgridview: {
caption: "功能位置状态模型",
title: "功能位置状态模型选择表格视图",
},
},
main_form: {
details: {
group1: "基本信息",
druipart1: "",
grouppanel1: "选中功能位置状态",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "功能位置状态模型标识",
srfmajortext: "功能位置状态模型名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatemodelname: "功能位置状态模型名称",
},
uiactions: {
},
},
main_grid: {
columns: {
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatemodelname: "功能位置状态模型名称",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem10: {
caption: "Save",
tip: "Save",
},
tbitem12: {
caption: "Save And New",
tip: "Save And New",
},
tbitem11: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem18: {
caption: "-",
tip: "",
},
tbitem9: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem19: {
caption: "-",
tip: "",
},
tbitem5: {
caption: "New",
tip: "New",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem2: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem7: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem6: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem4: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem25: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "Help",
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "New",
tip: "New",
},
tbitem2: {
caption: "Edit",
tip: "Edit {0}",
},
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: "",
},
tbitem20: {
caption: "其它",
tip: "其它",
},
tbitem24: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem25: {
caption: "数据导入",
tip: "数据导入",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "Filter",
tip: "Filter",
},
tbitem4: {
caption: "Help",
tip: "Help",
},
},
}; };
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_zh_CN.ts
浏览文件 @ 00397d6f
...@@ -7,4 +7,181 @@ export default { ...@@ -7,4 +7,181 @@ export default {
updateman: "更新人", updateman: "更新人",
updatedate: "更新时间", updatedate: "更新时间",
}, },
views: {
pickupview: {
caption: "功能位置状态模型",
title: "功能位置状态模型数据选择视图",
},
editview: {
caption: "功能位置状态模型",
title: "功能位置状态模型编辑视图",
},
gridview: {
caption: "功能位置状态模型",
title: "功能位置状态模型表格视图",
},
pickupgridview: {
caption: "功能位置状态模型",
title: "功能位置状态模型选择表格视图",
},
},
main_form: {
details: {
group1: "基本信息",
druipart1: "",
grouppanel1: "选中功能位置状态",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "功能位置状态模型标识",
srfmajortext: "功能位置状态模型名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatemodelname: "功能位置状态模型名称",
},
uiactions: {
},
},
main_grid: {
columns: {
eamlocationstatemodelid: "功能位置状态模型标识",
eamlocationstatemodelname: "功能位置状态模型名称",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem10: {
caption: "保存",
tip: "保存",
},
tbitem12: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem11: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem18: {
caption: "-",
tip: "",
},
tbitem9: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem19: {
caption: "-",
tip: "",
},
tbitem5: {
caption: "新建",
tip: "新建",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "拷贝",
tip: "拷贝",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem2: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem7: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem6: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem4: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem25: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "帮助",
tip: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "编辑",
tip: "编辑",
},
tbitem1: {
caption: "拷贝",
tip: "拷贝",
},
tbitem15: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "导出",
tip: "导出",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem20: {
caption: "其它",
tip: "其它",
},
tbitem24: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem25: {
caption: "数据导入",
tip: "数据导入",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "过滤",
tip: "过滤",
},
tbitem4: {
caption: "帮助",
tip: "帮助",
},
},
}; };
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_en_US.ts
浏览文件 @ 00397d6f
...@@ -15,6 +15,14 @@ export default { ...@@ -15,6 +15,14 @@ export default {
caption: "功能位置状态", caption: "功能位置状态",
title: "功能位置状态编辑视图", title: "功能位置状态编辑视图",
}, },
pickupview: {
caption: "功能位置状态",
title: "功能位置状态数据选择视图",
},
pickupgridview: {
caption: "功能位置状态",
title: "功能位置状态选择表格视图",
},
gridview: { gridview: {
caption: "功能位置状态", caption: "功能位置状态",
title: "功能位置状态信息", title: "功能位置状态信息",
......
app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN.ts
浏览文件 @ 00397d6f
...@@ -14,6 +14,14 @@ export default { ...@@ -14,6 +14,14 @@ export default {
caption: "功能位置状态", caption: "功能位置状态",
title: "功能位置状态编辑视图", title: "功能位置状态编辑视图",
}, },
pickupview: {
caption: "功能位置状态",
title: "功能位置状态数据选择视图",
},
pickupgridview: {
caption: "功能位置状态",
title: "功能位置状态选择表格视图",
},
gridview: { gridview: {
caption: "功能位置状态", caption: "功能位置状态",
title: "功能位置状态信息", title: "功能位置状态信息",
......
app_AssetManagement/src/mock/app/app-index-view-appmenu/app-index-view-appmenu.ts
浏览文件 @ 00397d6f
...@@ -97,6 +97,24 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => { ...@@ -97,6 +97,24 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: '', iconcls: '',
icon: '', icon: '',
textcls: '', textcls: '',
appfunctag: '_3',
resourcetag: '',
},
{
id: 'E3BFAB38-B5C1-487A-B68B-61F6EF513C58',
name: 'menuitem7',
text: '功能位置状态模型管理',
type: 'MENUITEM',
counterid: '',
tooltip: '功能位置状态模型管理',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_2', appfunctag: '_2',
resourcetag: '', resourcetag: '',
}, },
......
app_AssetManagement/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 00397d6f
...@@ -15,6 +15,62 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -15,6 +15,62 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "EAMLocationStateEditView", "viewname": "EAMLocationStateEditView",
"viewtag": "0b6fa9e6ebc1f6d1afaf3c19585840b0" "viewtag": "0b6fa9e6ebc1f6d1afaf3c19585840b0"
}, },
"eamlocationstatemodelpickupview": {
"title": "功能位置状态模型数据选择视图",
"caption": "功能位置状态模型",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelPickupView",
"viewtag": "3d676a12800fca23bec463d5c5217413"
},
"eamlocationstatemodeleditview": {
"title": "功能位置状态模型编辑视图",
"caption": "功能位置状态模型",
"viewtype": "DEEDITVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelEditView",
"viewtag": "7bf1327f579d782d5cdb98528999a5e0"
},
"eamlocationstatemodelgridview": {
"title": "功能位置状态模型表格视图",
"caption": "功能位置状态模型",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelGridView",
"viewtag": "9e9b3600ba892d31757bacef1dcc9458"
},
"eamlocationstatepickupview": {
"title": "功能位置状态数据选择视图",
"caption": "功能位置状态",
"viewtype": "DEPICKUPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStatePickupView",
"viewtag": "a9f7eb2645c6505a232a0a13742c42a7"
},
"eamlocationstatemodellineeditview": {
"title": "功能位置状态模型明细编辑视图",
"caption": "功能位置状态模型明细",
"viewtype": "DEEDITVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelLineEditView",
"viewtag": "b3d85711a6feb998249451ba167895d2"
},
"eamlocationstatepickupgridview": {
"title": "功能位置状态选择表格视图",
"caption": "功能位置状态",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStatePickupGridView",
"viewtag": "b56347aaab650c59a8338876600c21e4"
},
"eamlocationstatemodelpickupgridview": {
"title": "功能位置状态模型选择表格视图",
"caption": "功能位置状态模型",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelPickupGridView",
"viewtag": "bb8b4b03a77ed63b8eb4ef3d62b669a6"
},
"appindexview": { "appindexview": {
"title": "应用首页视图", "title": "应用首页视图",
"caption": "资产管理", "caption": "资产管理",
...@@ -23,6 +79,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -23,6 +79,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "AppIndexView", "viewname": "AppIndexView",
"viewtag": "D44132B9-5261-4008-A146-6287A80D5D31" "viewtag": "D44132B9-5261-4008-A146-6287A80D5D31"
}, },
"eamlocationstatemodellinegridview": {
"title": "功能位置状态模型明细表格视图",
"caption": "功能位置状态模型明细",
"viewtype": "DEGRIDVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateModelLineGridView",
"viewtag": "ecd1ec6299b5b24e2004fa15c4eef92d"
},
"eamlocationstategridview": { "eamlocationstategridview": {
"title": "功能位置状态信息", "title": "功能位置状态信息",
"caption": "功能位置状态", "caption": "功能位置状态",
......
app_AssetManagement/src/pages/base/app-index-view/page-register.ts
浏览文件 @ 00397d6f
export const PageComponents = { export const PageComponents = {
install(Vue: any, opt: any) { install(Vue: any, opt: any) {
Vue.component('eamlocation-state-edit-view', () => import('@pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.vue')); Vue.component('eamlocation-state-model-pickup-grid-view', () => import('@pages/location/eamlocation-state-model-pickup-grid-view/eamlocation-state-model-pickup-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-edit-view', () => import('@pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.vue'));
Vue.component('eamlocation-state-grid-view', () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.vue')); Vue.component('eamlocation-state-grid-view', () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-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-state-model-grid-view', () => import('@pages/location/eamlocation-state-model-grid-view/eamlocation-state-model-grid-view.vue'));
Vue.component('eamlocation-state-pickup-grid-view', () => import('@pages/location/eamlocation-state-pickup-grid-view/eamlocation-state-pickup-grid-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'));
Vue.component('eamlocation-state-model-edit-view', () => import('@pages/location/eamlocation-state-model-edit-view/eamlocation-state-model-edit-view.vue'));
} }
}; };
\ No newline at end of file
app_AssetManagement/src/pages/base/app-index-view/router.ts
浏览文件 @ 00397d6f
...@@ -43,6 +43,34 @@ const router = new Router({ ...@@ -43,6 +43,34 @@ const router = new Router({
}, },
component: () => import('@pages/base/app-index-view/app-index-view.vue'), component: () => import('@pages/base/app-index-view/app-index-view.vue'),
children: [ children: [
{
path: 'eamlocationstatemodels/:eamlocationstatemodel?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.eamlocationstatemodel.views.pickupgridview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-pickup-grid-view/eamlocation-state-model-pickup-grid-view.vue'),
},
{
path: 'eamlocationstatemodellines/:eamlocationstatemodelline?/editview/:editview?',
meta: {
caption: 'entities.eamlocationstatemodelline.views.editview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodellines', parameterName: 'eamlocationstatemodelline' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-line-edit-view/eamlocation-state-model-line-edit-view.vue'),
},
{ {
path: 'eamlocationstates/:eamlocationstate?/editview/:editview?', path: 'eamlocationstates/:eamlocationstate?/editview/:editview?',
meta: { meta: {
...@@ -71,6 +99,90 @@ const router = new Router({ ...@@ -71,6 +99,90 @@ const router = new Router({
}, },
component: () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.vue'), component: () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.vue'),
}, },
{
path: 'eamlocationstatemodellines/:eamlocationstatemodelline?/gridview/:gridview?',
meta: {
caption: 'entities.eamlocationstatemodelline.views.gridview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodellines', parameterName: 'eamlocationstatemodelline' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'),
},
{
path: 'eamlocationstatemodels/:eamlocationstatemodel?/gridview/:gridview?',
meta: {
caption: 'entities.eamlocationstatemodel.views.gridview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-grid-view/eamlocation-state-model-grid-view.vue'),
},
{
path: 'eamlocationstates/:eamlocationstate?/pickupgridview/:pickupgridview?',
meta: {
caption: 'entities.eamlocationstate.views.pickupgridview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstates', parameterName: 'eamlocationstate' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-pickup-grid-view/eamlocation-state-pickup-grid-view.vue'),
},
{
path: 'eamlocationstatemodels/:eamlocationstatemodel?/pickupview/:pickupview?',
meta: {
caption: 'entities.eamlocationstatemodel.views.pickupview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-pickup-view/eamlocation-state-model-pickup-view.vue'),
},
{
path: 'eamlocationstates/:eamlocationstate?/pickupview/:pickupview?',
meta: {
caption: 'entities.eamlocationstate.views.pickupview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstates', parameterName: 'eamlocationstate' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-pickup-view/eamlocation-state-pickup-view.vue'),
},
{
path: 'eamlocationstatemodels/:eamlocationstatemodel?/editview/:editview?',
meta: {
caption: 'entities.eamlocationstatemodel.views.editview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/location/eamlocation-state-model-edit-view/eamlocation-state-model-edit-view.vue'),
},
...indexRoutes, ...indexRoutes,
], ],
}, },
......
app_AssetManagement/src/store/modules/view-action/state.ts
浏览文件 @ 00397d6f
...@@ -20,6 +20,7 @@ export const viewstate: any = { ...@@ -20,6 +20,7 @@ export const viewstate: any = {
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'f7c04762f2a3e3026c909e6191a0998f', 'f7c04762f2a3e3026c909e6191a0998f',
'9e9b3600ba892d31757bacef1dcc9458',
], ],
}, },
{ {
......
app_AssetManagement/src/uiservice/eamlocation-state-model-line/eamlocation-state-model-line-ui-service-base.ts
浏览文件 @ 00397d6f
...@@ -89,6 +89,8 @@ export default class EAMLocationStateModelLineUIServiceBase extends UIService { ...@@ -89,6 +89,8 @@ export default class EAMLocationStateModelLineUIServiceBase extends UIService {
* @memberof EAMLocationStateModelLineUIServiceBase * @memberof EAMLocationStateModelLineUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationstatemodellines'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocationstatemodellines'});
} }
/** /**
......
app_AssetManagement/src/uiservice/eamlocation-state-model/eamlocation-state-model-ui-service-base.ts
浏览文件 @ 00397d6f
...@@ -89,6 +89,10 @@ export default class EAMLocationStateModelUIServiceBase extends UIService { ...@@ -89,6 +89,10 @@ export default class EAMLocationStateModelUIServiceBase extends UIService {
* @memberof EAMLocationStateModelUIServiceBase * @memberof EAMLocationStateModelUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamlocationstatemodels'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationstatemodels'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocationstatemodels'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamlocationstatemodels'});
} }
/** /**
......
app_AssetManagement/src/uiservice/eamlocation-state/eamlocation-state-ui-service-base.ts
浏览文件 @ 00397d6f
...@@ -90,6 +90,8 @@ export default class EAMLocationStateUIServiceBase extends UIService { ...@@ -90,6 +90,8 @@ export default class EAMLocationStateUIServiceBase extends UIService {
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationstates'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationstates'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamlocationstates'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamlocationstates'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocationstates'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocationstates'});
} }
......
app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.tsx
浏览文件 @ 00397d6f
...@@ -17,6 +17,8 @@ export class AppIndexViewBase extends Vue { ...@@ -17,6 +17,8 @@ export class AppIndexViewBase extends Vue {
switch (item.appfunctag) { switch (item.appfunctag) {
case '_2': case '_2':
this.click_2(item); break; this.click_2(item); break;
case '_3':
this.click_3(item); break;
default: default:
judge = false; judge = false;
console.warn('未指定应用功能'); console.warn('未指定应用功能');
...@@ -28,12 +30,35 @@ export class AppIndexViewBase extends Vue { ...@@ -28,12 +30,35 @@ export class AppIndexViewBase extends Vue {
} }
/** /**
* 功能位置状态 * 功能位置状态模型
* *
* @param {*} [item={}] * @param {*} [item={}]
* @memberof AppIndexView * @memberof AppIndexView
*/ */
public click_2(item: any = {}) { public click_2(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ 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_3(item: any = {}) {
const viewparam: any = {}; const viewparam: any = {};
Object.assign(viewparam, {}); Object.assign(viewparam, {});
const deResParameters: any[] = []; const deResParameters: any[] = [];
......
app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-model.ts
浏览文件 @ 00397d6f
...@@ -105,11 +105,32 @@ export default class AppIndexViewModel { ...@@ -105,11 +105,32 @@ export default class AppIndexViewModel {
iconcls: '', iconcls: '',
icon: '', icon: '',
textcls: '', textcls: '',
appfunctag: '_2', appfunctag: '_3',
appfuncyype: 'APPVIEW', appfuncyype: 'APPVIEW',
viewname: 'eamlocation-state-grid-view', viewname: 'eamlocation-state-grid-view',
resourcetag: '', resourcetag: '',
} }
,
{
id: 'E3BFAB38-B5C1-487A-B68B-61F6EF513C58',
name: 'menuitem7',
text: '功能位置状态模型管理',
type: 'MENUITEM',
counterid: '',
tooltip: '功能位置状态模型管理',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_2',
appfuncyype: 'APPVIEW',
viewname: 'eamlocation-state-model-grid-view',
resourcetag: '',
}
, ,
], ],
} }
...@@ -207,6 +228,18 @@ export default class AppIndexViewModel { ...@@ -207,6 +228,18 @@ export default class AppIndexViewModel {
appfunctag: '_2', appfunctag: '_2',
appfuncyype: 'APPVIEW', appfuncyype: 'APPVIEW',
openmode: '', openmode: '',
codename: 'eamlocationstatemodelgridview',
deResParameters: [],
routepath: '/appindexview/:appindexview?/eamlocationstatemodels/:eamlocationstatemodel?/gridview/:gridview?',
parameters: [
{ pathName: 'eamlocationstatemodels', parameterName: 'eamlocationstatemodel' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: '_3',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamlocationstategridview', codename: 'eamlocationstategridview',
deResParameters: [], deResParameters: [],
routepath: '/appindexview/:appindexview?/eamlocationstates/:eamlocationstate?/gridview/:gridview?', routepath: '/appindexview/:appindexview?/eamlocationstates/:eamlocationstate?/gridview/:gridview?',
......
app_AssetManagement/src/widgets/eamlocation-state/main-form/main-form-base.tsx
浏览文件 @ 00397d6f
...@@ -88,6 +88,10 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -88,6 +88,10 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase * @memberof MainEditFormBase
*/ */
public rules: any = { public rules: any = {
eamlocationstatename: [
{ required: true, type: 'string', message: '功能位置状态名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '功能位置状态名称 值不能为空', trigger: 'blur' },
],
} }
/** /**
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/domain/EAMLocationStateModelLine.java
浏览文件 @ 00397d6f
...@@ -103,6 +103,20 @@ public class EAMLocationStateModelLine extends EntityMP implements Serializable ...@@ -103,6 +103,20 @@ public class EAMLocationStateModelLine extends EntityMP implements Serializable
@JSONField(name = "eamlocationstateid") @JSONField(name = "eamlocationstateid")
@JsonProperty("eamlocationstateid") @JsonProperty("eamlocationstateid")
private String eamlocationstateid; private String eamlocationstateid;
/**
* 功能位置状态
*/
@TableField(exist = false)
@JSONField(name = "eamlocationstatename")
@JsonProperty("eamlocationstatename")
private String eamlocationstatename;
/**
* 功能位置状态模型
*/
@TableField(exist = false)
@JSONField(name = "eamlocationstatemodelname")
@JsonProperty("eamlocationstatemodelname")
private String eamlocationstatemodelname;
/** /**
* *
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/filter/EAMLocationStateModelLineSearchContext.java
浏览文件 @ 00397d6f
...@@ -48,6 +48,34 @@ public class EAMLocationStateModelLineSearchContext extends QueryWrapperContext< ...@@ -48,6 +48,34 @@ public class EAMLocationStateModelLineSearchContext extends QueryWrapperContext<
this.getSearchCond().eq("eamlocationstateid", n_eamlocationstateid_eq); this.getSearchCond().eq("eamlocationstateid", n_eamlocationstateid_eq);
} }
} }
private String n_eamlocationstatename_eq;//[功能位置状态]
public void setN_eamlocationstatename_eq(String n_eamlocationstatename_eq) {
this.n_eamlocationstatename_eq = n_eamlocationstatename_eq;
if(!ObjectUtils.isEmpty(this.n_eamlocationstatename_eq)){
this.getSearchCond().eq("eamlocationstatename", n_eamlocationstatename_eq);
}
}
private String n_eamlocationstatename_like;//[功能位置状态]
public void setN_eamlocationstatename_like(String n_eamlocationstatename_like) {
this.n_eamlocationstatename_like = n_eamlocationstatename_like;
if(!ObjectUtils.isEmpty(this.n_eamlocationstatename_like)){
this.getSearchCond().like("eamlocationstatename", n_eamlocationstatename_like);
}
}
private String n_eamlocationstatemodelname_eq;//[功能位置状态模型]
public void setN_eamlocationstatemodelname_eq(String n_eamlocationstatemodelname_eq) {
this.n_eamlocationstatemodelname_eq = n_eamlocationstatemodelname_eq;
if(!ObjectUtils.isEmpty(this.n_eamlocationstatemodelname_eq)){
this.getSearchCond().eq("eamlocationstatemodelname", n_eamlocationstatemodelname_eq);
}
}
private String n_eamlocationstatemodelname_like;//[功能位置状态模型]
public void setN_eamlocationstatemodelname_like(String n_eamlocationstatemodelname_like) {
this.n_eamlocationstatemodelname_like = n_eamlocationstatemodelname_like;
if(!ObjectUtils.isEmpty(this.n_eamlocationstatemodelname_like)){
this.getSearchCond().like("eamlocationstatemodelname", n_eamlocationstatemodelname_like);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/location/service/impl/EAMLocationStateModelLineServiceImpl.java
浏览文件 @ 00397d6f
...@@ -57,6 +57,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -57,6 +57,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
@Override @Override
@Transactional @Transactional
public boolean create(EAMLocationStateModelLine et) { public boolean create(EAMLocationStateModelLine et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et))) if(!this.retBool(this.baseMapper.insert(et)))
return false; return false;
CachedBeanCopier.copy(get(et.getEamlocationstatemodellineid()),et); CachedBeanCopier.copy(get(et.getEamlocationstatemodellineid()),et);
...@@ -65,12 +66,14 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -65,12 +66,14 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
@Override @Override
public void createBatch(List<EAMLocationStateModelLine> list) { public void createBatch(List<EAMLocationStateModelLine> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize); this.saveBatch(list,batchSize);
} }
@Override @Override
@Transactional @Transactional
public boolean update(EAMLocationStateModelLine et) { public boolean update(EAMLocationStateModelLine et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamlocationstatemodellineid",et.getEamlocationstatemodellineid()))) if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamlocationstatemodellineid",et.getEamlocationstatemodellineid())))
return false; return false;
CachedBeanCopier.copy(get(et.getEamlocationstatemodellineid()),et); CachedBeanCopier.copy(get(et.getEamlocationstatemodellineid()),et);
...@@ -79,6 +82,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -79,6 +82,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
@Override @Override
public void updateBatch(List<EAMLocationStateModelLine> list) { public void updateBatch(List<EAMLocationStateModelLine> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize); updateBatchById(list,batchSize);
} }
...@@ -109,6 +113,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -109,6 +113,7 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
@Override @Override
public EAMLocationStateModelLine getDraft(EAMLocationStateModelLine et) { public EAMLocationStateModelLine getDraft(EAMLocationStateModelLine et) {
fillParentData(et);
return et; return et;
} }
...@@ -138,12 +143,14 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -138,12 +143,14 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
@Override @Override
public boolean saveBatch(Collection<EAMLocationStateModelLine> list) { public boolean saveBatch(Collection<EAMLocationStateModelLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize); saveOrUpdateBatch(list,batchSize);
return true; return true;
} }
@Override @Override
public void saveBatch(List<EAMLocationStateModelLine> list) { public void saveBatch(List<EAMLocationStateModelLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize); saveOrUpdateBatch(list,batchSize);
} }
...@@ -180,6 +187,32 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio ...@@ -180,6 +187,32 @@ public class EAMLocationStateModelLineServiceImpl extends ServiceImpl<EAMLocatio
/**
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(EAMLocationStateModelLine et){
//实体关系[DER1N_EAMLOCATIONSTATEMODELLINE_EAMLOCATIONSTATEMODEL_EAMLOCATIONSTATEMODELID]
if(!ObjectUtils.isEmpty(et.getEamlocationstatemodelid())){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocationStateModel eamlocationstatemodel=et.getEamlocationstatemodel();
if(ObjectUtils.isEmpty(eamlocationstatemodel)){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocationStateModel majorEntity=eamlocationstatemodelService.get(et.getEamlocationstatemodelid());
et.setEamlocationstatemodel(majorEntity);
eamlocationstatemodel=majorEntity;
}
et.setEamlocationstatemodelname(eamlocationstatemodel.getEamlocationstatemodelname());
}
//实体关系[DER1N_EAMLOCATIONSTATEMODELLINE_EAMLOCATIONSTATE_EAMLOCATIONSTATEID]
if(!ObjectUtils.isEmpty(et.getEamlocationstateid())){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocationState eamlocationstate=et.getEamlocationstate();
if(ObjectUtils.isEmpty(eamlocationstate)){
cn.ibizlab.assetmanagement.core.location.domain.EAMLocationState majorEntity=eamlocationstateService.get(et.getEamlocationstateid());
et.setEamlocationstate(majorEntity);
eamlocationstate=majorEntity;
}
et.setEamlocationstatename(eamlocationstate.getEamlocationstatename());
}
}
......
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 00397d6f
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<!--输出实体[EAMLOCATIONSTATE]数据结构 --> <!--输出实体[EAMLOCATIONSTATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-21-12"> <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-24-12">
<createTable tableName="EAMLOCATIONSTATE"> <createTable tableName="EAMLOCATIONSTATE">
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
</column> </column>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<!--输出实体[EAMLOCATIONSTATEMODEL]数据结构 --> <!--输出实体[EAMLOCATIONSTATEMODEL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-9-13"> <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-16-13">
<createTable tableName="EAMLOCATIONSTATEMODEL"> <createTable tableName="EAMLOCATIONSTATEMODEL">
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
</column> </column>
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
<!--输出实体[EAMLOCATIONSTATEMODELLINE]数据结构 --> <!--输出实体[EAMLOCATIONSTATEMODELLINE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-8-14"> <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-15-14">
<createTable tableName="EAMLOCATIONSTATEMODELLINE"> <createTable tableName="EAMLOCATIONSTATEMODELLINE">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)"> <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
<!--输出实体[EAMLOCATIONSTATE]外键关系 --> <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
<!--输出实体[EAMLOCATIONSTATEMODEL]外键关系 --> <!--输出实体[EAMLOCATIONSTATEMODEL]外键关系 -->
<!--输出实体[EAMLOCATIONSTATEMODELLINE]外键关系 --> <!--输出实体[EAMLOCATIONSTATEMODELLINE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-8-39"> <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-15-39">
<addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/> <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[EAMLOCATIONTYPE]外键关系 --> <!--输出实体[EAMLOCATIONTYPE]外键关系 -->
......
assetmanagement-core/src/main/resources/mapper/location/eamlocationstatemodelline/EAMLocationStateModelLineMapper.xml
浏览文件 @ 00397d6f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="EAMLocationStateModelLineResultMap" databaseId="mysql"> <select id="selectById" resultMap="EAMLocationStateModelLineResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 ) t1 where eamlocationstatemodellineid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t21.`EAMLOCATIONSTATEMODELNAME`, t11.`EAMLOCATIONSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 LEFT JOIN EAMLOCATIONSTATE t11 ON t1.EAMLOCATIONSTATEID = t11.EAMLOCATIONSTATEID LEFT JOIN EAMLOCATIONSTATEMODEL t21 ON t1.EAMLOCATIONSTATEMODELID = t21.EAMLOCATIONSTATEMODELID ) t1 where eamlocationstatemodellineid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t21.`EAMLOCATIONSTATEMODELNAME`, t11.`EAMLOCATIONSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 LEFT JOIN EAMLOCATIONSTATE t11 ON t1.EAMLOCATIONSTATEID = t11.EAMLOCATIONSTATEID LEFT JOIN EAMLOCATIONSTATEMODEL t21 ON t1.EAMLOCATIONSTATEMODELID = t21.EAMLOCATIONSTATEMODELID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMLOCATIONSTATEID`, t1.`EAMLOCATIONSTATEMODELID`, t1.`EAMLOCATIONSTATEMODELLINEID`, t1.`EAMLOCATIONSTATEMODELLINENAME`, t21.`EAMLOCATIONSTATEMODELNAME`, t11.`EAMLOCATIONSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMLOCATIONSTATEMODELLINE` t1 LEFT JOIN EAMLOCATIONSTATE t11 ON t1.EAMLOCATIONSTATEID = t11.EAMLOCATIONSTATEID LEFT JOIN EAMLOCATIONSTATEMODEL t21 ON t1.EAMLOCATIONSTATEMODELID = t21.EAMLOCATIONSTATEMODELID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
assetmanagement-core/src/main/resources/permission/systemResource.json
浏览文件 @ 00397d6f
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
{ {
"appid":"AssetManagement", "appid":"AssetManagement",
"appname":"资产管理", "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":"menuitem2" , "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":"menuitem2" , "name":"资产管理" },{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem4" , "name":"工单管理" },{ "id":"menuitem5" , "name":"维护计划" }]}] }]
} }
] ]
} }
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMLocationStateModelLineDTO.java
浏览文件 @ 00397d6f
...@@ -89,6 +89,22 @@ public class EAMLocationStateModelLineDTO extends DTOBase implements Serializabl ...@@ -89,6 +89,22 @@ public class EAMLocationStateModelLineDTO extends DTOBase implements Serializabl
@JsonProperty("eamlocationstateid") @JsonProperty("eamlocationstateid")
private String eamlocationstateid; private String eamlocationstateid;
/**
* 属性 [EAMLOCATIONSTATENAME]
*
*/
@JSONField(name = "eamlocationstatename")
@JsonProperty("eamlocationstatename")
private String eamlocationstatename;
/**
* 属性 [EAMLOCATIONSTATEMODELNAME]
*
*/
@JSONField(name = "eamlocationstatemodelname")
@JsonProperty("eamlocationstatemodelname")
private String eamlocationstatemodelname;
/** /**
* 设置 [EAMLOCATIONSTATEMODELLINENAME] * 设置 [EAMLOCATIONSTATEMODELLINENAME]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或