From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java
index 2815ff7..710acb4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java
@@ -53,6 +53,13 @@
log.info(result);
}
+
+ @Test
+ void automationUploadEventAndFile() {
+ lcApiService.automationUploadEventAndFile();
+ }
+
+
@Test
void submitEventRegister() {
EventInfo eventInfo = new EventInfo();
@@ -100,7 +107,7 @@
@Test
void submitEventRegisterJobTest() {
log.info("定时向浪潮服务器提交网格事件登记开始");
- R<EventDetailsVO> event = gridService.eventDetails(1111113L);
+ R<EventDetailsVO> event = gridService.eventDetails(4545676L);
EventDetailsVO eventInfoVo = event.getData();
EventInfo eventInfo = new EventInfo();
String lcGrid = gridService.getLcGridIdByLocal(eventInfoVo.getGridId());
@@ -110,7 +117,8 @@
EventGridDataDetailsVO gridData = (EventGridDataDetailsVO) grid.getData();
eventInfo.setGridName(gridData.getGridName());
eventInfo.setCaseTypeCode(LocalEventToLangChaoEventTypeEnum.getCodeByName(eventInfoVo.getEventType()));
- eventInfo.setCaseTypeName(LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType()));
+ String caseTypeName= LocalEventToLangChaoEventTypeEnum.getEventNameByCode(eventInfoVo.getEventType());
+ eventInfo.setCaseTypeName(caseTypeName);
eventInfo.setHappenTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
eventInfo.setHappenAddress(eventInfoVo.getHappenAddress());
String[] data = eventInfoVo.getHappentLatLng().split(",");
@@ -124,7 +132,7 @@
//获取系统网格员映射的浪潮网格员对于的用户ID
eventInfo.setUserId(lcGridUserId);
eventInfo.setHandleTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
- eventInfo.setCaseName(eventInfoVo.getEventTitle());
+ eventInfo.setCaseName(gridData.getGridName().concat(caseTypeName).concat(eventInfoVo.getEventTitle()));
lcApiService.submitEventRegister(eventInfo);
log.info("定时向浪潮服务器提交网格事件登记结束");
log.info("开始上传附件图片信息");
--
Gitblit v1.7.1