Skip to content

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

lab_gzf 部署微服务应用

上级 93e5cc08
隐藏空白字符变更
内嵌 并排
正在显示 包含 177 行增加 和 22 行删除
app_AssetManagement/src/interface/entity/eamapply.ts
浏览文件 @ 56fae8ab
......@@ -77,4 +77,28 @@ export interface EAMApply {
* @memberof EAMApply
*/
assetid?: any;
/**
* 描述
*
* @returns {*}
* @memberof EAMApply
*/
description?: any;
/**
* 希望开始时间
*
* @returns {*}
* @memberof EAMApply
*/
begintime?: any;
/**
* 希望结束时间
*
* @returns {*}
* @memberof EAMApply
*/
endtime?: any;
}
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamapply/eamapply_en_US.ts
浏览文件 @ 56fae8ab
......@@ -10,5 +10,8 @@ export default {
eamapplytypeid: "维护申请类型标识",
eamlocationid: "功能位置标识",
assetid: "资产标识",
description: "描述",
begintime: "希望开始时间",
endtime: "希望结束时间",
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamapply/eamapply_zh_CN.ts
浏览文件 @ 56fae8ab
......@@ -9,5 +9,8 @@ export default {
eamapplytypeid: "维护申请类型标识",
eamlocationid: "功能位置标识",
assetid: "资产标识",
description: "描述",
begintime: "希望开始时间",
endtime: "希望结束时间",
},
};
\ No newline at end of file
app_AssetManagement/src/uiservice/eamasset/eamasset-ui-service-base.ts
浏览文件 @ 56fae8ab
......@@ -180,6 +180,7 @@ export default class EAMAssetUIServiceBase extends UIService {
viewname: 'eamasset-edit-view',
height: 0,
width: 0,
title: actionContext.$t('entities.eamasset.views.editview.title'),
};
openPopupModal(view, data);
}
......@@ -367,6 +368,7 @@ export default class EAMAssetUIServiceBase extends UIService {
viewname: 'eamasset-quick-create-view',
height: 0,
width: 0,
title: actionContext.$t('entities.eamasset.views.quickcreateview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
......
app_AssetManagement/src/widgets/eamasset/main-info-dashboard/main-info-dashboard.html
浏览文件 @ 56fae8ab
......@@ -10,9 +10,9 @@
<row>
<i-col :md="{ span: 24, offset: 0 }">
<div class="portlet-without-title">
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
<span>
<view_dashboard_sysportlet1
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<span>
<view_dashboard_sysportlet1
:viewState="viewState"
:viewparams="viewparams"
:context="context"
......@@ -22,8 +22,8 @@
ref='dashboard_sysportlet1'
@closeview="closeView($event)">
</view_dashboard_sysportlet1>
</span>
</card>
</span>
</card>
</div>
</i-col>
</row>
......
app_AssetManagement/src/widgets/eamlocation/main-info-dashboard/main-info-dashboard.html
浏览文件 @ 56fae8ab
......@@ -10,9 +10,9 @@
<row>
<i-col :md="{ span: 24, offset: 0 }">
<div class="portlet-without-title">
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
<span>
<view_dashboard_sysportlet1
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<span>
<view_dashboard_sysportlet1
:viewState="viewState"
:viewparams="viewparams"
:context="context"
......@@ -22,8 +22,8 @@
ref='dashboard_sysportlet1'
@closeview="closeView($event)">
</view_dashboard_sysportlet1>
</span>
</card>
</span>
</card>
</div>
</i-col>
</row>
......
app_AssetManagement/src/widgets/eamspare-parts-group/board-001-dashboard/board-001-dashboard.html
浏览文件 @ 56fae8ab
......@@ -10,9 +10,9 @@
<row>
<i-col :md="{ span: 24, offset: 0 }">
<div class="portlet-without-title">
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
<span>
<view_dashboard_sysportlet1
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<span>
<view_dashboard_sysportlet1
:viewState="viewState"
:viewparams="viewparams"
:context="context"
......@@ -22,8 +22,8 @@
ref='dashboard_sysportlet1'
@closeview="closeView($event)">
</view_dashboard_sysportlet1>
</span>
</card>
</span>
</card>
</div>
</i-col>
</row>
......
assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/apply/domain/EAMApply.java
浏览文件 @ 56fae8ab
......@@ -110,6 +110,29 @@ public class EAMApply extends EntityMP implements Serializable {
@JSONField(name = "assetid")
@JsonProperty("assetid")
private String assetid;
/**
* 描述
*/
@TableField(value = "description")
@JSONField(name = "description")
@JsonProperty("description")
private String description;
/**
* 希望开始时间
*/
@TableField(value = "begintime")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "begintime" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("begintime")
private Timestamp begintime;
/**
* 希望结束时间
*/
@TableField(value = "endtime")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "endtime" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("endtime")
private Timestamp endtime;
/**
*
......@@ -169,6 +192,50 @@ public class EAMApply extends EntityMP implements Serializable {
this.modify("assetid",assetid);
}
/**
* 设置 [描述]
*/
public void setDescription(String description){
this.description = description ;
this.modify("description",description);
}
/**
* 设置 [希望开始时间]
*/
public void setBegintime(Timestamp begintime){
this.begintime = begintime ;
this.modify("begintime",begintime);
}
/**
* 格式化日期 [希望开始时间]
*/
public String formatBegintime(){
if (this.begintime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(begintime);
}
/**
* 设置 [希望结束时间]
*/
public void setEndtime(Timestamp endtime){
this.endtime = endtime ;
this.modify("endtime",endtime);
}
/**
* 格式化日期 [希望结束时间]
*/
public String formatEndtime(){
if (this.endtime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(endtime);
}
}
......
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 56fae8ab
......@@ -4,7 +4,7 @@
<!--输出实体[EAMAPPLY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapply-11-1">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamapply-14-1">
<createTable tableName="EAMAPPLY">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -25,6 +25,12 @@
</column>
<column name="ASSETID" remarks="" type="VARCHAR(100)">
</column>
<column name="DESCRIPTION" remarks="" type="VARCHAR(2000)">
</column>
<column name="BEGINTIME" remarks="" type="DATETIME">
</column>
<column name="ENDTIME" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
......@@ -677,13 +683,13 @@
</changeSet>
<!--输出实体[EAMAPPLY]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-11-30">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-14-30">
<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-11-31">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-14-31">
<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-11-32">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamapply-14-32">
<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]外键关系 -->
......
assetmanagement-core/src/main/resources/mapper/apply/eamapply/EAMApplyMapper.xml
浏览文件 @ 56fae8ab
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="EAMApplyResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1 ) t1 where eamapplyid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`ENDTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1 ) t1 where eamapplyid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -57,12 +57,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1
<![CDATA[ SELECT t1.`ASSETID`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`ENDTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ASSETID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1
<![CDATA[ SELECT t1.`ASSETID`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMAPPLYID`, t1.`EAMAPPLYNAME`, t1.`EAMAPPLYTYPEID`, t1.`EAMLOCATIONID`, t1.`ENDTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMAPPLY` t1
]]>
</sql>
</mapper>
......
assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMApplyDTO.java
浏览文件 @ 56fae8ab
......@@ -97,6 +97,32 @@ public class EAMApplyDTO extends DTOBase implements Serializable {
@JsonProperty("assetid")
private String assetid;
/**
* 属性 [DESCRIPTION]
*
*/
@JSONField(name = "description")
@JsonProperty("description")
private String description;
/**
* 属性 [BEGINTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "begintime" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("begintime")
private Timestamp begintime;
/**
* 属性 [ENDTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "endtime" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("endtime")
private Timestamp endtime;
/**
* 设置 [EAMAPPLYNAME]
......@@ -130,6 +156,30 @@ public class EAMApplyDTO extends DTOBase implements Serializable {
this.modify("assetid",assetid);
}
/**
* 设置 [DESCRIPTION]
*/
public void setDescription(String description){
this.description = description ;
this.modify("description",description);
}
/**
* 设置 [BEGINTIME]
*/
public void setBegintime(Timestamp begintime){
this.begintime = begintime ;
this.modify("begintime",begintime);
}
/**
* 设置 [ENDTIME]
*/
public void setEndtime(Timestamp endtime){
this.endtime = endtime ;
this.modify("endtime",endtime);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或