From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 b304ab4..2278cbd 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
@@ -1,18 +1,19 @@
package com.panzhihua.common.service.api;
-import com.panzhihua.common.model.dtos.api.EventFile;
-import com.panzhihua.common.model.dtos.api.EventInfo;
-import com.panzhihua.common.model.vos.R;
-import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
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;
+import com.panzhihua.common.model.dtos.api.EventFile;
+import com.panzhihua.common.model.dtos.api.EventInfo;
+import com.panzhihua.common.model.vos.R;
+
+import io.swagger.annotations.ApiOperation;
+
/**
- * @author manailin
- * desc 主要是提供给浪潮服务器上传事件
+ * @author manailin desc 主要是提供给浪潮服务器上传事件
* @version 1.0
* @date 2021-05-26
* @since 1.0
@@ -20,12 +21,13 @@
@FeignClient(name = "serviceApi")
public interface ApiServiceFeign {
-
/**
* description 生成或更新redis里面的对接浪潮所需的token信息
*
- * @param name 账号
- * @param password 密码
+ * @param name
+ * 账号
+ * @param password
+ * 密码
* @author manailin
* @date 2021/6/10 17:00
*/
@@ -33,9 +35,10 @@
void getToken(@RequestParam("name") String name, @RequestParam("password") String password);
/**
- * description 向浪潮服务器提交网格事件登记 *
+ * description 向浪潮服务器提交网格事件登记 *
*
- * @param eventInfo 事件信息对象
+ * @param eventInfo
+ * 事件信息对象
* @author manailin
* @date 2021/6/10 17:00
*/
@@ -45,7 +48,8 @@
/**
* description 提交事件登记关联的文件或者图片信息
*
- * @param eventFile 文件对象
+ * @param eventFile
+ * 文件对象
* @return R 上传结果
* @author manailin
* @date 2021/6/10 17:00
@@ -75,7 +79,8 @@
@ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
@GetMapping("lc/event/getGridMemberListByAreaIdOrName")
- R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId,@RequestParam("param") String param,@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
+ R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId, @RequestParam("param") String param,
+ @RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize);
@ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
@GetMapping("lc/grid/tree")
--
Gitblit v1.7.1