From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
index c02d0ce..3685d5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -4,9 +4,12 @@
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonObject;
import com.panzhihua.common.api.LangchaoApiConstants;
+import com.panzhihua.common.api.LcReturnObject;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.enums.LocalEventToLangChaoEventTypeEnum;
import com.panzhihua.common.model.dtos.api.EventFile;
@@ -59,7 +62,7 @@
*/
private String getAuthToken() {
ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
- if(valueOperations.get(LangchaoApiConstants.LANG_CHAO_TOKEN) ==null){
+ if (valueOperations.get(LangchaoApiConstants.LANG_CHAO_TOKEN) == null) {
saveTokenFromRemoteRequest("18080799023", "123456");
}
return valueOperations.get(LangchaoApiConstants.LANG_CHAO_TOKEN);
@@ -99,10 +102,10 @@
Map m = mapper.readValue(mapper.writeValueAsString(eventInfo), Map.class);
request.form(m);
} catch (JsonProcessingException e) {
- log.info("方法submitEventRegister发生错误：{}",e.getMessage());
+ log.info("方法submitEventRegister发生错误：{}", e.getMessage());
}
HttpResponse result = request.execute();
- log.info(result.body());
+ log.info("submit上传浪潮事件信息：{}",result.body());
return result.body();
}
@@ -123,7 +126,7 @@
file.delete();
return R.ok(result.body());
} catch (Exception e) {
- log.info("方法submitEventRelationFile发生错误：{}",e.getMessage());
+ log.info("方法submitEventRelationFile发生错误：{}", e.getMessage());
}
return R.fail();
}
@@ -168,8 +171,13 @@
EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData();
eventInfo.setGridName(gridData.getGridName());
eventInfo.setCaseTypeCode(LocalEventToLangChaoEventTypeEnum.getCodeByName(eventInfoVo.getEventType()));
- eventInfo.setCaseTypeName(LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType()));
- eventInfo.setHappenTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
+ String caseTypeName= LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType());
+ eventInfo.setCaseTypeName(caseTypeName);
+ if (eventInfoVo.getEventCategory() != 1L) {
+ eventInfo.setHappenTime(String.valueOf(eventInfoVo.getPropagandaTime().getTime()));
+ } else {
+ eventInfo.setHappenTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
+ }
eventInfo.setHappenAddress(eventInfoVo.getHappenAddress());
String[] data = eventInfoVo.getHappentLatLng().split(",");
eventInfo.setLongitude(data[0]);
@@ -181,19 +189,25 @@
eventInfo.setDataId(eventInfoVo.getId().toString());
//获取系统网格员映射的浪潮网格员对于的用户ID
eventInfo.setUserId(lcGridUserId);
- eventInfo.setHandleTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
- eventInfo.setCaseName(eventInfoVo.getEventTitle());
- submitEventRegister(eventInfo);
- log.info("定时向浪潮服务器提交网格事件登记结束");
- log.info("开始上传附件信息");
- List<EventResourceVO> picsList = eventInfoVo.getPics();
- uploadLcApiEventFile(eventInfoVo, picsList, "png");
- List<EventResourceVO> audiosList = eventInfoVo.getAudios();
- uploadLcApiEventFile(eventInfoVo, audiosList, "mp3");
- List<EventResourceVO> videoList = eventInfoVo.getVideos();
- uploadLcApiEventFile(eventInfoVo, videoList, "mp4");
- log.info("结束上传附件信息");
- gridService.updateLcUploadFlag(eventInfoVo.getId());
+ if (eventInfoVo.getProcessDate() != null) {
+ eventInfo.setHandleTime(String.valueOf(eventInfoVo.getProcessDate().getTime()));
+ }
+ eventInfo.setCaseName(gridData.getGridName().concat(caseTypeName).concat(eventInfoVo.getEventTitle()));
+ String remoteData = submitEventRegister(eventInfo);
+ LcReturnObject lcReturnObject=JSONObject.parseObject(remoteData, LcReturnObject.class);
+ log.info("提交浪潮服务器，接口返回结果为：{}",remoteData);
+ if(lcReturnObject.getSuccess()){
+ log.info("定时向浪潮服务器提交网格事件登记结束");
+ log.info("开始上传附件信息");
+ List<EventResourceVO> picsList = eventInfoVo.getPics();
+ uploadLcApiEventFile(eventInfoVo, picsList, "png");
+ List<EventResourceVO> audiosList = eventInfoVo.getAudios();
+ uploadLcApiEventFile(eventInfoVo, audiosList, "mp3");
+ List<EventResourceVO> videoList = eventInfoVo.getVideos();
+ uploadLcApiEventFile(eventInfoVo, videoList, "mp4");
+ log.info("结束上传附件信息");
+ gridService.updateLcUploadFlag(eventInfoVo.getId());
+ }
});
}
--
Gitblit v1.7.1