From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 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/serviceapi/biz/impl/LcApiServiceImplTest.java
similarity index 90%
rename from springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/service_api/biz/impl/LcApiServiceImplTest.java
rename to springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
index 710acb4..0ce59cf 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/serviceapi/biz/impl/LcApiServiceImplTest.java
@@ -1,4 +1,4 @@
-package com.panzhihua.service_api.biz.impl;
+package com.panzhihua.serviceapi.biz.impl;
 
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -95,12 +95,11 @@
     void submitEventRelationFile() throws URISyntaxException {
         EventFile eventFile = new EventFile();
         eventFile.setDataId("1111116");
-        //eventFile.setFiles("https://www.baidu.com/img/flexible/logo/pc/result@2.png");
         eventFile.setFiles("http://image.panzhihua.nhys.cdnhxx.com//idcard/4f843ad2d756456e900d5f24b419aa7c.mp4");
         eventFile.setType("mp4");
         eventFile.setModule("event");
         eventFile.setFileName("4f843ad2d756456e900d5f24b419aa7c.mp4");
-        R result = lcApiService.submitEventRelationFile(eventFile);
+        R result = lcApiService.submitEventOrVisitRecordRelationFile(eventFile);
         log.info(JSONObject.toJSONString(result));
     }
 
@@ -117,7 +116,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);
         eventInfo.setHappenTime(String.valueOf(eventInfoVo.getHappenTime().getTime()));
         eventInfo.setHappenAddress(eventInfoVo.getHappenAddress());
@@ -144,7 +143,7 @@
             eventFile.setType("png");
             eventFile.setModule("event");
             eventFile.setFileName(eventResourceVO.getResourceName());
-            lcApiService.submitEventRelationFile(eventFile);
+            lcApiService.submitEventOrVisitRecordRelationFile(eventFile);
         });
         List<EventResourceVO> audiosList = eventInfoVo.getAudios();
         audiosList.forEach(eventResourceVO -> {
@@ -154,7 +153,7 @@
             eventFile.setType("mp3");
             eventFile.setModule("event");
             eventFile.setFileName(eventResourceVO.getResourceName());
-            lcApiService.submitEventRelationFile(eventFile);
+            lcApiService.submitEventOrVisitRecordRelationFile(eventFile);
         });
         List<EventResourceVO> videoList = eventInfoVo.getVideos();
         videoList.forEach(eventResourceVO -> {
@@ -164,7 +163,7 @@
             eventFile.setType("mp4");
             eventFile.setModule("event");
             eventFile.setFileName(eventResourceVO.getResourceName());
-            lcApiService.submitEventRelationFile(eventFile);
+            lcApiService.submitEventOrVisitRecordRelationFile(eventFile);
         });
         log.info("结束上传附件图片信息");
     }
@@ -178,4 +177,20 @@
                 SerializerFeature.WriteDateUseDateFormat);
         log.info(pretty);
     }
+
+    @Test
+    void requestLcFlowPersonVisitRecord() {
+    }
+
+    @Test
+    void automationUploadVisitRecord() {
+        lcApiService.automationUploadVisitRecord();
+    }
+
+    @Test
+    void getGridMemberListByAreaIdOrName() {
+        String data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp");
+        log.info(data);
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.7.1