Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
AmosBankPatrolRoot
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
1
Merge Requests
1
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
bank
AmosBankPatrolRoot
Commits
66a54c63
Commit
66a54c63
authored
Jun 17, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
67be7a1c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
3 deletions
+22
-3
PointCheckInfoBusinessRespone.java
...l/common/core/response/PointCheckInfoBusinessRespone.java
+13
-0
Safety3DDataSendServiceImpl.java
...ce/business/service/impl/Safety3DDataSendServiceImpl.java
+7
-1
ISafety3DDataSendService.java
...vice/business/service/intfc/ISafety3DDataSendService.java
+1
-1
AsyncTask.java
...com/yeejoin/amos/patrol/service/core/async/AsyncTask.java
+1
-1
No files found.
AmosBankPatrolCommon/src/main/java/com/yeejoin/amos/patrol/common/core/response/PointCheckInfoBusinessRespone.java
View file @
66a54c63
...
@@ -23,6 +23,9 @@ public class PointCheckInfoBusinessRespone {
...
@@ -23,6 +23,9 @@ public class PointCheckInfoBusinessRespone {
* 巡检人ID
* 巡检人ID
*/
*/
private
String
userId
;
private
String
userId
;
private
String
userName
;
/**
/**
* 检查项
* 检查项
*/
*/
...
@@ -90,5 +93,15 @@ public class PointCheckInfoBusinessRespone {
...
@@ -90,5 +93,15 @@ public class PointCheckInfoBusinessRespone {
public
void
setUserId
(
String
userId
)
{
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
this
.
userId
=
userId
;
}
}
public
String
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
}
}
}
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/impl/Safety3DDataSendServiceImpl.java
View file @
66a54c63
...
@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
...
@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -210,9 +211,14 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
...
@@ -210,9 +211,14 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
* 推送巡检记录到业务
* 推送巡检记录到业务
*/
*/
@Override
@Override
public
PointCheckInfoBusinessRespone
pointCheckInfoPushToB
(
Long
checkId
)
{
public
PointCheckInfoBusinessRespone
pointCheckInfoPushToB
(
String
toke
,
String
product
,
String
appKey
,
Long
checkId
)
{
//获取推送内容
//获取推送内容
PointCheckInfoBusinessRespone
pb
=
checkMapper
.
getCheckInfoBusinessById
(
checkId
);
PointCheckInfoBusinessRespone
pb
=
checkMapper
.
getCheckInfoBusinessById
(
checkId
);
AgencyUserModel
userById
=
remoteSecurityService
.
getUserById
(
toke
,
product
,
appKey
,
pb
.
getUserId
());
if
(!
StringUtils
.
isEmpty
(
userById
.
getUserName
()))
{
pb
.
setUserName
(
userById
.
getUserName
());
}
// //获取到推送点的状态
// //获取到推送点的状态
// Point point = iPointDao.findOne(pb.getId());
// Point point = iPointDao.findOne(pb.getId());
// String pointStatus = point.getStatus();
// String pointStatus = point.getStatus();
...
...
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/intfc/ISafety3DDataSendService.java
View file @
66a54c63
...
@@ -19,7 +19,7 @@ public interface ISafety3DDataSendService {
...
@@ -19,7 +19,7 @@ public interface ISafety3DDataSendService {
/**
/**
* 巡检点检查后状态推送yewu
* 巡检点检查后状态推送yewu
*/
*/
public
PointCheckInfoBusinessRespone
pointCheckInfoPushToB
(
Long
checkId
);
public
PointCheckInfoBusinessRespone
pointCheckInfoPushToB
(
String
toke
,
String
product
,
String
appKey
,
Long
checkId
);
/**
/**
...
...
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/core/async/AsyncTask.java
View file @
66a54c63
...
@@ -164,7 +164,7 @@ public class AsyncTask {
...
@@ -164,7 +164,7 @@ public class AsyncTask {
cacheMap
.
setex
(
TOKE
,
toke
,
times
);
cacheMap
.
setex
(
TOKE
,
toke
,
times
);
}
}
//巡检结果推送至业务
//巡检结果推送至业务
safety3DDataSend
.
pointCheckInfoPushToB
(
checkId
);
safety3DDataSend
.
pointCheckInfoPushToB
(
toke
.
getToke
(),
toke
.
getProduct
(),
toke
.
getAppKey
(),
checkId
);
safety3DDataSend
.
pointCheckInfoPush
(
toke
.
getToke
(),
toke
.
getProduct
(),
toke
.
getAppKey
(),
checkId
);
safety3DDataSend
.
pointCheckInfoPush
(
toke
.
getToke
(),
toke
.
getProduct
(),
toke
.
getAppKey
(),
checkId
);
return
new
AsyncResult
<
Boolean
>(
true
);
return
new
AsyncResult
<
Boolean
>(
true
);
}
}
...
...
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