|
@@ -377,10 +377,10 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
if("1".equals(centereventTEventcatalogue.getEventType()) && "forest_event_status_1".equals(centereventTEventcatalogue.getEventStatusValue())){
|
|
if("1".equals(centereventTEventcatalogue.getEventType()) && "forest_event_status_1".equals(centereventTEventcatalogue.getEventStatusValue())){
|
|
//按照指定格式拼接路径
|
|
//按照指定格式拼接路径
|
|
String url = "alarmCode=" + RemoteApiUtil.encodeUrl(eventBO.getAlarmCode()) + "&dbType=" + RemoteApiUtil.encodeUrl(eventBO.getDbType()) + "&alarmDate=" + RemoteApiUtil.encodeUrl(eventBO.getAlarmDate());
|
|
String url = "alarmCode=" + RemoteApiUtil.encodeUrl(eventBO.getAlarmCode()) + "&dbType=" + RemoteApiUtil.encodeUrl(eventBO.getDbType()) + "&alarmDate=" + RemoteApiUtil.encodeUrl(eventBO.getAlarmDate());
|
|
- //获取大华token
|
|
|
|
- String token = RemoteApiUtil.getInstance().getToken();//3c001989-3ba8-48ff-96f4-c2963455aa6e
|
|
|
|
|
|
+ //如果请求参数中携带了大华token则使用;如果没有携带,则请求监控中心获取并拼接token
|
|
|
|
+ String token = (null == eventBO.getToken() || "".equals(eventBO.getToken())) ? HEADER_VALUE + RemoteApiUtil.getInstance().getToken() : eventBO.getToken();//3c001989-3ba8-48ff-96f4-c2963455aa6e
|
|
//创建请求实体 并 发送请求
|
|
//创建请求实体 并 发送请求
|
|
- String prBody = new IccHttpHttpRequest(detailUrl + url).header(HEADER_KEY, HEADER_VALUE + token).execute();
|
|
|
|
|
|
+ String prBody = new IccHttpHttpRequest(detailUrl + url).header(HEADER_KEY, token).execute();
|
|
//打印响应结果
|
|
//打印响应结果
|
|
JSONObject responseData = JSON.parseObject(prBody);
|
|
JSONObject responseData = JSON.parseObject(prBody);
|
|
if(responseData.getBoolean("success")){
|
|
if(responseData.getBoolean("success")){
|