Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
civil-bigdata
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
civil
civil-bigdata
Commits
ceb282db
Commit
ceb282db
authored
Sep 09, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对接共享平台接口
parent
4db86717
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
158 additions
and
10 deletions
+158
-10
resource-server/src/main/java/com/zq/resource/controller/admin/DeptController.java
+0
-7
resource-server/src/main/java/com/zq/resource/controller/admin/DeptDutyController.java
+38
-0
resource-server/src/main/java/com/zq/resource/controller/admin/StandardDataController.java
+6
-0
resource-server/src/main/java/com/zq/resource/controller/admin/SystemController.java
+0
-3
resource-server/src/main/java/com/zq/resource/entity/DeptDuty.java
+13
-0
resource-server/src/main/java/com/zq/resource/entity/DeptLiability.java
+13
-0
resource-server/src/main/java/com/zq/resource/service/DeptDutyService.java
+88
-0
No files found.
resource-server/src/main/java/com/zq/resource/controller/admin/DeptController.java
View file @
ceb282db
...
@@ -50,14 +50,7 @@ public class DeptController {
...
@@ -50,14 +50,7 @@ public class DeptController {
@PostMapping
(
value
=
"/addDept"
)
@PostMapping
(
value
=
"/addDept"
)
public
ResultVo
addDept
(
@RequestBody
OrgDept
vo
)
{
public
ResultVo
addDept
(
@RequestBody
OrgDept
vo
)
{
AssertUtils
.
hasText
(
vo
.
getDeptName
(),
"缺少机构名称"
);
AssertUtils
.
hasText
(
vo
.
getDeptName
(),
"缺少机构名称"
);
AssertUtils
.
notNull
(
vo
.
getDeptType
(),
"缺少机构类型"
);
AssertUtils
.
hasText
(
vo
.
getCreditCode
(),
"缺少部门的统一信用代码"
);
AssertUtils
.
hasText
(
vo
.
getCreditCode
(),
"缺少部门的统一信用代码"
);
AssertUtils
.
hasText
(
vo
.
getAreaCode
(),
"缺少区域码"
);
AssertUtils
.
hasText
(
vo
.
getAddress
(),
"缺少地址"
);
AssertUtils
.
hasText
(
vo
.
getTel
(),
"缺少电话"
);
AssertUtils
.
notNull
(
vo
.
getTotalOrgStaff
(),
"缺少编制人员数量"
);
AssertUtils
.
notNull
(
vo
.
getCurrOrgStaff
(),
"缺少在编人员数量"
);
AssertUtils
.
hasText
(
vo
.
getResponsibility
(),
"缺少主要职责"
);
deptService
.
addDept
(
vo
);
deptService
.
addDept
(
vo
);
return
ResultVo
.
success
();
return
ResultVo
.
success
();
...
...
resource-server/src/main/java/com/zq/resource/controller/admin/DeptDutyController.java
View file @
ceb282db
package
com
.
zq
.
resource
.
controller
.
admin
;
package
com
.
zq
.
resource
.
controller
.
admin
;
import
cn.hutool.core.collection.CollUtil
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.vo.IdVo
;
import
com.zq.common.vo.KeywordFindVo
;
import
com.zq.common.vo.KeywordFindVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.common.vo.ResultVo
;
...
@@ -63,6 +65,24 @@ public class DeptDutyController {
...
@@ -63,6 +65,24 @@ public class DeptDutyController {
return
ResultVo
.
success
();
return
ResultVo
.
success
();
}
}
@ApiOperation
(
"注册机构职责"
)
@PostMapping
(
value
=
"/share/registerDeptDuty"
)
public
ResultVo
registerDeptDuty
(
@RequestBody
IdVo
vo
)
{
AssertUtils
.
isTrue
(
CollUtil
.
isNotEmpty
(
vo
.
getIds
()),
"至少选择一项"
);
deptDutyService
.
registerOrUpdateDeptDuty
(
vo
.
getIds
());
return
ResultVo
.
success
();
}
@ApiOperation
(
"撤销机构职责"
)
@PostMapping
(
value
=
"/share/cancelDeptDuty"
)
public
ResultVo
cancelDeptDuty
(
@RequestBody
IdVo
vo
)
{
AssertUtils
.
isTrue
(
CollUtil
.
isNotEmpty
(
vo
.
getIds
()),
"至少选择一项"
);
deptDutyService
.
cancelDeptDuty
(
vo
.
getIds
());
return
ResultVo
.
success
();
}
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓职责办事项↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓职责办事项↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
@ApiOperation
(
"添加职责办事项"
)
@ApiOperation
(
"添加职责办事项"
)
...
@@ -96,6 +116,24 @@ public class DeptDutyController {
...
@@ -96,6 +116,24 @@ public class DeptDutyController {
return
ResultVo
.
success
(
deptDutyService
.
getDeptLiabilityInfo
(
liabilityId
));
return
ResultVo
.
success
(
deptDutyService
.
getDeptLiabilityInfo
(
liabilityId
));
}
}
@ApiOperation
(
"注册机构职责信息"
)
@PostMapping
(
value
=
"/share/registerDeptLiability"
)
public
ResultVo
registerDeptLiability
(
@RequestBody
IdVo
vo
)
{
AssertUtils
.
isTrue
(
CollUtil
.
isNotEmpty
(
vo
.
getIds
()),
"至少选择一项"
);
deptDutyService
.
registerOrUpdateDeptLiability
(
vo
.
getIds
());
return
ResultVo
.
success
();
}
@ApiOperation
(
"撤销机构职责信息"
)
@PostMapping
(
value
=
"/share/cancelDeptLiability"
)
public
ResultVo
cancelDeptLiability
(
@RequestBody
IdVo
vo
)
{
AssertUtils
.
isTrue
(
CollUtil
.
isNotEmpty
(
vo
.
getIds
()),
"至少选择一项"
);
deptDutyService
.
cancelDeptLiability
(
vo
.
getIds
());
return
ResultVo
.
success
();
}
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓事项-标签↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓事项-标签↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
@ApiOperation
(
"添加事项-标签"
)
@ApiOperation
(
"添加事项-标签"
)
...
...
resource-server/src/main/java/com/zq/resource/controller/admin/StandardDataController.java
View file @
ceb282db
...
@@ -31,6 +31,8 @@ public class StandardDataController {
...
@@ -31,6 +31,8 @@ public class StandardDataController {
private
final
StandardDataService
standardDataService
;
private
final
StandardDataService
standardDataService
;
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓数据元↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
@ApiOperation
(
"添加数据元"
)
@ApiOperation
(
"添加数据元"
)
@PostMapping
(
value
=
"/addStandardData"
)
@PostMapping
(
value
=
"/addStandardData"
)
public
ResultVo
addStandardData
(
@RequestBody
StandardData
vo
)
{
public
ResultVo
addStandardData
(
@RequestBody
StandardData
vo
)
{
...
@@ -97,6 +99,8 @@ public class StandardDataController {
...
@@ -97,6 +99,8 @@ public class StandardDataController {
return
ResultVo
.
success
();
return
ResultVo
.
success
();
}
}
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓数据元映射↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
@ApiOperation
(
"添加数据元映射"
)
@ApiOperation
(
"添加数据元映射"
)
@PostMapping
(
value
=
"/addStandardDataMapping"
)
@PostMapping
(
value
=
"/addStandardDataMapping"
)
public
ResultVo
addStandardDataMapping
(
@RequestBody
StandardDataMapping
vo
)
{
public
ResultVo
addStandardDataMapping
(
@RequestBody
StandardDataMapping
vo
)
{
...
@@ -140,6 +144,8 @@ public class StandardDataController {
...
@@ -140,6 +144,8 @@ public class StandardDataController {
return
ResultVo
.
success
(
standardDataService
.
getStandardDataMappingInfo
(
standardMappingDataId
));
return
ResultVo
.
success
(
standardDataService
.
getStandardDataMappingInfo
(
standardMappingDataId
));
}
}
/*↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓所属领域↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓*/
@ApiOperation
(
"注册所属领域"
)
@ApiOperation
(
"注册所属领域"
)
@PostMapping
(
value
=
"/share/registerStandardDataMapping"
)
@PostMapping
(
value
=
"/share/registerStandardDataMapping"
)
public
ResultVo
registerStandardDataMapping
(
@RequestBody
IdVo
vo
)
{
public
ResultVo
registerStandardDataMapping
(
@RequestBody
IdVo
vo
)
{
...
...
resource-server/src/main/java/com/zq/resource/controller/admin/SystemController.java
View file @
ceb282db
...
@@ -50,9 +50,6 @@ public class SystemController {
...
@@ -50,9 +50,6 @@ public class SystemController {
AssertUtils
.
hasText
(
vo
.
getSystemName
(),
"缺少系统名称"
);
AssertUtils
.
hasText
(
vo
.
getSystemName
(),
"缺少系统名称"
);
AssertUtils
.
hasText
(
vo
.
getBelongDeptId
(),
"缺少所属部门ID"
);
AssertUtils
.
hasText
(
vo
.
getBelongDeptId
(),
"缺少所属部门ID"
);
AssertUtils
.
hasText
(
vo
.
getProvideIp
(),
"缺少对外提供的IP"
);
AssertUtils
.
hasText
(
vo
.
getProvideIp
(),
"缺少对外提供的IP"
);
AssertUtils
.
hasText
(
vo
.
getProvideUrl
(),
"缺少对外提供的地址"
);
AssertUtils
.
hasText
(
vo
.
getPhone
(),
"缺少联系人电话"
);
AssertUtils
.
hasText
(
vo
.
getContact
(),
"缺少联系人姓名"
);
systemInfoService
.
addSystem
(
vo
);
systemInfoService
.
addSystem
(
vo
);
return
ResultVo
.
success
();
return
ResultVo
.
success
();
...
...
resource-server/src/main/java/com/zq/resource/entity/DeptDuty.java
View file @
ceb282db
...
@@ -55,4 +55,16 @@ public class DeptDuty {
...
@@ -55,4 +55,16 @@ public class DeptDuty {
@ApiModelProperty
(
"更新时间"
)
@ApiModelProperty
(
"更新时间"
)
private
Date
updateTime
;
private
Date
updateTime
;
/**
* 状态: 1-正常, 2-删除
*/
@ApiModelProperty
(
"状态: 1-正常, 2-删除"
)
private
Integer
state
;
/**
* 注册接口返回的ID
*/
@ApiModelProperty
(
"注册接口返回的ID"
)
private
String
cascadeguid
;
}
}
\ No newline at end of file
resource-server/src/main/java/com/zq/resource/entity/DeptLiability.java
View file @
ceb282db
...
@@ -55,4 +55,16 @@ public class DeptLiability {
...
@@ -55,4 +55,16 @@ public class DeptLiability {
@ApiModelProperty
(
"更新时间"
)
@ApiModelProperty
(
"更新时间"
)
private
Date
updateTime
;
private
Date
updateTime
;
/**
* 状态: 1-正常, 2-删除
*/
@ApiModelProperty
(
"状态: 1-正常, 2-删除"
)
private
Integer
state
;
/**
* 注册接口返回的ID
*/
@ApiModelProperty
(
"注册接口返回的ID"
)
private
String
cascadeguid
;
}
}
\ No newline at end of file
resource-server/src/main/java/com/zq/resource/service/DeptDutyService.java
View file @
ceb282db
...
@@ -7,6 +7,7 @@ import com.zq.common.utils.AssertUtils;
...
@@ -7,6 +7,7 @@ import com.zq.common.utils.AssertUtils;
import
com.zq.common.utils.PagingUtils
;
import
com.zq.common.utils.PagingUtils
;
import
com.zq.common.vo.KeywordFindVo
;
import
com.zq.common.vo.KeywordFindVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.resource.constant.ShareApiEnum
;
import
com.zq.resource.dao.DeptDutyDao
;
import
com.zq.resource.dao.DeptDutyDao
;
import
com.zq.resource.dao.DeptLiabilityCategoryDao
;
import
com.zq.resource.dao.DeptLiabilityCategoryDao
;
import
com.zq.resource.dao.DeptLiabilityDao
;
import
com.zq.resource.dao.DeptLiabilityDao
;
...
@@ -15,13 +16,21 @@ import com.zq.resource.entity.DeptDuty;
...
@@ -15,13 +16,21 @@ import com.zq.resource.entity.DeptDuty;
import
com.zq.resource.entity.DeptLiability
;
import
com.zq.resource.entity.DeptLiability
;
import
com.zq.resource.entity.DeptLiabilityCategory
;
import
com.zq.resource.entity.DeptLiabilityCategory
;
import
com.zq.resource.entity.DeptLiabilityLabel
;
import
com.zq.resource.entity.DeptLiabilityLabel
;
import
com.zq.resource.utils.ShareApiUtils
;
import
com.zq.resource.vo.DeptDutyFindVo
;
import
com.zq.resource.vo.DeptDutyFindVo
;
import
com.zq.resource.vo.DeptLiabilityCategoryFindVo
;
import
com.zq.resource.vo.DeptLiabilityCategoryFindVo
;
import
com.zq.resource.vo.DeptLiabilityCategoryVo
;
import
com.zq.resource.vo.DeptLiabilityCategoryVo
;
import
com.zq.resource.vo.ShareApiResponse
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
/**
/**
* @author wilmiam
* @author wilmiam
* @since 2021/9/6 14:44
* @since 2021/9/6 14:44
...
@@ -159,4 +168,83 @@ public class DeptDutyService {
...
@@ -159,4 +168,83 @@ public class DeptDutyService {
public
DeptLiabilityLabel
getDeptLiabilityLabelInfo
(
String
liabilityLabelId
)
{
public
DeptLiabilityLabel
getDeptLiabilityLabelInfo
(
String
liabilityLabelId
)
{
return
deptLiabilityLabelDao
.
selectById
(
liabilityLabelId
);
return
deptLiabilityLabelDao
.
selectById
(
liabilityLabelId
);
}
}
public
void
registerOrUpdateDeptDuty
(
Set
<
String
>
ids
)
{
for
(
String
id
:
ids
)
{
DeptDuty
deptDuty
=
deptDutyDao
.
selectById
(
id
);
if
(
deptDuty
!=
null
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"Duties"
,
deptDuty
.
getDuties
());
params
.
put
(
"credit_code"
,
deptDuty
.
getCreditCode
());
params
.
put
(
"dutiesId"
,
deptDuty
.
getCascadeguid
());
ShareApiResponse
shareApiResponse
=
ShareApiUtils
.
doPost
(
params
,
ShareApiEnum
.
DUTIES_ADD_UPDATE
);
if
(
shareApiResponse
.
isSuccess
())
{
deptDuty
.
setCascadeguid
(
shareApiResponse
.
getString
(
"cascadeguid"
));
deptDuty
.
setUpdateTime
(
DateUtil
.
date
());
deptDutyDao
.
updateById
(
deptDuty
);
}
}
}
}
public
void
cancelDeptDuty
(
Set
<
String
>
ids
)
{
for
(
String
id
:
ids
)
{
DeptDuty
deptDuty
=
deptDutyDao
.
selectById
(
id
);
if
(
deptDuty
!=
null
&&
StringUtils
.
isNotBlank
(
deptDuty
.
getCascadeguid
()))
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"dutiesId"
,
deptDuty
.
getCascadeguid
());
ShareApiResponse
shareApiResponse
=
ShareApiUtils
.
doPost
(
params
,
ShareApiEnum
.
DUTIES_DELETE
);
if
(
shareApiResponse
.
isSuccess
())
{
deptDuty
.
setCascadeguid
(
""
);
deptDuty
.
setUpdateTime
(
DateUtil
.
date
());
deptDutyDao
.
updateById
(
deptDuty
);
}
}
}
}
public
void
registerOrUpdateDeptLiability
(
Set
<
String
>
ids
)
{
for
(
String
id
:
ids
)
{
DeptLiability
deptLiability
=
deptLiabilityDao
.
selectById
(
id
);
if
(
deptLiability
!=
null
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"businessName"
,
deptLiability
.
getBusinessName
());
params
.
put
(
"ResponsibilityId"
,
deptLiability
.
getCascadeguid
());
params
.
put
(
"dutiesId"
,
deptLiability
.
getDeptDutyId
());
List
<
DeptLiabilityLabel
>
deptLiabilityLabelList
=
deptLiabilityLabelDao
.
selectList
(
Wrappers
.
lambdaQuery
(
DeptLiabilityLabel
.
builder
().
deptLiabilityId
(
deptLiability
.
getId
()).
build
()));
String
label
=
deptLiabilityLabelList
.
stream
().
map
(
DeptLiabilityLabel:
:
getLabel
).
collect
(
Collectors
.
joining
(
";"
));
params
.
put
(
"label"
,
label
);
params
.
put
(
"cataId"
,
""
);
ShareApiResponse
shareApiResponse
=
ShareApiUtils
.
doPost
(
params
,
ShareApiEnum
.
RESPONSIBILITY_ADD_UPDATE
);
if
(
shareApiResponse
.
isSuccess
())
{
deptLiability
.
setCascadeguid
(
shareApiResponse
.
getString
(
"cascadeguid"
));
deptLiability
.
setUpdateTime
(
DateUtil
.
date
());
deptLiabilityDao
.
updateById
(
deptLiability
);
}
}
}
}
public
void
cancelDeptLiability
(
Set
<
String
>
ids
)
{
for
(
String
id
:
ids
)
{
DeptLiability
deptLiability
=
deptLiabilityDao
.
selectById
(
id
);
if
(
deptLiability
!=
null
&&
StringUtils
.
isNotBlank
(
deptLiability
.
getCascadeguid
()))
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"ResponsibilityId"
,
deptLiability
.
getCascadeguid
());
ShareApiResponse
shareApiResponse
=
ShareApiUtils
.
doPost
(
params
,
ShareApiEnum
.
RESPONSIBILITY_DELETE
);
if
(
shareApiResponse
.
isSuccess
())
{
deptLiability
.
setCascadeguid
(
""
);
deptLiability
.
setUpdateTime
(
DateUtil
.
date
());
deptLiabilityDao
.
updateById
(
deptLiability
);
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment