Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzlite
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzlite
提交
fd82d109
提交
fd82d109
编写于
11月 23, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-lite,应用]
上级
2b4d31e7
变更
7
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
107 行增加
和
1 行删除
+107
-1
dst-data-sources.ts
app_web/src/mock/entity/dst-data-sources/dst-data-sources.ts
+38
-0
dst-data-source-service-base.ts
...c/service/dst-data-source/dst-data-source-service-base.ts
+14
-0
DstDataSourceExService.java
...izlab/core/extensions/service/DstDataSourceExService.java
+35
-0
IDstDataSourceService.java
...a/cn/ibizlab/core/lite/service/IDstDataSourceService.java
+1
-0
DstDataSourceServiceImpl.java
...zlab/core/lite/service/impl/DstDataSourceServiceImpl.java
+7
-0
systemResource.json
...te-core/src/main/resources/permission/systemResource.json
+1
-1
DstDataSourceResource.java
.../main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
+11
-0
未找到文件。
app_web/src/mock/entity/dst-data-sources/dst-data-sources.ts
浏览文件 @
fd82d109
...
...
@@ -195,6 +195,44 @@ mock.onGet(new RegExp(/^\/dstdatasources\/getdraft$/)).reply((config: any) => {
return
[
status
,
{}];
});
// BuildDS
mock
.
onPost
(
new
RegExp
(
/^
\/
dstdatasources
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
buildds$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:dstdatasource 方法: BuildDS"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'ds_id'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
dstdatasources
\/([
a-zA-Z0-9
\-\;]{1,35})\/
buildds$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.ds_id, tempValue.ds_id));
let
data
=
JSON
.
parse
(
config
.
data
);
mockDatas
.
forEach
((
item
)
=>
{
if
(
item
[
'ds_id'
]
==
tempValue
[
'ds_id'
]
){
for
(
let
value
in
data
){
if
(
item
.
hasOwnProperty
(
value
)){
item
[
value
]
=
data
[
value
];
}
}
}
})
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
data
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
data
];
});
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
dstdatasources
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:dstdatasource 方法: CheckKey"
);
...
...
app_web/src/service/dst-data-source/dst-data-source-service-base.ts
浏览文件 @
fd82d109
...
...
@@ -139,6 +139,20 @@ export default class DstDataSourceServiceBase extends EntityService {
return
res
;
}
/**
* BuildDS接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof DstDataSourceServiceBase
*/
public
async
BuildDS
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
Http
.
getInstance
().
post
(
`/dstdatasources/
${
context
.
dstdatasource
}
/buildds`
,
data
,
isloading
);
return
res
;
}
/**
* CheckKey接口方法
*
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/extensions/service/DstDataSourceExService.java
0 → 100644
浏览文件 @
fd82d109
package
cn
.
ibizlab
.
core
.
extensions
.
service
;
import
cn.ibizlab.core.lite.service.impl.DstDataSourceServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
import
cn.ibizlab.core.lite.domain.DstDataSource
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.context.annotation.Primary
;
import
java.util.*
;
/**
* 实体[数据源] 自定义服务对象
*/
@Slf4j
@Primary
@Service
(
"DstDataSourceExService"
)
public
class
DstDataSourceExService
extends
DstDataSourceServiceImpl
{
@Override
protected
Class
currentModelClass
()
{
return
com
.
baomidou
.
mybatisplus
.
core
.
toolkit
.
ReflectionKit
.
getSuperClassGenericType
(
this
.
getClass
().
getSuperclass
(),
1
);
}
/**
* [BuildDS:buildDS] 行为扩展
* @param et
* @return
*/
@Override
@Transactional
public
DstDataSource
buildDS
(
DstDataSource
et
)
{
return
super
.
buildDS
(
et
);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstDataSourceService.java
浏览文件 @
fd82d109
...
...
@@ -33,6 +33,7 @@ public interface IDstDataSourceService extends IService<DstDataSource> {
void
removeBatch
(
Collection
<
String
>
idList
);
DstDataSource
get
(
String
key
);
DstDataSource
getDraft
(
DstDataSource
et
);
DstDataSource
buildDS
(
DstDataSource
et
);
boolean
checkKey
(
DstDataSource
et
);
boolean
save
(
DstDataSource
et
);
void
saveBatch
(
List
<
DstDataSource
>
list
);
...
...
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
浏览文件 @
fd82d109
...
...
@@ -117,6 +117,13 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
return
et
;
}
@Override
@Transactional
public
DstDataSource
buildDS
(
DstDataSource
et
)
{
//自定义代码
return
et
;
}
@Override
public
boolean
checkKey
(
DstDataSource
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getDsId
()))
&&
(!
Objects
.
isNull
(
this
.
getById
(
et
.
getDsId
())));
...
...
ibzlite-core/src/main/resources/permission/systemResource.json
浏览文件 @
fd82d109
...
...
@@ -96,7 +96,7 @@
"delogicname"
:
"数据源"
,
"sysmoudle"
:{
"id"
:
"LITE"
,
"name"
:
"lite"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"数据集"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"
BuildDS"
,
"name"
:
"buildDS"
,
"type"
:
"USERCUSTOM"
},{
"id"
:
"
CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
}
,
{
...
...
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
浏览文件 @
fd82d109
...
...
@@ -114,6 +114,17 @@ public class DstDataSourceResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dstdatasourceMapping
.
toDto
(
dstdatasourceService
.
getDraft
(
new
DstDataSource
())));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-DstDataSource-BuildDS-all')"
)
@ApiOperation
(
value
=
"buildDS"
,
tags
=
{
"数据源"
},
notes
=
"buildDS"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstdatasources/{dstdatasource_id}/buildds"
)
public
ResponseEntity
<
DstDataSourceDTO
>
buildDS
(
@PathVariable
(
"dstdatasource_id"
)
String
dstdatasource_id
,
@RequestBody
DstDataSourceDTO
dstdatasourcedto
)
{
DstDataSource
domain
=
dstdatasourceMapping
.
toDomain
(
dstdatasourcedto
);
domain
.
setDsId
(
dstdatasource_id
);
domain
=
dstdatasourceService
.
buildDS
(
domain
);
dstdatasourcedto
=
dstdatasourceMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dstdatasourcedto
);
}
@ApiOperation
(
value
=
"检查数据源"
,
tags
=
{
"数据源"
},
notes
=
"检查数据源"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dstdatasources/checkkey"
)
public
ResponseEntity
<
Boolean
>
checkKey
(
@RequestBody
DstDataSourceDTO
dstdatasourcedto
)
{
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录