Skip to content

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

xignzi006 部署微服务应用

上级 10c527f7
显示空白字符变更
内嵌 并排
正在显示 包含 110 行增加 和 9 行删除
app_AssetManagement/src/locale/lanres/entities/eamwork-order/eamwork-order_en_US.ts
浏览文件 @ d83eadf8
......@@ -86,6 +86,10 @@ export default {
eamwotypename: "工单类型",
assetname: "资产",
eamlocationname: "功能位置",
deptname: "部门",
orgname: "组织",
deptid: "部门标识",
orgid: "组织标识",
eamlocationid: "功能位置标识",
workorderid: "工单标识",
eamwotypeid: "工单类型标识",
......
app_AssetManagement/src/locale/lanres/entities/eamwork-order/eamwork-order_zh_CN.ts
浏览文件 @ d83eadf8
......@@ -85,6 +85,10 @@ export default {
eamwotypename: "工单类型",
assetname: "资产",
eamlocationname: "功能位置",
deptname: "部门",
orgname: "组织",
deptid: "部门标识",
orgid: "组织标识",
eamlocationid: "功能位置标识",
workorderid: "工单标识",
eamwotypeid: "工单类型标识",
......
app_AssetManagement/src/widgets/eamwork-order/ef-001-form/ef-001-form-base.tsx
浏览文件 @ d83eadf8
......@@ -87,6 +87,10 @@ export class EF_001EditFormBase extends EditFormControlBase {
eamwotypename: null,
assetname: null,
eamlocationname: null,
deptname: null,
orgname: null,
deptid: null,
orgid: null,
eamlocationid: null,
workorderid: null,
eamwotypeid: null,
......@@ -165,6 +169,14 @@ export class EF_001EditFormBase extends EditFormControlBase {
eamlocationname: new FormItemModel({ caption: '功能位置', detailType: 'FORMITEM', name: 'eamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
deptname: new FormItemModel({ caption: '部门', detailType: 'FORMITEM', name: 'deptname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
orgname: new FormItemModel({ caption: '组织', detailType: 'FORMITEM', name: 'orgname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
deptid: new FormItemModel({ caption: '部门标识', detailType: 'FORMITEM', name: 'deptid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
orgid: new FormItemModel({ caption: '组织标识', detailType: 'FORMITEM', name: 'orgid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
workorderid: new FormItemModel({ caption: '工单标识', detailType: 'FORMITEM', name: 'workorderid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_AssetManagement/src/widgets/eamwork-order/ef-001-form/ef-001-form-model.ts
浏览文件 @ d83eadf8
......@@ -80,6 +80,26 @@ export default class EF_001Model {
prop: 'eamlocationname',
dataType: 'PICKUPTEXT',
},
{
name: 'deptname',
prop: 'deptname',
dataType: 'TEXT',
},
{
name: 'orgname',
prop: 'orgname',
dataType: 'TEXT',
},
{
name: 'deptid',
prop: 'deptid',
dataType: 'TEXT',
},
{
name: 'orgid',
prop: 'orgid',
dataType: 'TEXT',
},
{
name: 'eamlocationid',
prop: 'eamlocationid',
......
app_AssetManagement/src/widgets/eamwork-order/ef-001-form/ef-001-form.html
浏览文件 @ d83eadf8
......@@ -111,6 +111,46 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.deptname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptname' :itemRules="this.rules.deptname" class='' :caption="$t('entities.eamworkorder.ef_001_form.details.deptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-department-select :data="data" :disabled="detailsModel.deptname.disabled" :context="JSON.parse(JSON.stringify(context))" url="/ibzorganizations/${orgid}/suborg/ibzdepartments/picker" filter="srforgid" :fillMap="{'id':'deptid','label':'deptname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-department-select>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.orgname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.eamworkorder.ef_001_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-org-select :data="data" :disabled="detailsModel.orgname.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" url="/ibzorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.deptid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptid' :itemRules="this.rules.deptid" class='' :caption="$t('entities.eamworkorder.ef_001_form.details.deptid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.deptid"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.deptid.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.orgid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgid' :itemRules="this.rules.orgid" class='' :caption="$t('entities.eamworkorder.ef_001_form.details.orgid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.orgid"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.orgid.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
</row>
......
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile
浏览文件 @ d83eadf8
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
EXPOSE 8080
EXPOSE 10325
ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar
assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml
浏览文件 @ d83eadf8
......@@ -3,9 +3,25 @@ services:
assetmanagement-app-assetmanagement:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
ports:
- "8080:8080"
- "10325:10325"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10325
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ d83eadf8
......@@ -756,7 +756,7 @@
<!--输出实体[EAMWORKORDER]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-101-32">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-103-32">
<createTable tableName="WORKORDER">
<column name="WORKORDERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMWORKORDER_WORKORDERID"/>
......@@ -967,22 +967,22 @@
<addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOTYPE" constraintName="DER1N_EAMWOTYPE_EAMWOSTATEMODE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMWORKORDER]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-73">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-73">
<addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMASSET_AS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-74">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-74">
<addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMLOCATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-75">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-75">
<addForeignKeyConstraint baseColumnNames="EAMSERVICELEVELID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMSERVICEL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMSERVICELEVELID" referencedTableName="EAMSERVICELEVEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-76">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-76">
<addForeignKeyConstraint baseColumnNames="EAMWOORIGINID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOORIGIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOORIGINID" referencedTableName="EAMWOORIGIN" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-77">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-77">
<addForeignKeyConstraint baseColumnNames="PWORKORDERID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWORKORDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WORKORDERID" referencedTableName="WORKORDER" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-78">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-103-78">
<addForeignKeyConstraint baseColumnNames="EAMWOTYPEID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOTYPE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOTYPEID" referencedTableName="EAMWOTYPE" validate="true"/>
</changeSet>
<!--输出实体[EAMWOORIGIN]外键关系 -->
......
config.xml
浏览文件 @ d83eadf8
......@@ -37,6 +37,11 @@
git clone -b master $para2 ibizassetmanagement/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizassetmanagement/
mvn clean package -Passetmanagement
cd assetmanagement-app/assetmanagement-app-assetmanagement
mvn -Passetmanagement docker:build
mvn -Passetmanagement docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或