Skip to content

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

lab_gzf 部署微服务应用

上级 30236883
显示空白字符变更
内嵌 并排
正在显示 包含 389 行增加 和 51 行删除
app_AssetManagement/public/assets/json/view-config.json
浏览文件 @ da6f898b
......@@ -119,6 +119,16 @@
"viewtag": "9e9b3600ba892d31757bacef1dcc9458",
"memo": ""
},
"eamlocationstatelistexpview": {
"title": "功能位置状态列表导航视图",
"caption": "功能位置状态",
"viewtype": "DELISTEXPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateListExpView",
"viewfilename": "eamlocation-state-list-exp-view",
"viewtag": "a3d6a9a21765dd59afa2d3d20a99096c",
"memo": ""
},
"eamlocationinfo_mainview": {
"title": "功能位置编辑视图",
"caption": "功能位置",
......
app_AssetManagement/src/interface/entity/eamasset-state-model-line.ts
浏览文件 @ da6f898b
......@@ -69,4 +69,20 @@ export interface EAMAssetStateModelLine {
* @memberof EAMAssetStateModelLine
*/
eamassetstateid?: any;
/**
* 资产状态
*
* @returns {*}
* @memberof EAMAssetStateModelLine
*/
eamassetstatename?: any;
/**
* 资产状态模型
*
* @returns {*}
* @memberof EAMAssetStateModelLine
*/
eamassetstatemodelname?: any;
}
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamasset-state-model-line/eamasset-state-model-line_en_US.ts
浏览文件 @ da6f898b
......@@ -9,5 +9,7 @@ export default {
updateman: "更新人",
eamassetstatemodelid: "资产状态模型标识",
eamassetstateid: "资产状态标识",
eamassetstatename: "资产状态",
eamassetstatemodelname: "资产状态模型",
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamasset-state-model-line/eamasset-state-model-line_zh_CN.ts
浏览文件 @ da6f898b
......@@ -8,5 +8,7 @@ export default {
updateman: "更新人",
eamassetstatemodelid: "资产状态模型标识",
eamassetstateid: "资产状态标识",
eamassetstatename: "资产状态",
eamassetstatemodelname: "资产状态模型",
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamasset-state/eamasset-state_en_US.ts
浏览文件 @ da6f898b
......@@ -41,6 +41,8 @@ export default {
},
main_grid: {
columns: {
eamassetstateid: "资产状态标识",
eamassetstatename: "资产状态名称",
},
uiactions: {
},
......
app_AssetManagement/src/locale/lanres/entities/eamasset-state/eamasset-state_zh_CN.ts
浏览文件 @ da6f898b
......@@ -40,6 +40,8 @@ export default {
},
main_grid: {
columns: {
eamassetstateid: "资产状态标识",
eamassetstatename: "资产状态名称",
},
uiactions: {
},
......
app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_en_US.ts
浏览文件 @ da6f898b
......@@ -15,6 +15,10 @@ export default {
caption: "功能位置状态",
title: "功能位置状态信息",
},
listexpview: {
caption: "功能位置状态",
title: "功能位置状态列表导航视图",
},
pickupview: {
caption: "功能位置状态",
title: "功能位置状态数据选择视图",
......
app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN.ts
浏览文件 @ da6f898b
......@@ -14,6 +14,10 @@ export default {
caption: "功能位置状态",
title: "功能位置状态信息",
},
listexpview: {
caption: "功能位置状态",
title: "功能位置状态列表导航视图",
},
pickupview: {
caption: "功能位置状态",
title: "功能位置状态数据选择视图",
......
app_AssetManagement/src/mock/viewconfig/viewconfig.ts
浏览文件 @ da6f898b
......@@ -103,6 +103,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "EAMLocationStateModelGridView",
"viewtag": "9e9b3600ba892d31757bacef1dcc9458"
},
"eamlocationstatelistexpview": {
"title": "功能位置状态列表导航视图",
"caption": "功能位置状态",
"viewtype": "DELISTEXPVIEW",
"viewmodule": "Location",
"viewname": "EAMLocationStateListExpView",
"viewtag": "a3d6a9a21765dd59afa2d3d20a99096c"
},
"eamlocationinfo_mainview": {
"title": "功能位置编辑视图",
"caption": "功能位置",
......
app_AssetManagement/src/studio-core/view/DataViewBase.tsx
浏览文件 @ da6f898b
......@@ -9,4 +9,17 @@ import { MDViewBase } from './MDViewBase';
*/
export class DataViewBase extends MDViewBase {
/**
* 快速搜索
*
* @protected
* @memberof DataViewBase
*/
protected onSearch(): void {
const dataview: any = this.$refs.dataview;
if (dataview) {
dataview.refresh({});
}
}
}
\ No newline at end of file
app_AssetManagement/src/studio-core/widgets/ControlBase.tsx
浏览文件 @ da6f898b
......@@ -16,7 +16,7 @@ export class ControlBase extends Vue {
* @memberof ControlBase
*/
@Prop()
public name?: string;
public name!: string;
/**
* 视图通讯对象
......
app_AssetManagement/src/studio-core/widgets/FormControlBase.tsx
浏览文件 @ da6f898b
......@@ -223,7 +223,7 @@ export class FormControlBase extends MainControlBase {
* @memberof FormControlBase
*/
public formValidateStatus(): boolean {
const form: any = this.$refs.form;
const form: any = this.$refs[this.name];
let validatestate: boolean = true;
form.validate((valid: boolean) => {
validatestate = valid ? true : false;
......
app_AssetManagement/src/styles/default.less
浏览文件 @ da6f898b
......@@ -1160,4 +1160,28 @@ div::-webkit-scrollbar-thumb {
padding-top: 50px;
}
}
// 向导面板样式
.app-wizard {
height: 100%;
width: 100%;
.wizard-steps {
height: 58px;
}
.app-wizard-content {
height: calc(100% - 90px);
overflow: auto;
}
.app-wizard-footer {
height: 32px;
text-align: right;
.ivu-btn {
margin-right: 5px;
}
}
}
@import './user.less';
\ No newline at end of file
app_AssetManagement/src/uiservice/eamlocation-state/eamlocation-state-ui-service-base.ts
浏览文件 @ da6f898b
......@@ -90,6 +90,7 @@ export default class EAMLocationStateUIServiceBase extends UIService {
*/
public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationstates'});
this.allViewMap.set(':',{viewname:'listexpview',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'});
......
app_AssetManagement/src/widgets/eamasset-state/main-grid/main-grid-base.tsx
浏览文件 @ da6f898b
......@@ -83,6 +83,22 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'eamassetstateid',
label: '资产状态标识',
langtag: 'entities.eamassetstate.main_grid.columns.eamassetstateid',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'eamassetstatename',
label: '资产状态名称',
langtag: 'entities.eamassetstate.main_grid.columns.eamassetstatename',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -117,6 +133,8 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'eamassetstateid':false,
'eamassetstatename':false,
};
/**
......@@ -131,4 +149,18 @@ export class MainGridBase extends GridControlBase {
}
/**
* 导出数据格式化
*
* @param {*} filterVal
* @param {*} jsonData
* @param {any[]} [codelistColumns=[]]
* @returns {Promise<any>}
* @memberof MainGridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
]);
}
}
\ No newline at end of file
app_AssetManagement/src/widgets/eamasset-state/main-grid/main-grid-model.ts
浏览文件 @ da6f898b
......@@ -26,6 +26,16 @@ export default class MainModel {
]
}else{
return [
{
name: 'eamassetstatename',
prop: 'eamassetstatename',
dataType: 'TEXT',
},
{
name: 'eamassetstateid',
prop: 'eamassetstateid',
dataType: 'GUID',
},
{
name: 'srfmajortext',
prop: 'eamassetstatename',
......
app_AssetManagement/src/widgets/eamasset-state/main-grid/main-grid.html
浏览文件 @ da6f898b
......@@ -23,6 +23,30 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('eamassetstateid')">
<el-table-column show-overflow-tooltip :prop="'eamassetstateid'" :label="$t('entities.eamassetstate.main_grid.columns.eamassetstateid')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.eamassetstate.main_grid.columns.eamassetstateid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.eamassetstateid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('eamassetstatename')">
<el-table-column show-overflow-tooltip :prop="'eamassetstatename'" :label="$t('entities.eamassetstate.main_grid.columns.eamassetstatename')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.eamassetstate.main_grid.columns.eamassetstatename')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.eamassetstatename}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/java/cn/ibizlab/assetmanagement/assetmanagement/AssetManagementApplication.java
浏览文件 @ da6f898b
......@@ -17,7 +17,6 @@ import java.util.List;
@Slf4j
@Import({
com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
FeignClientsConfiguration.class
})
@EnableDiscoveryClient
......
assetmanagement-boot/src/main/java/cn/ibizlab/assetmanagement/DevBootApplication.java
浏览文件 @ da6f898b
......@@ -28,7 +28,6 @@ import java.util.List;
// }
)
@Import({
com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
org.springframework.cloud.openfeign.FeignClientsConfiguration.class
})
@EnableAsync
......
assetmanagement-boot/src/main/java/cn/ibizlab/assetmanagement/config/DevBootAutoConfiguration.java 0 → 100644
浏览文件 @ da6f898b
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
浏览文件 @ da6f898b
......@@ -98,6 +98,29 @@
<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>
<properties>
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMAssetStateModelLine.java
浏览文件 @ da6f898b
......@@ -103,6 +103,20 @@ public class EAMAssetStateModelLine extends EntityMP implements Serializable {
@JSONField(name = "eamassetstateid")
@JsonProperty("eamassetstateid")
private String eamassetstateid;
/**
* 资产状态
*/
@TableField(exist = false)
@JSONField(name = "eamassetstatename")
@JsonProperty("eamassetstatename")
private String eamassetstatename;
/**
* 资产状态模型
*/
@TableField(exist = false)
@JSONField(name = "eamassetstatemodelname")
@JsonProperty("eamassetstatemodelname")
private String eamassetstatemodelname;
/**
*
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/filter/EAMAssetStateModelLineSearchContext.java
浏览文件 @ da6f898b
......@@ -48,6 +48,34 @@ public class EAMAssetStateModelLineSearchContext extends QueryWrapperContext<EAM
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_eamassetstatemodelname_eq;//[资产状态模型]
public void setN_eamassetstatemodelname_eq(String n_eamassetstatemodelname_eq) {
this.n_eamassetstatemodelname_eq = n_eamassetstatemodelname_eq;
if(!ObjectUtils.isEmpty(this.n_eamassetstatemodelname_eq)){
this.getSearchCond().eq("eamassetstatemodelname", n_eamassetstatemodelname_eq);
}
}
private String n_eamassetstatemodelname_like;//[资产状态模型]
public void setN_eamassetstatemodelname_like(String n_eamassetstatemodelname_like) {
this.n_eamassetstatemodelname_like = n_eamassetstatemodelname_like;
if(!ObjectUtils.isEmpty(this.n_eamassetstatemodelname_like)){
this.getSearchCond().like("eamassetstatemodelname", n_eamassetstatemodelname_like);
}
}
/**
* 启用快速搜索
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetStateModelLineServiceImpl.java
浏览文件 @ da6f898b
......@@ -58,6 +58,7 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
@Override
@Transactional
public boolean create(EAMAssetStateModelLine et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et)))
return false;
CachedBeanCopier.copy(get(et.getEamassetstatemodellineid()),et);
......@@ -66,12 +67,14 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
@Override
public void createBatch(List<EAMAssetStateModelLine> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(EAMAssetStateModelLine et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamassetstatemodellineid",et.getEamassetstatemodellineid())))
return false;
CachedBeanCopier.copy(get(et.getEamassetstatemodellineid()),et);
......@@ -80,6 +83,7 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
@Override
public void updateBatch(List<EAMAssetStateModelLine> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
}
......@@ -110,6 +114,7 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
@Override
public EAMAssetStateModelLine getDraft(EAMAssetStateModelLine et) {
fillParentData(et);
return et;
}
......@@ -137,12 +142,14 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
@Override
public boolean saveBatch(Collection<EAMAssetStateModelLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public void saveBatch(List<EAMAssetStateModelLine> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
......@@ -179,6 +186,32 @@ public class EAMAssetStateModelLineServiceImpl extends ServiceImpl<EAMAssetState
/**
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(EAMAssetStateModelLine et){
//实体关系[DER1N_EAMASSETSTATEMODELLINE_EAMASSETSTATEMODEL_EAMASSETSTATEMODELID]
if(!ObjectUtils.isEmpty(et.getEamassetstatemodelid())){
cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetStateModel eamassetstatemodel=et.getEamassetstatemodel();
if(ObjectUtils.isEmpty(eamassetstatemodel)){
cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetStateModel majorEntity=eamassetstatemodelService.get(et.getEamassetstatemodelid());
et.setEamassetstatemodel(majorEntity);
eamassetstatemodel=majorEntity;
}
et.setEamassetstatemodelname(eamassetstatemodel.getEamassetstatemodelname());
}
//实体关系[DER1N_EAMASSETSTATEMODELLINE_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());
}
}
......
assetmanagement-core/src/main/resources/liquibase/changelog/20200728181130_init_ibztx.xml 0 → 100644
浏览文件 @ da6f898b
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
<changeSet author="Think (generated)" id="1595929877142-2">
<preConditions onFail="MARK_RAN" >
<not>
<tableExists tableName="undo_log" />
</not>
</preConditions>
<createTable remarks="AT transaction mode undo table" tableName="undo_log">
<column name="branch_id" remarks="branch transaction id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="xid" remarks="global transaction id" type="VARCHAR(100)">
<constraints nullable="false"/>
</column>
<column name="context" remarks="undo_log context,such as serialization" type="VARCHAR(128)">
<constraints nullable="false"/>
</column>
<column name="rollback_info" remarks="rollback info" type="LONGBLOB">
<constraints nullable="false"/>
</column>
<column name="log_status" remarks="0:normal status,1:defense status" type="INT">
<constraints nullable="false"/>
</column>
<column name="log_created" remarks="create datetime" type="datetime">
<constraints nullable="false"/>
</column>
<column name="log_modified" remarks="modify datetime" type="datetime">
<constraints nullable="false"/>
</column>
</createTable>
<addUniqueConstraint columnNames="xid, branch_id" constraintName="ux_undo_log" tableName="undo_log"/>
</changeSet>
</databaseChangeLog>
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ da6f898b
......@@ -4,7 +4,7 @@
<!--输出实体[EAMAPPLY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapply-8-1">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapply-9-1">
<createTable tableName="EAMAPPLY">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -30,7 +30,7 @@
<!--输出实体[EAMAPPLYSTATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapplystate-8-2">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapplystate-9-2">
<createTable tableName="EAMAPPLYSTATE">
<column name="EAMAPPLYSTATEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMAPPLYSTATE_EAMAPPLYSTATE"/>
......@@ -70,7 +70,7 @@
<!--输出实体[EAMAPPLYSTATEMODELLINE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapplystatemodelline-7-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapplystatemodelline-8-4">
<createTable tableName="EAMAPPLYSTATEMODELLINE">
<column name="EAMAPPLYSTATEMODELLINENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -142,7 +142,7 @@
<!--输出实体[EAMASSETSTATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstate-16-7">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstate-20-7">
<createTable tableName="EAMASSETSTATE">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -164,7 +164,7 @@
<!--输出实体[EAMASSETSTATEMODEL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodel-8-8">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodel-12-8">
<createTable tableName="EAMASSETSTATEMODEL">
<column name="EAMASSETSTATEMODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMASSETSTATEMODEL_EAMASSET"/>
......@@ -184,7 +184,7 @@
<!--输出实体[EAMASSETSTATEMODELLINE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodelline-8-9">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamassetstatemodelline-14-9">
<createTable tableName="EAMASSETSTATEMODELLINE">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -230,7 +230,7 @@
<!--输出实体[EAMLOCATION]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-58-11">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-61-11">
<createTable tableName="EAMLOCATION">
<column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
......@@ -256,7 +256,7 @@
<!--输出实体[EAMLOCATIONSTATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-31-12">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-37-12">
<createTable tableName="EAMLOCATIONSTATE">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -280,7 +280,7 @@
<!--输出实体[EAMLOCATIONSTATEMODEL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-21-13">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-22-13">
<createTable tableName="EAMLOCATIONSTATEMODEL">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -553,19 +553,19 @@
</changeSet>
<!--输出实体[EAMAPPLY]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-8-25">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-9-25">
<addForeignKeyConstraint baseColumnNames="EAMAPPLYTYPEID" baseTableName="EAMAPPLY" constraintName="DER1N_EAMAPPLY_EAMAPPLYTYPE_EA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMAPPLYTYPEID" referencedTableName="EAMAPPLYTYPE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-8-26">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-9-26">
<addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="EAMAPPLY" constraintName="DER1N_EAMAPPLY_EAMASSET_ASSETI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-8-27">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-9-27">
<addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="EAMAPPLY" constraintName="DER1N_EAMAPPLY_EAMLOCATION_EAM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
</changeSet>
<!--输出实体[EAMAPPLYSTATE]外键关系 -->
<!--输出实体[EAMAPPLYSTATEMODEL]外键关系 -->
<!--输出实体[EAMAPPLYSTATEMODELLINE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapplystatemodelline-7-28">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapplystatemodelline-8-28">
<addForeignKeyConstraint baseColumnNames="EAMAPPLYSTATEMODELID" baseTableName="EAMAPPLYSTATEMODELLINE" constraintName="DER1N_EAMAPPLYSTATEMODELLINE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMAPPLYSTATEMODELID" referencedTableName="EAMAPPLYSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMAPPLYTYPE]外键关系 -->
......@@ -585,7 +585,7 @@
<!--输出实体[EAMASSETSTATE]外键关系 -->
<!--输出实体[EAMASSETSTATEMODEL]外键关系 -->
<!--输出实体[EAMASSETSTATEMODELLINE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamassetstatemodelline-8-34">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamassetstatemodelline-14-34">
<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]外键关系 -->
......@@ -593,13 +593,13 @@
<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-58-37">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-61-37">
<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-58-38">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-61-38">
<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-58-39">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-61-39">
<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]外键关系 -->
......
assetmanagement-core/src/main/resources/mapper/asset/eamassetstatemodelline/EAMAssetStateModelLineMapper.xml
浏览文件 @ da6f898b
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="EAMAssetStateModelLineResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1 ) t1 where eamassetstatemodellineid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t21.`EAMASSETSTATEMODELNAME`, t11.`EAMASSETSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1 LEFT JOIN EAMASSETSTATE t11 ON t1.EAMASSETSTATEID = t11.EAMASSETSTATEID LEFT JOIN EAMASSETSTATEMODEL t21 ON t1.EAMASSETSTATEMODELID = t21.EAMASSETSTATEMODELID ) t1 where eamassetstatemodellineid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -47,12 +47,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t21.`EAMASSETSTATEMODELNAME`, t11.`EAMASSETSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1 LEFT JOIN EAMASSETSTATE t11 ON t1.EAMASSETSTATEID = t11.EAMASSETSTATEID LEFT JOIN EAMASSETSTATEMODEL t21 ON t1.EAMASSETSTATEMODELID = t21.EAMASSETSTATEMODELID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t1.`EAMASSETSTATEMODELID`, t1.`EAMASSETSTATEMODELLINEID`, t1.`EAMASSETSTATEMODELLINENAME`, t21.`EAMASSETSTATEMODELNAME`, t11.`EAMASSETSTATENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETSTATEMODELLINE` t1 LEFT JOIN EAMASSETSTATE t11 ON t1.EAMASSETSTATEID = t11.EAMASSETSTATEID LEFT JOIN EAMASSETSTATEMODEL t21 ON t1.EAMASSETSTATEMODELID = t21.EAMASSETSTATEMODELID
]]>
</sql>
</mapper>
......
assetmanagement-dependencies/pom.xml
浏览文件 @ da6f898b
......@@ -19,7 +19,7 @@
</parent>
<properties>
<!-- Spring Cloud Alibaba(2.1.x.RELEASE) & Spring Cloud(Spring Cloud Greenwich) & Spring Boot(2.1.x.RELEASE) compatibility -->
<!-- Spring Cloud Alibaba(2.2.x.RELEASE) & Spring Cloud(Spring Cloud Greenwich) & Spring Boot(2.2.x.RELEASE) compatibility -->
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
<spring-cloud-openfeign.version>2.2.1.RELEASE</spring-cloud-openfeign.version>
......@@ -268,6 +268,31 @@
<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>
......@@ -336,31 +361,6 @@
</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>
</project>
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/config/AssetApiAutoConfiguration.java
浏览文件 @ da6f898b
......@@ -13,7 +13,11 @@ import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
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/EAMAssetStateModelLineDTO.java
浏览文件 @ da6f898b
......@@ -89,6 +89,22 @@ public class EAMAssetStateModelLineDTO extends DTOBase implements Serializable {
@JsonProperty("eamassetstateid")
private String eamassetstateid;
/**
* 属性 [EAMASSETSTATENAME]
*
*/
@JSONField(name = "eamassetstatename")
@JsonProperty("eamassetstatename")
private String eamassetstatename;
/**
* 属性 [EAMASSETSTATEMODELNAME]
*
*/
@JSONField(name = "eamassetstatemodelname")
@JsonProperty("eamassetstatemodelname")
private String eamassetstatemodelname;
/**
* 设置 [EAMASSETSTATEMODELLINENAME]
......
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/iBizAssetManagementAssetApiApplication.java
浏览文件 @ da6f898b
......@@ -33,7 +33,6 @@ import java.util.List;
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
})
@Import({
com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
org.springframework.cloud.openfeign.FeignClientsConfiguration.class
})
@EnableFeignClients(basePackages = {"cn.ibizlab.assetmanagement" })
......
assetmanagement-provider/pom.xml
浏览文件 @ da6f898b
......@@ -24,6 +24,30 @@
<artifactId>javax.servlet-api</artifactId>
<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>
</project>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或