Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
3a23461b
Commit
3a23461b
authored
Feb 22, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.增加接收机构树接口
parent
06d54e81
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
88 additions
and
12 deletions
+88
-12
CommonController.java
.../amos/boot/module/jg/biz/controller/CommonController.java
+15
-1
ICommonService.java
...ejoin/amos/boot/module/jg/biz/service/ICommonService.java
+7
-0
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+66
-11
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @
3a23461b
...
@@ -15,7 +15,6 @@ import org.springframework.util.ObjectUtils;
...
@@ -15,7 +15,6 @@ import org.springframework.util.ObjectUtils;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
...
@@ -65,6 +64,21 @@ public class CommonController extends BaseController {
...
@@ -65,6 +64,21 @@ public class CommonController extends BaseController {
/**
/**
* 工作台接收机构树
* @param bizType 业务类型:notice-告知类, register-登记类
* @return 树
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{bizType}/receive-unit/tree"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"接收机构树"
,
notes
=
"接收机构树"
)
public
ResponseModel
<
Object
>
getNoticeReceiveTree
(
@PathVariable
String
bizType
)
{
return
ResponseHelper
.
buildResponse
(
commonService
.
getReceiveUnitTree
(
bizType
));
}
/**
* 获取行政审批局树
* 获取行政审批局树
*
*
* @return
* @return
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java
View file @
3a23461b
...
@@ -55,4 +55,11 @@ public interface ICommonService {
...
@@ -55,4 +55,11 @@ public interface ICommonService {
List
<
LinkedHashMap
>
getCreatTreeByInstallation
();
List
<
LinkedHashMap
>
getCreatTreeByInstallation
();
List
<
LinkedHashMap
>
getCreatTreeByInstallationTree
();
List
<
LinkedHashMap
>
getCreatTreeByInstallationTree
();
/**
* 接收机构树
* @return List<Map>
* @param bizType 业务类型: notice-告知类, register-登记类
*/
List
<
LinkedHashMap
>
getReceiveUnitTree
(
String
bizType
);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @
3a23461b
...
@@ -59,6 +59,7 @@ import org.springframework.web.multipart.MultipartFile;
...
@@ -59,6 +59,7 @@ import org.springframework.web.multipart.MultipartFile;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.*
;
import
java.io.*
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
...
@@ -115,6 +116,11 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -115,6 +116,11 @@ public class CommonServiceImpl implements ICommonService {
//管辖机构redis缓存key
//管辖机构redis缓存key
private
static
final
String
REGULATOR_UNIT_TREE
=
"REGULATOR_UNIT_TREE"
;
private
static
final
String
REGULATOR_UNIT_TREE
=
"REGULATOR_UNIT_TREE"
;
/**
* 接收机构redis缓存key前置
*/
private
static
final
String
PREFIX_NOTICE_RECEIVE_UNIT_TREE
=
"NOTICE_RECEIVE_UNIT_TREE"
;
//管辖机构redis缓存key
//管辖机构redis缓存key
private
static
final
String
REGULATOR_UNIT_TREE_ALL
=
"REGULATOR_UNIT_TREE_ALL"
;
private
static
final
String
REGULATOR_UNIT_TREE_ALL
=
"REGULATOR_UNIT_TREE_ALL"
;
...
@@ -309,6 +315,13 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -309,6 +315,13 @@ public class CommonServiceImpl implements ICommonService {
return
resultTree
;
return
resultTree
;
}
}
@Override
public
List
<
LinkedHashMap
>
getReceiveUnitTree
(
String
bizType
)
{
List
<
LinkedHashMap
>
result
=
(
List
<
LinkedHashMap
>)
redisUtils
.
get
(
genRedisKey
(
bizType
));
//判断redis是否存在接收机构树
return
!
ObjectUtils
.
isEmpty
(
result
)
?
result
:
creatReceiveUnitTree
(
bizType
);
}
@Override
@Override
public
List
<
LinkedHashMap
>
getTree
(
ReginParams
reginParams
)
{
public
List
<
LinkedHashMap
>
getTree
(
ReginParams
reginParams
)
{
...
@@ -334,6 +347,23 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -334,6 +347,23 @@ public class CommonServiceImpl implements ICommonService {
return
resultTree
;
return
resultTree
;
}
}
private
List
<
LinkedHashMap
>
creatReceiveUnitTree
(
String
bizType
)
{
FeignClientResult
tree
=
privilegeFeginService
.
tree
(
RequestContext
.
getToken
(),
RequestContext
.
getAppKey
(),
RequestContext
.
getProduct
());
List
<
LinkedHashMap
>
result
=
(
List
<
LinkedHashMap
>)
tree
.
getResult
();
// 删除非监管机构的单位
deleteData
(
result
,
REGULATOR_UNIT
);
// 过滤符合指定业务的监管单位
filterTreeDataByType
(
result
,
bizType
);
List
<
LinkedHashMap
>
supervisionTree
=
result
.
stream
().
filter
(
e
->
code
.
equals
(
e
.
get
(
"orgCode"
))).
collect
(
Collectors
.
toList
());
List
<
LinkedHashMap
>
resultTree
=
updateNullChildren
(
supervisionTree
);
redisUtils
.
set
(
genRedisKey
(
bizType
),
resultTree
,
60
*
60
*
2
);
return
resultTree
;
}
private
String
genRedisKey
(
String
bizType
)
{
return
PREFIX_NOTICE_RECEIVE_UNIT_TREE
+
"_"
+
bizType
;
}
@Override
@Override
public
List
<
LinkedHashMap
>
getApproveTree
(
ReginParams
reginParams
)
{
public
List
<
LinkedHashMap
>
getApproveTree
(
ReginParams
reginParams
)
{
// 企业逻辑
// 企业逻辑
...
@@ -354,7 +384,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -354,7 +384,7 @@ public class CommonServiceImpl implements ICommonService {
FeignClientResult
tree
=
privilegeFeginService
.
queryAgencyTreeForCache
(
RequestContext
.
getToken
(),
RequestContext
.
getAppKey
(),
RequestContext
.
getProduct
());
FeignClientResult
tree
=
privilegeFeginService
.
queryAgencyTreeForCache
(
RequestContext
.
getToken
(),
RequestContext
.
getAppKey
(),
RequestContext
.
getProduct
());
List
<
LinkedHashMap
>
result
=
(
List
<
LinkedHashMap
>)
tree
.
getResult
();
List
<
LinkedHashMap
>
result
=
(
List
<
LinkedHashMap
>)
tree
.
getResult
();
List
<
LinkedHashMap
>
children
=
(
List
<
LinkedHashMap
>)
result
.
get
(
0
).
get
(
"children"
);
List
<
LinkedHashMap
>
children
=
(
List
<
LinkedHashMap
>)
result
.
get
(
0
).
get
(
"children"
);
List
<
LinkedHashMap
>
treeData
=
deleteTreeData
(
children
,
REGULATOR_UNIT
);
List
<
LinkedHashMap
>
treeData
=
deleteTreeData
(
children
,
REGULATOR_UNIT
);
List
<
LinkedHashMap
>
resultTree
=
updateNullChildren
(
treeData
);
List
<
LinkedHashMap
>
resultTree
=
updateNullChildren
(
treeData
);
redisUtils
.
set
(
ADMINISTRATION_UNIT_TREE
,
resultTree
);
redisUtils
.
set
(
ADMINISTRATION_UNIT_TREE
,
resultTree
);
return
resultTree
;
return
resultTree
;
...
@@ -366,7 +396,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -366,7 +396,7 @@ public class CommonServiceImpl implements ICommonService {
return
resourceJson
.
get
(
type
);
return
resourceJson
.
get
(
type
);
}
}
private
List
<
LinkedHashMap
>
deleteTreeData
(
List
<
LinkedHashMap
>
result
,
String
companyType
)
{
private
List
<
LinkedHashMap
>
deleteTreeData
(
List
<
LinkedHashMap
>
result
,
String
companyType
)
{
Iterator
it
=
result
.
iterator
();
Iterator
it
=
result
.
iterator
();
while
(
it
.
hasNext
())
{
while
(
it
.
hasNext
())
{
LinkedHashMap
e
=
(
LinkedHashMap
)
it
.
next
();
LinkedHashMap
e
=
(
LinkedHashMap
)
it
.
next
();
...
@@ -379,22 +409,44 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -379,22 +409,44 @@ public class CommonServiceImpl implements ICommonService {
it
.
remove
();
it
.
remove
();
}
}
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
deleteTreeData
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
),
companyType
);
deleteTreeData
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
),
companyType
);
}
}
return
result
;
}
private
List
<
LinkedHashMap
>
filterTreeDataByType
(
List
<
LinkedHashMap
>
result
,
String
type
)
{
Iterator
<
LinkedHashMap
>
it
=
result
.
iterator
();
while
(
it
.
hasNext
())
{
LinkedHashMap
e
=
it
.
next
();
if
(!(
e
.
get
(
"description"
)
!=
null
&&
(
e
.
get
(
"description"
).
toString
().
contains
(
type
)
||
e
.
get
(
"description"
).
toString
().
contains
(
"all"
))))
{
// 过滤非全部(all)公共及指定类型外的
it
.
remove
();
}
// disabled的节点设置下不可编辑属性
if
(
e
.
get
(
"description"
)
!=
null
&&
e
.
get
(
"description"
).
toString
().
contains
(
type
+
"-disabled"
))
{
// 过滤非全部(all)公共及指定类型外的
e
.
put
(
"disabled"
,
true
);
}
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
filterTreeDataByType
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
),
type
);
}
}
}
}
return
result
;
return
result
;
}
}
private
List
<
LinkedHashMap
>
deleteData
(
List
<
LinkedHashMap
>
result
,
String
companyType
)
{
private
List
<
LinkedHashMap
>
deleteData
(
List
<
LinkedHashMap
>
result
,
String
companyType
)
{
Iterator
it
=
result
.
iterator
();
Iterator
it
=
result
.
iterator
();
while
(
it
.
hasNext
())
{
while
(
it
.
hasNext
())
{
LinkedHashMap
e
=
(
LinkedHashMap
)
it
.
next
();
LinkedHashMap
e
=
(
LinkedHashMap
)
it
.
next
();
// 删除非
行政审批局
// 删除非
指定的单位类型
if
(!
e
.
get
(
"companyType"
).
toString
().
contains
(
companyType
))
{
if
(!
e
.
get
(
"companyType"
).
toString
().
contains
(
companyType
))
{
it
.
remove
();
it
.
remove
();
}
}
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
if
(!
ObjectUtils
.
isEmpty
(
e
.
get
(
"children"
)))
{
deleteData
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
),
companyType
);
deleteData
((
List
<
LinkedHashMap
>)
e
.
get
(
"children"
),
companyType
);
}
}
}
}
return
result
;
return
result
;
...
@@ -563,7 +615,8 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -563,7 +615,8 @@ public class CommonServiceImpl implements ICommonService {
/**
/**
* 返回附件
* 返回附件
* @param map 参数
*
* @param map 参数
* @param response 响应
* @param response 响应
*/
*/
@Override
@Override
...
@@ -603,11 +656,11 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -603,11 +656,11 @@ public class CommonServiceImpl implements ICommonService {
for
(
Map
.
Entry
<
String
,
Object
>
param
:
map
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
Object
>
param
:
map
.
entrySet
())
{
// 设置文本域的字体为中文字体
// 设置文本域的字体为中文字体
acroFields
.
setFieldProperty
(
param
.
getKey
(),
"textfont"
,
font
,
null
);
acroFields
.
setFieldProperty
(
param
.
getKey
(),
"textfont"
,
font
,
null
);
// 设置字体大小
// 设置字体大小
acroFields
.
setFieldProperty
(
param
.
getKey
(),
"textsize"
,
12.0f
,
null
);
acroFields
.
setFieldProperty
(
param
.
getKey
(),
"textsize"
,
12.0f
,
null
);
// 将 map 中的值写到 pdf 模板对应的文本域中
// 将 map 中的值写到 pdf 模板对应的文本域中
acroFields
.
setField
(
param
.
getKey
(),
param
.
getValue
()
+
""
);
acroFields
.
setField
(
param
.
getKey
(),
param
.
getValue
()
+
""
);
}
}
...
@@ -731,7 +784,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -731,7 +784,7 @@ public class CommonServiceImpl implements ICommonService {
noticeObj
.
put
(
"receiveCompanyCode"
,
!
ObjectUtils
.
isEmpty
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
?
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
:
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode1"
)));
noticeObj
.
put
(
"receiveCompanyCode"
,
!
ObjectUtils
.
isEmpty
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
?
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
:
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode1"
)));
noticeObj
.
put
(
"techInfo"
,
techInfoObj
);
noticeObj
.
put
(
"techInfo"
,
techInfoObj
);
JSONObject
jsonObject
=
new
JSONObject
(
noticeObj
);
JSONObject
jsonObject
=
new
JSONObject
(
noticeObj
);
return
jgChangeRegistrationReformServiceImpl
.
save
(
jsonObject
);
return
jgChangeRegistrationReformServiceImpl
.
save
(
jsonObject
);
}
else
if
(
type
.
equals
(
ApplicationFormTypeEnum
.
YZBG
.
getBusinessCode
()))
{
}
else
if
(
type
.
equals
(
ApplicationFormTypeEnum
.
YZBG
.
getBusinessCode
()))
{
noticeObj
.
put
(
"receiveOrgCode"
,
!
ObjectUtils
.
isEmpty
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
?
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
:
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode1"
)));
noticeObj
.
put
(
"receiveOrgCode"
,
!
ObjectUtils
.
isEmpty
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
?
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode"
))
:
String
.
valueOf
(
basicObj
.
get
(
"receiveOrgCreditCode1"
)));
...
@@ -776,6 +829,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -776,6 +829,7 @@ public class CommonServiceImpl implements ICommonService {
}
}
return
null
;
return
null
;
}
}
@Override
@Override
public
Object
transfer
(
Map
<
String
,
Object
>
map
)
{
public
Object
transfer
(
Map
<
String
,
Object
>
map
)
{
if
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"nextTaskId"
))
||
map
.
get
(
"nextTaskId"
)
==
null
)
{
if
(
ObjectUtils
.
isEmpty
(
map
.
get
(
"nextTaskId"
))
||
map
.
get
(
"nextTaskId"
)
==
null
)
{
...
@@ -825,7 +879,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -825,7 +879,7 @@ public class CommonServiceImpl implements ICommonService {
String
id
=
commonMapper
.
selectBusinessData
(
tableName
,
instanceId
);
String
id
=
commonMapper
.
selectBusinessData
(
tableName
,
instanceId
);
id
=
ObjectUtils
.
isEmpty
(
id
)
?
assignee
:
id
+
","
+
assignee
;
id
=
ObjectUtils
.
isEmpty
(
id
)
?
assignee
:
id
+
","
+
assignee
;
//修改业务数据
//修改业务数据
commonMapper
.
updateBusinessData
(
tableName
,
assignee
,
id
,
instanceId
,
nextTaskId
);
commonMapper
.
updateBusinessData
(
tableName
,
assignee
,
id
,
instanceId
,
nextTaskId
);
return
Boolean
.
TRUE
;
return
Boolean
.
TRUE
;
}
}
...
@@ -1228,6 +1282,7 @@ public class CommonServiceImpl implements ICommonService {
...
@@ -1228,6 +1282,7 @@ public class CommonServiceImpl implements ICommonService {
});
});
return
workflowResultDtoList
;
return
workflowResultDtoList
;
}
}
public
List
<
LinkedHashMap
>
getCompanyUser
(
Long
companyId
)
{
public
List
<
LinkedHashMap
>
getCompanyUser
(
Long
companyId
)
{
FeignClientResult
result
=
privilegeFeginService
.
getCompanyUser
(
companyId
);
FeignClientResult
result
=
privilegeFeginService
.
getCompanyUser
(
companyId
);
List
<
LinkedHashMap
>
list
=
(
List
<
LinkedHashMap
>)
result
.
getResult
();
List
<
LinkedHashMap
>
list
=
(
List
<
LinkedHashMap
>)
result
.
getResult
();
...
...
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