From cd7dcfe32b0eddc70a3c33532bd6fdcbe52e4dc6 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:23:21 +0800
Subject: [PATCH] #feat 修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 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 42512cf..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,48 +1,55 @@
package com.panzhihua.common.service.api;
+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.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 io.swagger.annotations.ApiOperation;
/**
- *
- * @author manailin
- * desc 主要是提供给浪潮服务器上传事件
+ * @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 password 密码
+ *
+ * @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 事件信息对象
+ * description 向浪潮服务器提交网格事件登记 *
+ *
+ * @param eventInfo
+ * 事件信息对象
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("lc/event/upload")
void automationUpload(@RequestBody EventInfo eventInfo);
+
/**
* description 提交事件登记关联的文件或者图片信息
- * @param eventFile 文件对象
+ *
+ * @param eventFile
+ * 文件对象
* @return R 上传结果
* @author manailin
* @date 2021/6/10 17:00
@@ -69,4 +76,17 @@
@ApiOperation(value = "自动上传重点人员和流动人员走访记录")
@GetMapping("lc/auto/upload/visit_record")
void automationUploadVisitRecord();
+
+ @ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
+ @GetMapping("lc/event/getGridMemberListByAreaIdOrName")
+ R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId, @RequestParam("param") String param,
+ @RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize);
+
+ @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
+ @GetMapping("lc/grid/tree")
+ R getGridTreeByAreaId(@RequestParam("areaId") String areaId);
+
+ @ApiOperation(value = "获取指定区域网格列表")
+ @GetMapping("lc/grid/list")
+ R getGridDataListByAreaId(@RequestParam("areaId") String areaId);
}
--
Gitblit v1.7.1