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
37c6f426
Commit
37c6f426
authored
Mar 15, 2022
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加对于工作流任务不存在,返回为Null时的判断,解决app端任务统计之后数据查看报错的问题
parent
0f454d9e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
LatentDangerServiceImpl.java
...patrol/business/service/impl/LatentDangerServiceImpl.java
+9
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @
37c6f426
...
@@ -7,6 +7,7 @@ import com.google.common.base.Joiner;
...
@@ -7,6 +7,7 @@ import com.google.common.base.Joiner;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Sets
;
import
com.google.common.collect.Sets
;
import
com.itextpdf.text.pdf.PdfStructTreeController.returnType
;
import
com.yeejoin.amos.boot.biz.common.bo.DepartmentBo
;
import
com.yeejoin.amos.boot.biz.common.bo.DepartmentBo
;
import
com.yeejoin.amos.boot.biz.common.bo.RoleBo
;
import
com.yeejoin.amos.boot.biz.common.bo.RoleBo
;
import
com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl
;
import
com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl
;
...
@@ -79,6 +80,8 @@ import com.yeejoin.amos.patrol.dao.entity.PointClassify;
...
@@ -79,6 +80,8 @@ import com.yeejoin.amos.patrol.dao.entity.PointClassify;
import
com.yeejoin.amos.patrol.exception.YeeException
;
import
com.yeejoin.amos.patrol.exception.YeeException
;
import
com.yeejoin.amos.patrol.feign.RemoteSecurityService
;
import
com.yeejoin.amos.patrol.feign.RemoteSecurityService
;
import
com.yeejoin.amos.patrol.mqtt.WebMqttComponent
;
import
com.yeejoin.amos.patrol.mqtt.WebMqttComponent
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -107,6 +110,7 @@ import java.util.Map;
...
@@ -107,6 +110,7 @@ import java.util.Map;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
org
.
hamcrest
.
CoreMatchers
.
nullValue
;
import
static
org
.
typroject
.
tyboot
.
core
.
foundation
.
context
.
RequestContext
.
getProduct
;
import
static
org
.
typroject
.
tyboot
.
core
.
foundation
.
context
.
RequestContext
.
getProduct
;
@Service
(
"latentDangerService"
)
@Service
(
"latentDangerService"
)
...
@@ -565,13 +569,17 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -565,13 +569,17 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
AgencyUserModel
user
,
AgencyUserModel
user
,
String
loginOrgCode
,
String
loginOrgCode
,
String
deptId
)
{
String
deptId
)
{
JSONObject
respBody
;
List
<
LatentDangerListVo
>
voList
=
Lists
.
newArrayList
();
JSONObject
respBody
;
Date
startDate
=
new
Date
();
Date
startDate
=
new
Date
();
if
(
latentDangerListParam
.
getIsHandle
())
{
if
(
latentDangerListParam
.
getIsHandle
())
{
respBody
=
remoteWorkFlowService
.
completedPageTask
(
user
.
getUserName
(),
latentDangerListParam
.
getBelongType
());
respBody
=
remoteWorkFlowService
.
completedPageTask
(
user
.
getUserName
(),
latentDangerListParam
.
getBelongType
());
}
else
{
}
else
{
respBody
=
remoteWorkFlowService
.
pageTask
(
user
.
getUserId
(),
latentDangerListParam
.
getBelongType
());
respBody
=
remoteWorkFlowService
.
pageTask
(
user
.
getUserId
(),
latentDangerListParam
.
getBelongType
());
}
}
if
(
ObjectUtils
.
isEmpty
(
respBody
))
{
return
null
;
}
Date
endDate
=
new
Date
();
Date
endDate
=
new
Date
();
logger
.
info
(
"-------------------------工作流列表时间"
+
(
endDate
.
getTime
()
-
startDate
.
getTime
()));
logger
.
info
(
"-------------------------工作流列表时间"
+
(
endDate
.
getTime
()
-
startDate
.
getTime
()));
JSONArray
taskJsonList
=
respBody
.
getJSONArray
(
"data"
);
JSONArray
taskJsonList
=
respBody
.
getJSONArray
(
"data"
);
...
@@ -604,7 +612,6 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -604,7 +612,6 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
// map.put("permissions", permissions);
// map.put("permissions", permissions);
// List<LatentDangerBo> list = latentDangerMapper.listByMap(map);
// List<LatentDangerBo> list = latentDangerMapper.listByMap(map);
// Long count = 0L;
// Long count = 0L;
List
<
LatentDangerListVo
>
voList
=
Lists
.
newArrayList
();
Date
date
=
new
Date
();
Date
date
=
new
Date
();
if
(!
CollectionUtils
.
isEmpty
(
dangerList
))
{
if
(!
CollectionUtils
.
isEmpty
(
dangerList
))
{
Set
<
String
>
userIds
=
Sets
.
newHashSet
();
Set
<
String
>
userIds
=
Sets
.
newHashSet
();
...
...
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