Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzlite
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzlite
提交
abd61bb0
提交
abd61bb0
编写于
1月 28, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zoo457790531 发布系统代码 [ibz-lite,应用]
上级
52b7c7de
变更
51
显示空白字符变更
内嵌
并排
正在显示
51 个修改的文件
包含
118 行增加
和
61 行删除
+118
-61
dynamic-model-config_BO_CN_base.ts
...s/dynamic-model-config/dynamic-model-config_BO_CN_base.ts
+2
-0
dynamic-model-config_en_US_base.ts
...s/dynamic-model-config/dynamic-model-config_en_US_base.ts
+2
-0
dynamic-model-config_zh_CN_base.ts
...s/dynamic-model-config/dynamic-model-config_zh_CN_base.ts
+2
-0
main-form-base.vue
...widgets/dynamic-model-config/main-form/main-form-base.vue
+34
-0
main-form-model.ts
...widgets/dynamic-model-config/main-form/main-form-model.ts
+5
-0
BladeVisualCategoryServiceImpl.java
...avuedata/service/impl/BladeVisualCategoryServiceImpl.java
+0
-3
BladeVisualConfigServiceImpl.java
...e/avuedata/service/impl/BladeVisualConfigServiceImpl.java
+0
-3
BladeVisualMapServiceImpl.java
...core/avuedata/service/impl/BladeVisualMapServiceImpl.java
+0
-3
BladeVisualServiceImpl.java
...ab/core/avuedata/service/impl/BladeVisualServiceImpl.java
+0
-3
DynamicModelConfig.java
.../java/cn/ibizlab/core/lite/domain/DynamicModelConfig.java
+15
-0
DstAPIServiceImpl.java
.../cn/ibizlab/core/lite/service/impl/DstAPIServiceImpl.java
+0
-1
DstAppServiceImpl.java
.../cn/ibizlab/core/lite/service/impl/DstAppServiceImpl.java
+0
-1
DstComponentServiceImpl.java
...izlab/core/lite/service/impl/DstComponentServiceImpl.java
+0
-3
DstConfigServiceImpl.java
.../ibizlab/core/lite/service/impl/DstConfigServiceImpl.java
+0
-3
DstDataSourceServiceImpl.java
...zlab/core/lite/service/impl/DstDataSourceServiceImpl.java
+0
-3
DstMicroserviceServiceImpl.java
...ab/core/lite/service/impl/DstMicroserviceServiceImpl.java
+0
-1
DstRouterServiceImpl.java
.../ibizlab/core/lite/service/impl/DstRouterServiceImpl.java
+0
-3
DstSystemServiceImpl.java
.../ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
+0
-3
DstViewServiceImpl.java
...cn/ibizlab/core/lite/service/impl/DstViewServiceImpl.java
+0
-3
DynamicModelConfigServiceImpl.java
...core/lite/service/impl/DynamicModelConfigServiceImpl.java
+0
-3
MetaDataSetServiceImpl.java
...bizlab/core/lite/service/impl/MetaDataSetServiceImpl.java
+0
-3
MetaEntityServiceImpl.java
...ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
+0
-3
MetaFieldServiceImpl.java
.../ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
+0
-3
MetaLookupServiceImpl.java
...ibizlab/core/lite/service/impl/MetaLookupServiceImpl.java
+0
-1
MetaModelServiceImpl.java
.../ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
+0
-3
MetaModuleServiceImpl.java
...ibizlab/core/lite/service/impl/MetaModuleServiceImpl.java
+0
-3
MetaRelationshipServiceImpl.java
...b/core/lite/service/impl/MetaRelationshipServiceImpl.java
+0
-3
h2_table.xml
ibzlite-core/src/main/resources/liquibase/h2_table.xml
+4
-2
DynamicModelConfigMapper.xml
...pper/lite/dynamicmodelconfig/DynamicModelConfigMapper.xml
+3
-3
ibzlite.json
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
+14
-0
DynamicModelConfigDTO.java
...c/main/java/cn/ibizlab/api/dto/DynamicModelConfigDTO.java
+17
-0
BladeVisualCategoryResource.java
...java/cn/ibizlab/api/rest/BladeVisualCategoryResource.java
+1
-0
BladeVisualConfigResource.java
...n/java/cn/ibizlab/api/rest/BladeVisualConfigResource.java
+1
-0
BladeVisualMapResource.java
...main/java/cn/ibizlab/api/rest/BladeVisualMapResource.java
+1
-0
BladeVisualResource.java
...rc/main/java/cn/ibizlab/api/rest/BladeVisualResource.java
+1
-0
DstAPIResource.java
...api/src/main/java/cn/ibizlab/api/rest/DstAPIResource.java
+1
-0
DstAppResource.java
...api/src/main/java/cn/ibizlab/api/rest/DstAppResource.java
+1
-0
DstComponentResource.java
...c/main/java/cn/ibizlab/api/rest/DstComponentResource.java
+1
-0
DstConfigResource.java
.../src/main/java/cn/ibizlab/api/rest/DstConfigResource.java
+1
-0
DstDataSourceResource.java
.../main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
+1
-0
DstMicroserviceResource.java
...ain/java/cn/ibizlab/api/rest/DstMicroserviceResource.java
+1
-0
DstRouterResource.java
.../src/main/java/cn/ibizlab/api/rest/DstRouterResource.java
+1
-0
DstViewResource.java
...pi/src/main/java/cn/ibizlab/api/rest/DstViewResource.java
+1
-0
DynamicModelConfigResource.java
.../java/cn/ibizlab/api/rest/DynamicModelConfigResource.java
+1
-0
MetaDataSetResource.java
...rc/main/java/cn/ibizlab/api/rest/MetaDataSetResource.java
+1
-0
MetaEntityResource.java
...src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java
+1
-0
MetaFieldResource.java
.../src/main/java/cn/ibizlab/api/rest/MetaFieldResource.java
+1
-0
MetaModelResource.java
.../src/main/java/cn/ibizlab/api/rest/MetaModelResource.java
+1
-0
MetaModuleResource.java
...src/main/java/cn/ibizlab/api/rest/MetaModuleResource.java
+1
-0
MetaRelationshipResource.java
...in/java/cn/ibizlab/api/rest/MetaRelationshipResource.java
+1
-0
AuthPermissionEvaluator.java
...ava/cn/ibizlab/util/security/AuthPermissionEvaluator.java
+1
-1
未找到文件。
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_BO_CN_base.ts
浏览文件 @
abd61bb0
...
...
@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统标识"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
},
views
:
{
gridview
:
{
...
...
@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid
:
commonLogic
.
appcommonhandle
(
""
,
null
),
srfsourcekey
:
commonLogic
.
appcommonhandle
(
""
,
null
),
configname
:
commonLogic
.
appcommonhandle
(
"名称"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
configid
:
commonLogic
.
appcommonhandle
(
"ID"
,
null
),
},
...
...
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_en_US_base.ts
浏览文件 @
abd61bb0
...
...
@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统标识"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
},
views
:
{
gridview
:
{
...
...
@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid
:
commonLogic
.
appcommonhandle
(
""
,
null
),
srfsourcekey
:
commonLogic
.
appcommonhandle
(
""
,
null
),
configname
:
commonLogic
.
appcommonhandle
(
"名称"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
configid
:
commonLogic
.
appcommonhandle
(
"ID"
,
null
),
},
...
...
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_zh_CN_base.ts
浏览文件 @
abd61bb0
...
...
@@ -8,6 +8,7 @@ function getLocaleResourceBase(){
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
status
:
commonLogic
.
appcommonhandle
(
"状态"
,
null
),
system_id
:
commonLogic
.
appcommonhandle
(
"系统标识"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
},
views
:
{
gridview
:
{
...
...
@@ -31,6 +32,7 @@ function getLocaleResourceBase(){
srfdeid
:
commonLogic
.
appcommonhandle
(
""
,
null
),
srfsourcekey
:
commonLogic
.
appcommonhandle
(
""
,
null
),
configname
:
commonLogic
.
appcommonhandle
(
"名称"
,
null
),
dynainstid
:
commonLogic
.
appcommonhandle
(
"动态实例标识"
,
null
),
modelfile
:
commonLogic
.
appcommonhandle
(
"文件"
,
null
),
configid
:
commonLogic
.
appcommonhandle
(
"ID"
,
null
),
},
...
...
app_web/src/widgets/dynamic-model-config/main-form/main-form-base.vue
浏览文件 @
abd61bb0
...
...
@@ -23,6 +23,20 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.dynainstid.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'dynainstid'
:itemRules=
"this.rules().dynainstid"
class=
''
:caption=
"$t('entities.dynamicmodelconfig.main_form.details.dynainstid')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.dynainstid.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.dynainstid"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.dynainstid.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.modelfile.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'modelfile'
:itemRules=
"this.rules().modelfile"
class=
''
:caption=
"$t('entities.dynamicmodelconfig.main_form.details.modelfile')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.modelfile.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
...
...
@@ -435,6 +449,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid
:
null
,
srfsourcekey
:
null
,
configname
:
null
,
dynainstid
:
null
,
modelfile
:
null
,
configid
:
null
,
dynamicmodelconfig
:
null
,
...
...
@@ -492,6 +507,10 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
this
.
detailsModel
.
configname
.
required
,
type
:
'string'
,
message
:
'名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
configname
.
required
,
type
:
'string'
,
message
:
'名称 值不能为空'
,
trigger
:
'blur'
},
],
dynainstid
:
[
{
required
:
this
.
detailsModel
.
dynainstid
.
required
,
type
:
'string'
,
message
:
'动态实例标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
dynainstid
.
required
,
type
:
'string'
,
message
:
'动态实例标识 值不能为空'
,
trigger
:
'blur'
},
],
modelfile
:
[
{
required
:
this
.
detailsModel
.
modelfile
.
required
,
type
:
'string'
,
message
:
'文件 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
modelfile
.
required
,
type
:
'string'
,
message
:
'文件 值不能为空'
,
trigger
:
'blur'
},
...
...
@@ -622,6 +641,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
configname
:
new
FormItemModel
({
caption
:
'名称'
,
detailType
:
'FORMITEM'
,
name
:
'configname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
true
,
disabled
:
false
,
enableCond
:
3
})
,
dynainstid
:
new
FormItemModel
({
caption
:
'动态实例标识'
,
detailType
:
'FORMITEM'
,
name
:
'dynainstid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
true
,
disabled
:
false
,
enableCond
:
3
})
,
modelfile
:
new
FormItemModel
({
caption
:
'文件'
,
detailType
:
'FORMITEM'
,
name
:
'modelfile'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
true
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -725,6 +746,18 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'configname'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 dynainstid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.dynainstid'
)
onDynainstidChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'dynainstid'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 modelfile 值
*
...
...
@@ -815,6 +848,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
...
...
app_web/src/widgets/dynamic-model-config/main-form/main-form-model.ts
浏览文件 @
abd61bb0
...
...
@@ -55,6 +55,11 @@ export default class MainModel {
prop
:
'configname'
,
dataType
:
'TEXT'
,
},
{
name
:
'dynainstid'
,
prop
:
'dynainstid'
,
dataType
:
'TEXT'
,
},
{
name
:
'modelfile'
,
prop
:
'modelfile'
,
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualCategoryServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -221,9 +221,6 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg
public
IBladeVisualCategoryService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualConfigServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -221,9 +221,6 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM
public
IBladeVisualConfigService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualMapServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -221,9 +221,6 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper,
public
IBladeVisualMapService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -221,9 +221,6 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
public
IBladeVisualService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DynamicModelConfig.java
浏览文件 @
abd61bb0
...
...
@@ -80,6 +80,13 @@ public class DynamicModelConfig extends EntityMP implements Serializable {
@JSONField
(
name
=
"system_id"
)
@JsonProperty
(
"system_id"
)
private
String
systemId
;
/**
* 动态实例标识
*/
@TableField
(
value
=
"dynainstid"
)
@JSONField
(
name
=
"dynainstid"
)
@JsonProperty
(
"dynainstid"
)
private
String
dynainstid
;
/**
*
...
...
@@ -123,6 +130,14 @@ public class DynamicModelConfig extends EntityMP implements Serializable {
this
.
modify
(
"systemid"
,
systemId
);
}
/**
* 设置 [动态实例标识]
*/
public
void
setDynainstid
(
String
dynainstid
)
{
this
.
dynainstid
=
dynainstid
;
this
.
modify
(
"dynainstid"
,
dynainstid
);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstAPIServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -136,7 +136,6 @@ public class DstAPIServiceImpl implements IDstAPIService {
return
new
PageImpl
<
DstAPI
>(
new
ArrayList
(),
context
.
getPageable
(),
0
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstAppServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -130,7 +130,6 @@ public class DstAppServiceImpl implements IDstAppService {
return
new
PageImpl
<
DstApp
>(
new
ArrayList
(),
context
.
getPageable
(),
0
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstComponentServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -293,9 +293,6 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
public
IDstComponentService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstConfigServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -249,9 +249,6 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
public
IDstConfigService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -256,9 +256,6 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
public
IDstDataSourceService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstMicroserviceServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -124,7 +124,6 @@ public class DstMicroserviceServiceImpl implements IDstMicroserviceService {
return
new
PageImpl
<
DstMicroservice
>(
new
ArrayList
(),
context
.
getPageable
(),
0
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstRouterServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -253,9 +253,6 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
public
IDstRouterService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -277,9 +277,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
public
IDstSystemService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstViewServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -277,9 +277,6 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
public
IDstViewService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DynamicModelConfigServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -249,9 +249,6 @@ public class DynamicModelConfigServiceImpl extends ServiceImpl<DynamicModelConfi
public
IDynamicModelConfigService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -288,9 +288,6 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -363,9 +363,6 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
public
IMetaEntityService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -335,9 +335,6 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaLookupServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -153,7 +153,6 @@ public class MetaLookupServiceImpl implements IMetaLookupService {
return
new
PageImpl
<
MetaLookup
>(
new
ArrayList
(),
context
.
getPageable
(),
0
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -249,9 +249,6 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
public
IMetaModelService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModuleServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -236,9 +236,6 @@ public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaMod
public
IMetaModuleService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java
浏览文件 @
abd61bb0
...
...
@@ -356,9 +356,6 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
}
...
...
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
abd61bb0
...
...
@@ -222,7 +222,7 @@
<!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 -->
<changeSet
author=
"root"
id=
"tab-dynamic_model_config-5
1
-11"
>
<changeSet
author=
"root"
id=
"tab-dynamic_model_config-5
5
-11"
>
<createTable
tableName=
"IBZDYNAMICMODELCONFIG"
>
<column
name=
"CONFIGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DYNAMIC_MODEL_CONFIG_CONFIG"
/>
...
...
@@ -235,6 +235,8 @@
</column>
<column
name=
"SYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"DYNAINSTID"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</createTable>
</changeSet>
...
...
@@ -443,7 +445,7 @@
<!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 -->
<changeSet
author=
"root"
id=
"fk-dynamic_model_config-5
1
-18"
>
<changeSet
author=
"root"
id=
"fk-dynamic_model_config-5
5
-18"
>
<addForeignKeyConstraint
baseColumnNames=
"SYSTEMID"
baseTableName=
"IBZDYNAMICMODELCONFIG"
constraintName=
"DER1N_DYNAMIC_MODEL_CONFIG_DST"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"PSSYSTEMID"
referencedTableName=
"IBZPSSYSTEM"
validate=
"true"
/>
</changeSet>
<!--输出实体[META_DATASET]外键关系 -->
...
...
ibzlite-core/src/main/resources/mapper/lite/dynamicmodelconfig/DynamicModelConfigMapper.xml
浏览文件 @
abd61bb0
...
...
@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`CONFIGID`, t1.`CONFIGNAME`, t1.`MODELFILE`, t1.`STATUS`, t1.`SYSTEMID` FROM `IBZDYNAMICMODELCONFIG` t1 ) t1 where configid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"DynamicModelConfigResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 ) t1 where configid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.CONFIGID, t1.CONFIGNAME, t1.
DYNAINSTID, t1.
MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1 ) t1 where configid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
...
@@ -45,7 +45,7 @@
</sql>
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.
DYNAINSTID, t1.
MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
]]>
</sql>
<!--数据查询[View]-->
...
...
@@ -55,7 +55,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
<![CDATA[ SELECT t1.CONFIGID, t1.CONFIGNAME, t1.
DYNAINSTID, t1.
MODELFILE, t1.STATUS, t1.SYSTEMID FROM IBZDYNAMICMODELCONFIG t1
]]>
</sql>
</mapper>
...
...
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @
abd61bb0
...
...
@@ -1852,6 +1852,20 @@
"key_field"
:
0
,
"show_order"
:
1000
,
"major_field"
:
0
},
{
"fieldname"
:
"DYNAINSTID"
,
"codename"
:
"Dynainstid"
,
"field_logic_name"
:
"动态实例标识"
,
"entity_name"
:
"DYNAMIC_MODEL_CONFIG"
,
"field_type"
:
"TEXT"
,
"nullable"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1000
,
"major_field"
:
0
}
],
"subEntitys"
:[
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DynamicModelConfigDTO.java
浏览文件 @
abd61bb0
...
...
@@ -74,6 +74,15 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable {
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
systemId
;
/**
* 属性 [DYNAINSTID]
*
*/
@JSONField
(
name
=
"dynainstid"
)
@JsonProperty
(
"dynainstid"
)
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
dynainstid
;
/**
* 设置 [CONFIGNAME]
...
...
@@ -107,6 +116,14 @@ public class DynamicModelConfigDTO extends DTOBase implements Serializable {
this
.
modify
(
"systemid"
,
systemId
);
}
/**
* 设置 [DYNAINSTID]
*/
public
void
setDynainstid
(
String
dynainstid
){
this
.
dynainstid
=
dynainstid
;
this
.
modify
(
"dynainstid"
,
dynainstid
);
}
}
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/BladeVisualCategoryResource.java
浏览文件 @
abd61bb0
...
...
@@ -159,5 +159,6 @@ public class BladeVisualCategoryResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/BladeVisualConfigResource.java
浏览文件 @
abd61bb0
...
...
@@ -159,5 +159,6 @@ public class BladeVisualConfigResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/BladeVisualMapResource.java
浏览文件 @
abd61bb0
...
...
@@ -159,5 +159,6 @@ public class BladeVisualMapResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/BladeVisualResource.java
浏览文件 @
abd61bb0
...
...
@@ -160,5 +160,6 @@ public class BladeVisualResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstAPIResource.java
浏览文件 @
abd61bb0
...
...
@@ -148,6 +148,7 @@ public class DstAPIResource {
}
@ApiOperation
(
value
=
"根据微服务建立接口"
,
tags
=
{
"接口"
},
notes
=
"根据微服务建立接口"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstmicroservices/{dstmicroservice_id}/dstapis"
)
public
ResponseEntity
<
DstAPIDTO
>
createByDstMicroservice
(
@PathVariable
(
"dstmicroservice_id"
)
String
dstmicroservice_id
,
@RequestBody
DstAPIDTO
dstapidto
)
{
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstAppResource.java
浏览文件 @
abd61bb0
...
...
@@ -148,6 +148,7 @@ public class DstAppResource {
}
@ApiOperation
(
value
=
"根据系统建立应用"
,
tags
=
{
"应用"
},
notes
=
"根据系统建立应用"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstsystems/{dstsystem_id}/dstapps"
)
public
ResponseEntity
<
DstAppDTO
>
createByDstSystem
(
@PathVariable
(
"dstsystem_id"
)
String
dstsystem_id
,
@RequestBody
DstAppDTO
dstappdto
)
{
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstComponentResource.java
浏览文件 @
abd61bb0
...
...
@@ -179,6 +179,7 @@ public class DstComponentResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstComponent-Create-all')"
)
@ApiOperation
(
value
=
"根据应用建立组件"
,
tags
=
{
"组件"
},
notes
=
"根据应用建立组件"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstapps/{dstapp_id}/dstcomponents"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstConfigResource.java
浏览文件 @
abd61bb0
...
...
@@ -179,5 +179,6 @@ public class DstConfigResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
浏览文件 @
abd61bb0
...
...
@@ -197,5 +197,6 @@ public class DstDataSourceResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstMicroserviceResource.java
浏览文件 @
abd61bb0
...
...
@@ -148,6 +148,7 @@ public class DstMicroserviceResource {
}
@ApiOperation
(
value
=
"根据系统建立微服务"
,
tags
=
{
"微服务"
},
notes
=
"根据系统建立微服务"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstsystems/{dstsystem_id}/dstmicroservices"
)
public
ResponseEntity
<
DstMicroserviceDTO
>
createByDstSystem
(
@PathVariable
(
"dstsystem_id"
)
String
dstsystem_id
,
@RequestBody
DstMicroserviceDTO
dstmicroservicedto
)
{
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstRouterResource.java
浏览文件 @
abd61bb0
...
...
@@ -160,6 +160,7 @@ public class DstRouterResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstRouter-Create-all')"
)
@ApiOperation
(
value
=
"根据应用建立路由"
,
tags
=
{
"路由"
},
notes
=
"根据应用建立路由"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstapps/{dstapp_id}/dstrouters"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstViewResource.java
浏览文件 @
abd61bb0
...
...
@@ -160,6 +160,7 @@ public class DstViewResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstView-Create-all')"
)
@ApiOperation
(
value
=
"根据应用建立页面"
,
tags
=
{
"页面"
},
notes
=
"根据应用建立页面"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstapps/{dstapp_id}/dstviews"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DynamicModelConfigResource.java
浏览文件 @
abd61bb0
...
...
@@ -178,5 +178,6 @@ public class DynamicModelConfigResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaDataSetResource.java
浏览文件 @
abd61bb0
...
...
@@ -159,6 +159,7 @@ public class MetaDataSetResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaDataSet-Create-all')"
)
@ApiOperation
(
value
=
"根据实体建立数据集"
,
tags
=
{
"数据集"
},
notes
=
"根据实体建立数据集"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/metaentities/{metaentity_id}/metadatasets"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java
浏览文件 @
abd61bb0
...
...
@@ -198,6 +198,7 @@ public class MetaEntityResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaEntity-Create-all')"
)
@ApiOperation
(
value
=
"根据系统建立实体"
,
tags
=
{
"实体"
},
notes
=
"根据系统建立实体"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstsystems/{dstsystem_id}/metaentities"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaFieldResource.java
浏览文件 @
abd61bb0
...
...
@@ -160,6 +160,7 @@ public class MetaFieldResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaField-Create-all')"
)
@ApiOperation
(
value
=
"根据实体建立属性"
,
tags
=
{
"属性"
},
notes
=
"根据实体建立属性"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/metaentities/{metaentity_id}/metafields"
)
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModelResource.java
浏览文件 @
abd61bb0
...
...
@@ -179,5 +179,6 @@ public class MetaModelResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModuleResource.java
浏览文件 @
abd61bb0
...
...
@@ -159,5 +159,6 @@ public class MetaModuleResource {
}
}
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaRelationshipResource.java
浏览文件 @
abd61bb0
...
...
@@ -179,6 +179,7 @@ public class MetaRelationshipResource {
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaRelationship-Create-all')"
)
@ApiOperation
(
value
=
"根据实体建立实体关系"
,
tags
=
{
"实体关系"
},
notes
=
"根据实体建立实体关系"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/metaentities/{metaentity_id}/metarelationships"
)
...
...
ibzlite-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java
浏览文件 @
abd61bb0
...
...
@@ -293,7 +293,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
Map
<
String
,
String
>
permissionFiled
=
new
HashMap
<>();
String
orgField
=
"orgid"
;
//组织属性
String
orgDeptField
=
"orgsecid"
;
//部门属性
String
orgDeptField
=
"orgsec
tor
id"
;
//部门属性
String
createManField
=
"createman"
;
//创建人属性
DEFieldCacheMap
.
getFieldMap
(
entityBase
.
getClass
().
getName
());
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录