Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzlite
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzlite
提交
9ba9fb95
提交
9ba9fb95
编写于
3月 17, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong 发布系统代码 [ibz-lite,应用]
上级
65dbda68
变更
11
显示空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
7 行增加
和
60 行删除
+7
-60
dyna-inst-form-model.ts
...meta-dynamic-model/dyna-inst-form/dyna-inst-form-model.ts
+1
-1
main-form-model.ts
...c/widgets/meta-dynamic-model/main-form/main-form-model.ts
+1
-1
main-grid-model.ts
...c/widgets/meta-dynamic-model/main-grid/main-grid-model.ts
+1
-1
MetaDynamicModel.java
...in/java/cn/ibizlab/core/lite/domain/MetaDynamicModel.java
+0
-8
MetaDynamicModelMapper.java
...a/cn/ibizlab/core/lite/mapper/MetaDynamicModelMapper.java
+0
-2
IMetaDynamicModelService.java
...n/ibizlab/core/lite/service/IMetaDynamicModelService.java
+0
-2
DstSystemServiceImpl.java
.../ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
+0
-3
MetaDynamicModelServiceImpl.java
...b/core/lite/service/impl/MetaDynamicModelServiceImpl.java
+0
-12
h2_table.xml
ibzlite-core/src/main/resources/liquibase/h2_table.xml
+3
-3
MetaDynamicModelMapper.xml
...s/mapper/lite/metadynamicmodel/MetaDynamicModelMapper.xml
+0
-10
ibzlite.json
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
+1
-17
未找到文件。
app_web/src/widgets/meta-dynamic-model/dyna-inst-form/dyna-inst-form-model.ts
浏览文件 @
9ba9fb95
...
@@ -63,7 +63,7 @@ export default class DynaInstModel {
...
@@ -63,7 +63,7 @@ export default class DynaInstModel {
{
{
name
:
'systemid'
,
name
:
'systemid'
,
prop
:
'system_id'
,
prop
:
'system_id'
,
dataType
:
'
PICKUP
'
,
dataType
:
'
TEXT
'
,
},
},
{
{
name
:
'configid'
,
name
:
'configid'
,
...
...
app_web/src/widgets/meta-dynamic-model/main-form/main-form-model.ts
浏览文件 @
9ba9fb95
...
@@ -63,7 +63,7 @@ export default class MainModel {
...
@@ -63,7 +63,7 @@ export default class MainModel {
{
{
name
:
'systemid'
,
name
:
'systemid'
,
prop
:
'system_id'
,
prop
:
'system_id'
,
dataType
:
'
PICKUP
'
,
dataType
:
'
TEXT
'
,
},
},
{
{
name
:
'pdynainstid'
,
name
:
'pdynainstid'
,
...
...
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts
浏览文件 @
9ba9fb95
...
@@ -34,7 +34,7 @@ export default class MainModel {
...
@@ -34,7 +34,7 @@ export default class MainModel {
{
{
name
:
'systemid'
,
name
:
'systemid'
,
prop
:
'system_id'
,
prop
:
'system_id'
,
dataType
:
'
PICKUP
'
,
dataType
:
'
TEXT
'
,
},
},
{
{
name
:
'status'
,
name
:
'status'
,
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaDynamicModel.java
浏览文件 @
9ba9fb95
...
@@ -105,14 +105,6 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
...
@@ -105,14 +105,6 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
@ApiModelProperty
(
"状态"
)
@ApiModelProperty
(
"状态"
)
private
String
status
;
private
String
status
;
/**
*
*/
@JsonIgnore
@JSONField
(
serialize
=
false
)
@TableField
(
exist
=
false
)
private
cn
.
ibizlab
.
core
.
lite
.
domain
.
DstSystem
system
;
/**
/**
* 主实例标识
* 主实例标识
*/
*/
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDynamicModelMapper.java
浏览文件 @
9ba9fb95
...
@@ -63,8 +63,6 @@ public interface MetaDynamicModelMapper extends BaseMapper<MetaDynamicModel> {
...
@@ -63,8 +63,6 @@ public interface MetaDynamicModelMapper extends BaseMapper<MetaDynamicModel> {
@Delete
(
"${sql}"
)
@Delete
(
"${sql}"
)
boolean
deleteBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
boolean
deleteBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
List
<
MetaDynamicModel
>
selectBySystemId
(
@Param
(
"pssystemid"
)
Serializable
pssystemid
);
List
<
MetaDynamicModel
>
selectByPdynainstid
(
@Param
(
"configid"
)
Serializable
configid
);
List
<
MetaDynamicModel
>
selectByPdynainstid
(
@Param
(
"configid"
)
Serializable
configid
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaDynamicModelService.java
浏览文件 @
9ba9fb95
...
@@ -42,8 +42,6 @@ public interface IMetaDynamicModelService extends IService<MetaDynamicModel> {
...
@@ -42,8 +42,6 @@ public interface IMetaDynamicModelService extends IService<MetaDynamicModel> {
void
saveBatch
(
List
<
MetaDynamicModel
>
list
);
void
saveBatch
(
List
<
MetaDynamicModel
>
list
);
Page
<
MetaDynamicModel
>
searchDefault
(
MetaDynamicModelSearchContext
context
);
Page
<
MetaDynamicModel
>
searchDefault
(
MetaDynamicModelSearchContext
context
);
Page
<
MetaDynamicModel
>
searchDynaInst
(
MetaDynamicModelSearchContext
context
);
Page
<
MetaDynamicModel
>
searchDynaInst
(
MetaDynamicModelSearchContext
context
);
List
<
MetaDynamicModel
>
selectBySystemId
(
String
pssystemid
);
void
removeBySystemId
(
String
pssystemid
);
List
<
MetaDynamicModel
>
selectByPdynainstid
(
String
configid
);
List
<
MetaDynamicModel
>
selectByPdynainstid
(
String
configid
);
void
removeByPdynainstid
(
String
configid
);
void
removeByPdynainstid
(
String
configid
);
/**
/**
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
浏览文件 @
9ba9fb95
...
@@ -62,9 +62,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
...
@@ -62,9 +62,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IDstViewService
dstviewService
;
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IDstViewService
dstviewService
;
@Autowired
@Autowired
@Lazy
@Lazy
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IMetaDynamicModelService
metadynamicmodelService
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IMetaEntityService
metaentityService
;
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IMetaEntityService
metaentityService
;
@Autowired
@Autowired
@Lazy
@Lazy
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDynamicModelServiceImpl.java
浏览文件 @
9ba9fb95
...
@@ -50,9 +50,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
...
@@ -50,9 +50,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IMetaDynamicModelService
metadynamicmodelService
=
this
;
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IMetaDynamicModelService
metadynamicmodelService
=
this
;
@Autowired
@Lazy
protected
cn
.
ibizlab
.
core
.
lite
.
service
.
IDstSystemService
dstsystemService
;
protected
int
batchSize
=
500
;
protected
int
batchSize
=
500
;
...
@@ -216,15 +213,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
...
@@ -216,15 +213,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
}
}
@Override
public
List
<
MetaDynamicModel
>
selectBySystemId
(
String
pssystemid
)
{
return
baseMapper
.
selectBySystemId
(
pssystemid
);
}
@Override
public
void
removeBySystemId
(
String
pssystemid
)
{
this
.
remove
(
new
QueryWrapper
<
MetaDynamicModel
>().
eq
(
"systemid"
,
pssystemid
));
}
@Override
@Override
public
List
<
MetaDynamicModel
>
selectByPdynainstid
(
String
configid
)
{
public
List
<
MetaDynamicModel
>
selectByPdynainstid
(
String
configid
)
{
return
baseMapper
.
selectByPdynainstid
(
configid
);
return
baseMapper
.
selectByPdynainstid
(
configid
);
...
...
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
9ba9fb95
...
@@ -178,7 +178,7 @@
...
@@ -178,7 +178,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-dst_system-4
6
-9"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-dst_system-4
7
-9"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 -->
<!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-meta_dynamicmodel-15
0
-12"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-meta_dynamicmodel-15
3
-12"
>
<createTable
tableName=
"IBZDYNAMICMODEL"
>
<createTable
tableName=
"IBZDYNAMICMODEL"
>
<column
name=
"DYNAINSTID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"DYNAINSTID"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</column>
...
@@ -448,7 +448,7 @@
...
@@ -448,7 +448,7 @@
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-meta_dynamicmodel-15
0
-18"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-meta_dynamicmodel-15
3
-18"
>
<addForeignKeyConstraint
baseColumnNames=
"PDYNAINSTID"
baseTableName=
"IBZDYNAMICMODEL"
constraintName=
"DER1N_META_DYNAMICMODEL_META_D"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"CONFIGID"
referencedTableName=
"IBZDYNAMICMODEL"
validate=
"true"
/>
<addForeignKeyConstraint
baseColumnNames=
"PDYNAINSTID"
baseTableName=
"IBZDYNAMICMODEL"
constraintName=
"DER1N_META_DYNAMICMODEL_META_D"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"CONFIGID"
referencedTableName=
"IBZDYNAMICMODEL"
validate=
"true"
/>
</changeSet>
</changeSet>
<!--输出实体[META_ENTITY]外键关系 -->
<!--输出实体[META_ENTITY]外键关系 -->
...
...
ibzlite-core/src/main/resources/mapper/lite/metadynamicmodel/MetaDynamicModelMapper.xml
浏览文件 @
9ba9fb95
...
@@ -17,23 +17,13 @@
...
@@ -17,23 +17,13 @@
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap
id=
"MetaDynamicModelResultMap"
type=
"cn.ibizlab.core.lite.domain.MetaDynamicModel"
autoMapping=
"true"
>
<resultMap
id=
"MetaDynamicModelResultMap"
type=
"cn.ibizlab.core.lite.domain.MetaDynamicModel"
autoMapping=
"true"
>
<id
property=
"configid"
column=
"configid"
/>
<!--主键字段映射-->
<id
property=
"configid"
column=
"configid"
/>
<!--主键字段映射-->
<result
property=
"systemId"
column=
"systemid"
/>
<result
property=
"pdynainstid"
column=
"pdynainstid"
/>
<result
property=
"pdynainstid"
column=
"pdynainstid"
/>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"system"
javaType=
"cn.ibizlab.core.lite.domain.DstSystem"
column=
"systemid"
select=
"cn.ibizlab.core.lite.mapper.DstSystemMapper.selectById"
fetchType=
"lazy"
></association>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"pdynamicinstid"
javaType=
"cn.ibizlab.core.lite.domain.MetaDynamicModel"
column=
"pdynainstid"
select=
"cn.ibizlab.core.lite.mapper.MetaDynamicModelMapper.selectById"
fetchType=
"lazy"
></association>
<association
property=
"pdynamicinstid"
javaType=
"cn.ibizlab.core.lite.domain.MetaDynamicModel"
column=
"pdynainstid"
select=
"cn.ibizlab.core.lite.mapper.MetaDynamicModelMapper.selectById"
fetchType=
"lazy"
></association>
</resultMap>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID] -->
<select
id=
"selectBySystemId"
resultMap=
"MetaDynamicModelResultMap"
>
select t1.* from (
<include
refid=
"Default"
/>
) t1
where systemid=#{pssystemid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID] -->
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID] -->
<select
id=
"selectByPdynainstid"
resultMap=
"MetaDynamicModelResultMap"
>
<select
id=
"selectByPdynainstid"
resultMap=
"MetaDynamicModelResultMap"
>
select t1.* from (
select t1.* from (
...
...
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @
9ba9fb95
...
@@ -1559,12 +1559,6 @@
...
@@ -1559,12 +1559,6 @@
"entity_name"
:
"DST_VIEW"
,
"entity_name"
:
"DST_VIEW"
,
"ref_entity_name"
:
"DST_SYSTEM"
"ref_entity_name"
:
"DST_SYSTEM"
},
},
{
"name"
:
"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID"
,
"relation_type"
:
"DER1N"
,
"code_name"
:
"System"
,
"entity_name"
:
"META_DYNAMICMODEL"
,
"ref_entity_name"
:
"DST_SYSTEM"
},
{
"name"
:
"DER1N_META_ENTITY_DST_SYSTEM_SYSTEMID"
,
{
"name"
:
"DER1N_META_ENTITY_DST_SYSTEM_SYSTEMID"
,
"relation_type"
:
"DER1N"
,
"relation_type"
:
"DER1N"
,
"code_name"
:
"System"
,
"code_name"
:
"System"
,
...
@@ -1928,11 +1922,7 @@
...
@@ -1928,11 +1922,7 @@
"codename"
:
"System_id"
,
"codename"
:
"System_id"
,
"field_logic_name"
:
"系统"
,
"field_logic_name"
:
"系统"
,
"entity_name"
:
"META_DYNAMICMODEL"
,
"entity_name"
:
"META_DYNAMICMODEL"
,
"ref_de"
:
"DST_SYSTEM"
,
"field_type"
:
"TEXT"
,
"ref_field_name"
:
"PSSYSTEMID"
,
"relation_name"
:
"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID"
,
"relation_codename"
:
"System"
,
"field_type"
:
"PICKUP"
,
"nullable"
:
1
,
"nullable"
:
1
,
"physical_field"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"VARCHAR"
,
"data_type"
:
"VARCHAR"
,
...
@@ -2026,12 +2016,6 @@
...
@@ -2026,12 +2016,6 @@
}
}
],
],
"parentEntitys"
:[
"parentEntitys"
:[
{
"name"
:
"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID"
,
"relation_type"
:
"DER1N"
,
"code_name"
:
"System"
,
"entity_name"
:
"META_DYNAMICMODEL"
,
"ref_entity_name"
:
"DST_SYSTEM"
},
{
"name"
:
"DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID"
,
{
"name"
:
"DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID"
,
"relation_type"
:
"DER1N"
,
"relation_type"
:
"DER1N"
,
"code_name"
:
"PDynamicInstId"
,
"code_name"
:
"PDynamicInstId"
,
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录