From 01c49007d289abb838a481d5d633eeca097a07f6 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 05 七月 2021 15:02:29 +0800
Subject: [PATCH] [修改]修改，返回浪潮接口，查询网格列表和根据名字或者工号查询网格员信息
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
index 015b6be..89e3dd9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
@@ -97,15 +97,20 @@
/**
* description 获取所有或者根据姓名和工号查询,分页
*
- * @param eventId 事件ID
+ * @param areaId 西区ID
* @return String 事件信息
* @author manailin
* @date 2021/6/10 17:00
*/
@ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
@GetMapping("lc/event/getGridMemberListByAreaIdOrName")
- public String getGridMemberListByAreaIdOrName(String eventId) {
- return lcApiService.getGridMemberListByAreaIdOrName(eventId);
+ public R getGridMemberListByAreaIdOrName(String areaId,String param) {
+ try {
+ return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
+ } catch (Exception e) {
+ log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
+ }
+ return R.ok(Collections.emptyList());
}
/**
@@ -118,13 +123,13 @@
*/
@ApiOperation(value = "获取指定区域网格列表")
@GetMapping("lc/grid/list")
- public List<LcGridData> getGridListByAreaId(String areaId) {
+ public R getGridListByAreaId(String areaId) {
try {
- return lcApiService.getGridListByAreaId(areaId);
+ return R.ok(lcApiService.getGridListByAreaId(areaId));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
- return Collections.emptyList();
+ return R.ok(Collections.emptyList());
}
--
Gitblit v1.7.1