|
|
@@ -289,7 +289,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
@Override
|
|
|
public String updateFireEventImage(DaHuaEventBO eventBO) throws ClientException {
|
|
|
// 通过eventCode查询详情
|
|
|
- CentereventTEventcatalogue centereventTEventcatalogue = centereventTEventcatalogueService.selectCentereventTEventcatalogueByEventCode(eventBO.getEventCode());
|
|
|
+ CentereventTEventcatalogue centereventTEventcatalogue = centereventTEventcatalogueService.selectCentereventTEventcatalogueById(eventBO.getEventCode());
|
|
|
// 确认为 火情事件 并且 状态为上报
|
|
|
if ("1".equals(centereventTEventcatalogue.getEventType()) && "forest_event_status_1".equals(centereventTEventcatalogue.getEventStatusValue())) {
|
|
|
// 按照指定格式拼接路径
|
|
|
@@ -308,7 +308,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
ArrayList<String> pictures = responseData.getJSONObject("data").getObject("pictures", ArrayList.class);
|
|
|
if (pictures.isEmpty()) {
|
|
|
logger.error("获取的图片集合为空-----请求结果：{}", prBody);
|
|
|
- return "图片未更新, 请稍后重试";
|
|
|
+ return "暂无图片, 请稍后重试";
|
|
|
}
|
|
|
// 添加新附件
|
|
|
List<CenterdataTAttach> attachList = new ArrayList<>();
|
|
|
@@ -322,10 +322,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
|
|
|
attachList.add(tAttach);
|
|
|
}
|
|
|
return remoteDataService.delAndInsertBatch(JSON.toJSONString(attachList)).getMsg();
|
|
|
- } else {
|
|
|
- logger.error("请求远端异常-----请求结果：{}", prBody);
|
|
|
- return "请求异常, 请联系管理员";
|
|
|
}
|
|
|
+ logger.error("请求远端异常-----请求结果：{}", prBody);
|
|
|
+ return "请求异常, 请联系管理员";
|
|
|
}
|
|
|
return "请刷新后重试";
|
|
|
}
|
lyq