Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
3b97a150
提交
3b97a150
编写于
6月 24, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
a1efd3be
变更
11
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
61 行增加
和
50 行删除
+61
-50
default.less
app_web/src/styles/default.less
+2
-2
IBZDepartmentResource.java
.../main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
+4
-4
IBZDeptMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
+14
-14
IBZEmployeeResource.java
...rc/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
+8
-8
IBZOrganizationResource.java
...ain/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
+2
-2
IBZPostResource.java
...pi/src/main/java/cn/ibizlab/api/rest/IBZPostResource.java
+2
-2
IBZTeamMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZTeamMemberResource.java
+12
-12
IBZTeamResource.java
...pi/src/main/java/cn/ibizlab/api/rest/IBZTeamResource.java
+2
-2
IBZWFFallback.java
...l/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java
+6
-1
IBZWFFeignClient.java
...rc/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
+4
-1
PermissionSyncJob.java
.../src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+5
-2
未找到文件。
app_web/src/styles/default.less
浏览文件 @
3b97a150
...
...
@@ -64,14 +64,14 @@
// tab分页模式首页布局
.index_tab_content{
.view-container {
>
.view-container {
height: calc(100% - 65px);
margin: 0px 12px;
}
}
// 面包屑模式首页布局
.index_route_content{
.view-container {
>
.view-container {
height: calc(100% - 36px);
margin: 12px;
}
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
浏览文件 @
3b97a150
...
...
@@ -137,7 +137,7 @@ public class IBZDepartmentResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"部门"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZDepartmentDTO
>>
fetchDefault
(
IBZDepartmentSearchContext
context
)
{
...
...
@@ -150,7 +150,7 @@ public class IBZDepartmentResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"部门"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZDepartmentDTO
>>
searchDefault
(
@RequestBody
IBZDepartmentSearchContext
context
)
{
...
...
@@ -267,7 +267,7 @@ public class IBZDepartmentResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构获取DEFAULT"
,
tags
=
{
"部门"
}
,
notes
=
"根据单位机构获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZDepartmentDTO
>>
fetchIBZDepartmentDefaultByIBZOrganization
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
IBZDepartmentSearchContext
context
)
{
...
...
@@ -281,7 +281,7 @@ public class IBZDepartmentResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构查询DEFAULT"
,
tags
=
{
"部门"
}
,
notes
=
"根据单位机构查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZDepartmentDTO
>>
searchIBZDepartmentDefaultByIBZOrganization
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@RequestBody
IBZDepartmentSearchContext
context
)
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
浏览文件 @
3b97a150
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
浏览文件 @
3b97a150
...
...
@@ -149,7 +149,7 @@ public class IBZEmployeeResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzemployeeMapping
.
toDto
(
ibzemployeeService
.
getDraft
(
new
IBZEmployee
())));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzemployees/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZEmployeeDTO
>>
fetchDefault
(
IBZEmployeeSearchContext
context
)
{
...
...
@@ -162,7 +162,7 @@ public class IBZEmployeeResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzemployees/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZEmployeeDTO
>>
searchDefault
(
@RequestBody
IBZEmployeeSearchContext
context
)
{
...
...
@@ -291,7 +291,7 @@ public class IBZEmployeeResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzemployeeMapping
.
toDto
(
ibzemployeeService
.
getDraft
(
domain
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据部门获取DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据部门获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZEmployeeDTO
>>
fetchIBZEmployeeDefaultByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
IBZEmployeeSearchContext
context
)
{
...
...
@@ -305,7 +305,7 @@ public class IBZEmployeeResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据部门查询DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据部门查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZEmployeeDTO
>>
searchIBZEmployeeDefaultByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZEmployeeSearchContext
context
)
{
...
...
@@ -435,7 +435,7 @@ public class IBZEmployeeResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzemployeeMapping
.
toDto
(
ibzemployeeService
.
getDraft
(
domain
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构获取DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据单位机构获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZEmployeeDTO
>>
fetchIBZEmployeeDefaultByIBZOrganization
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
IBZEmployeeSearchContext
context
)
{
...
...
@@ -449,7 +449,7 @@ public class IBZEmployeeResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构查询DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据单位机构查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZEmployeeDTO
>>
searchIBZEmployeeDefaultByIBZOrganization
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@RequestBody
IBZEmployeeSearchContext
context
)
{
...
...
@@ -579,7 +579,7 @@ public class IBZEmployeeResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzemployeeMapping
.
toDto
(
ibzemployeeService
.
getDraft
(
domain
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构部门获取DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据单位机构部门获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZEmployeeDTO
>>
fetchIBZEmployeeDefaultByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
IBZEmployeeSearchContext
context
)
{
...
...
@@ -593,7 +593,7 @@ public class IBZEmployeeResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构部门查询DEFAULT"
,
tags
=
{
"人员"
}
,
notes
=
"根据单位机构部门查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZEmployeeDTO
>>
searchIBZEmployeeDefaultByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZEmployeeSearchContext
context
)
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
浏览文件 @
3b97a150
...
...
@@ -137,7 +137,7 @@ public class IBZOrganizationResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzorganizationMapping
.
toDto
(
ibzorganizationService
.
getDraft
(
new
IBZOrganization
())));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"单位机构"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZOrganizationDTO
>>
fetchDefault
(
IBZOrganizationSearchContext
context
)
{
...
...
@@ -150,7 +150,7 @@ public class IBZOrganizationResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"单位机构"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZOrganizationDTO
>>
searchDefault
(
@RequestBody
IBZOrganizationSearchContext
context
)
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZPostResource.java
浏览文件 @
3b97a150
...
...
@@ -137,7 +137,7 @@ public class IBZPostResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"岗位"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzposts/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZPostDTO
>>
fetchDefault
(
IBZPostSearchContext
context
)
{
...
...
@@ -150,7 +150,7 @@ public class IBZPostResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"岗位"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzposts/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZPostDTO
>>
searchDefault
(
@RequestBody
IBZPostSearchContext
context
)
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZTeamMemberResource.java
浏览文件 @
3b97a150
...
...
@@ -137,7 +137,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchDefault
(
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -150,7 +150,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchDefault
(
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -267,7 +267,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据人员获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据人员获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzemployees/{ibzemployee_id}/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchIBZTeamMemberDefaultByIBZEmployee
(
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -281,7 +281,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据人员查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据人员查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzemployees/{ibzemployee_id}/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchIBZTeamMemberDefaultByIBZEmployee
(
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -399,7 +399,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据组获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据组获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzteams/{ibzteam_id}/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchIBZTeamMemberDefaultByIBZTeam
(
@PathVariable
(
"ibzteam_id"
)
String
ibzteam_id
,
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -413,7 +413,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据组查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据组查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzteams/{ibzteam_id}/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchIBZTeamMemberDefaultByIBZTeam
(
@PathVariable
(
"ibzteam_id"
)
String
ibzteam_id
,
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -531,7 +531,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据部门人员获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据部门人员获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchIBZTeamMemberDefaultByIBZDepartmentIBZEmployee
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -545,7 +545,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据部门人员查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据部门人员查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchIBZTeamMemberDefaultByIBZDepartmentIBZEmployee
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -663,7 +663,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构人员获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据单位机构人员获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchIBZTeamMemberDefaultByIBZOrganizationIBZEmployee
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -677,7 +677,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构人员查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据单位机构人员查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchIBZTeamMemberDefaultByIBZOrganizationIBZEmployee
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -795,7 +795,7 @@ public class IBZTeamMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构部门人员获取DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据单位机构部门人员获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamMemberDTO
>>
fetchIBZTeamMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
IBZTeamMemberSearchContext
context
)
{
...
...
@@ -809,7 +809,7 @@ public class IBZTeamMemberResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeamMember-
search
Default-all')"
)
@ApiOperation
(
value
=
"根据单位机构部门人员查询DEFAULT"
,
tags
=
{
"组成员"
}
,
notes
=
"根据单位机构部门人员查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzteammembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamMemberDTO
>>
searchIBZTeamMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZTeamMemberSearchContext
context
)
{
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZTeamResource.java
浏览文件 @
3b97a150
...
...
@@ -137,7 +137,7 @@ public class IBZTeamResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-
search
Default-all')"
)
@ApiOperation
(
value
=
"获取DEFAULT"
,
tags
=
{
"组"
}
,
notes
=
"获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzteams/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZTeamDTO
>>
fetchDefault
(
IBZTeamSearchContext
context
)
{
...
...
@@ -150,7 +150,7 @@ public class IBZTeamResource {
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Default-all')"
)
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-
search
Default-all')"
)
@ApiOperation
(
value
=
"查询DEFAULT"
,
tags
=
{
"组"
}
,
notes
=
"查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzteams/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZTeamDTO
>>
searchDefault
(
@RequestBody
IBZTeamSearchContext
context
)
{
...
...
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java
浏览文件 @
3b97a150
package
cn
.
ibizlab
.
util
.
client
;
import
org.springframework.stereotype.Component
;
import
java.util.
List
;
import
java.util.
*
;
@Component
public
class
IBZWFFallback
implements
IBZWFFeignClient
{
...
...
@@ -15,4 +15,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
public
List
<
String
>
getbusinesskeysByUserId
(
String
system
,
String
userId
,
String
entity
,
String
processDefinitionKey
,
String
taskDefinitionKey
)
{
return
null
;
}
@Override
public
Boolean
deployBpmnFile
(
List
<
Map
<
String
,
Object
>>
bpmnfiles
)
{
return
null
;
}
}
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
浏览文件 @
3b97a150
...
...
@@ -2,7 +2,7 @@ package cn.ibizlab.util.client;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.
List
;
import
java.util.
*
;
@FeignClient
(
value
=
"ibzwf-api"
,
fallback
=
IBZWFFallback
.
class
)
public
interface
IBZWFFeignClient
...
...
@@ -15,4 +15,7 @@ public interface IBZWFFeignClient
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks"
)
List
<
String
>
getbusinesskeysByUserId
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"userId"
)
String
userId
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"processDefinitionKey"
)
String
processDefinitionKey
,
@PathVariable
(
"taskDefinitionKey"
)
String
taskDefinitionKey
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/deploybpmn"
)
Boolean
deployBpmnFile
(
@RequestBody
List
<
Map
<
String
,
Object
>>
bpmnfiles
);
}
ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @
3b97a150
...
...
@@ -11,7 +11,9 @@ import org.springframework.boot.ApplicationRunner;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.DigestUtils
;
import
java.io.InputStream
;
import
java.util.*
;
/**
* 权限:向uaa同步当前系统菜单、权限资源任务类
...
...
@@ -21,15 +23,14 @@ import java.io.InputStream;
@ConditionalOnProperty
(
name
=
"ibiz.enablePermissionValid"
,
havingValue
=
"true"
)
public
class
PermissionSyncJob
implements
ApplicationRunner
{
@Autowired
@Lazy
private
IBZUAAFeignClient
client
;
@Value
(
"${ibiz.systemid:ibzou}"
)
private
String
systemId
;
@Override
public
void
run
(
ApplicationArguments
args
)
{
try
{
...
...
@@ -40,6 +41,7 @@ public class PermissionSyncJob implements ApplicationRunner {
system
.
put
(
"pssystemid"
,
systemId
);
system
.
put
(
"pssystemname"
,
systemId
);
system
.
put
(
"sysstructure"
,
JSONObject
.
parseObject
(
permissionResult
));
system
.
put
(
"md5check"
,
DigestUtils
.
md5DigestAsHex
(
permissionResult
.
getBytes
()));
if
(
client
.
syncSysAuthority
(
system
)){
log
.
info
(
"向[UAA]同步系统资源成功"
);
}
else
{
...
...
@@ -49,5 +51,6 @@ public class PermissionSyncJob implements ApplicationRunner {
catch
(
Exception
ex
)
{
log
.
error
(
String
.
format
(
"向[UAA]同步系统资源失败,请检查[UAA]服务是否正常! [%s]"
,
ex
));
}
}
}
\ No newline at end of file
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录