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/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
index 5efe555..4204f79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
@@ -2,46 +2,49 @@
import com.panzhihua.common.model.dtos.api.EventFile;
import com.panzhihua.common.model.dtos.api.EventInfo;
-import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
/**
- *
* @author manailin
* desc 主要是提供给浪潮服务器上传事件
* @version 1.0
- * @since 1.0
* @date 2021-05-26
- * */
+ * @since 1.0
+ */
@FeignClient(name = "serviceApi")
public interface ApiServiceFeign {
/**
* description 生成或更新redis里面的对接浪潮所需的token信息
- * @param name 账号
+ *
+ * @param name 账号
* @param password 密码
* @author manailin
* @date 2021/6/10 17:00
*/
@GetMapping("get/token")
- void getToken(@RequestParam("name") String name,@RequestParam("password") String password);
+ void getToken(@RequestParam("name") String name, @RequestParam("password") String password);
+
/**
* description 向浪潮服务器提交网格事件登记 *
+ *
* @param eventInfo 事件信息对象
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("lc/event/upload")
void automationUpload(@RequestBody EventInfo eventInfo);
+
/**
* description 提交事件登记关联的文件或者图片信息
+ *
* @param eventFile 文件对象
* @return R 上传结果
* @author manailin
@@ -59,4 +62,14 @@
@ApiOperation(value = "提交事件登记关联的文件或者图片信息")
@PostMapping("lc/event/upload/event_and_file")
void automationUploadEventAndFile();
+
+ /**
+ * description 自动上传重点人员和流动人员走访记录
+ *
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "自动上传重点人员和流动人员走访记录")
+ @GetMapping("lc/auto/upload/visit_record")
+ void automationUploadVisitRecord();
}
--
Gitblit v1.7.1