From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 3685d5f..4700bb5 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
@@ -7,7 +7,6 @@
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;
@@ -19,6 +18,7 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.service.grid.GridService;
+import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.serviceapi.biz.LcApiService;
import com.panzhihua.serviceapi.model.dto.LcGridData;
import lombok.extern.slf4j.Slf4j;
@@ -105,7 +105,7 @@
log.info("方法submitEventRegister发生错误：{}", e.getMessage());
}
HttpResponse result = request.execute();
- log.info("submit上传浪潮事件信息：{}",result.body());
+ log.info("submit上传浪潮事件信息：{}", result.body());
return result.body();
}
@@ -171,7 +171,7 @@
EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData();
eventInfo.setGridName(gridData.getGridName());
eventInfo.setCaseTypeCode(LocalEventToLangChaoEventTypeEnum.getCodeByName(eventInfoVo.getEventType()));
- String caseTypeName= LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType());
+ String caseTypeName = LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType());
eventInfo.setCaseTypeName(caseTypeName);
if (eventInfoVo.getEventCategory() != 1L) {
eventInfo.setHappenTime(String.valueOf(eventInfoVo.getPropagandaTime().getTime()));
@@ -189,14 +189,13 @@
eventInfo.setDataId(eventInfoVo.getId().toString());
//获取系统网格员映射的浪潮网格员对于的用户ID
eventInfo.setUserId(lcGridUserId);
- if (eventInfoVo.getProcessDate() != null) {
- eventInfo.setHandleTime(String.valueOf(eventInfoVo.getProcessDate().getTime()));
- }
- eventInfo.setCaseName(gridData.getGridName().concat(caseTypeName).concat(eventInfoVo.getEventTitle()));
+ eventInfo.setHandleTime(DateUtils.getCurrentDateTimeStamp().toString());
+ eventInfo.setCaseName(gridData.getGridName().concat(caseTypeName));
+ log.info("事件请求数据：{}", JSONObject.toJSONString(eventInfo));
String remoteData = submitEventRegister(eventInfo);
- LcReturnObject lcReturnObject=JSONObject.parseObject(remoteData, LcReturnObject.class);
- log.info("提交浪潮服务器，接口返回结果为：{}",remoteData);
- if(lcReturnObject.getSuccess()){
+ LcReturnObject lcReturnObject = JSONObject.parseObject(remoteData, LcReturnObject.class);
+ log.info("提交浪潮服务器，接口返回结果为：{}", remoteData);
+ if (lcReturnObject.getSuccess()) {
log.info("定时向浪潮服务器提交网格事件登记结束");
log.info("开始上传附件信息");
List<EventResourceVO> picsList = eventInfoVo.getPics();
--
Gitblit v1.7.1