Commit 66a54c63 authored by zhengjiangtao's avatar zhengjiangtao

修改bug

parent 67be7a1c
...@@ -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;
/** /**
* 检查项 * 检查项
*/ */
...@@ -91,4 +94,14 @@ public class PointCheckInfoBusinessRespone { ...@@ -91,4 +94,14 @@ public class PointCheckInfoBusinessRespone {
this.userId = userId; this.userId = userId;
} }
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
} }
...@@ -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();
......
...@@ -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);
/** /**
......
...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment