From 2ca7b2422080a108a0d85cc36d5f16f0b06ab731 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 22 六月 2021 14:27:56 +0800
Subject: [PATCH] [修改]修改上传事件的标题取值问题
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..a65c8d2 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
@@ -59,7 +59,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,7 +99,7 @@
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());
@@ -123,7 +123,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 +168,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,8 +186,10 @@
eventInfo.setDataId(eventInfoVo.getId().toString());
//获取系统网格员映射的浪潮网格员对于的用户ID
eventInfo.setUserId(lcGridUserId);
- eventInfo.setHandleTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
- eventInfo.setCaseName(eventInfoVo.getEventTitle());
+ if (eventInfoVo.getProcessDate() != null) {
+ eventInfo.setHandleTime(String.valueOf(eventInfoVo.getProcessDate().getTime()));
+ }
+ eventInfo.setCaseName(gridData.getGridName().concat(caseTypeName).concat(eventInfoVo.getEventTitle()));
submitEventRegister(eventInfo);
log.info("定时向浪潮服务器提交网格事件登记结束");
log.info("开始上传附件信息");
--
Gitblit v1.7.1