From ac782f26335391de602d6033e29f936e6e7588b0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 06 七月 2021 18:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 17 +++++---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java | 50 +++++++++++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java | 5 +-
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java | 8 +--
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 8 +++-
5 files changed, 73 insertions(+), 15 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());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
index b7bbe4d..f4b8455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcGridData;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
+import com.panzhihua.serviceapi.model.dto.*;
import java.util.List;
@@ -86,11 +83,12 @@
* description 获取所有或者根据姓名和工号查询,分页
*
* @param areaId 区域ID
+ * @param param 姓名或者工号
* @return String 网格员列表
* @author manailin
* @date 2021/6/10 17:00
*/
- String getGridMemberListByAreaIdOrName(String areaId);
+ List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param);
/**
* description 提交事件登记关联的文件或者图片信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
index f532a50..3fa78ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -159,12 +159,16 @@
}
@Override
- public String getGridMemberListByAreaIdOrName(String areaId) {
+ public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param) {
HttpRequest request = HttpUtil.createGet(LcApiConstants.GRID_GET_GETALL_SEARCH_PAGE_URL);
request.auth(getAuthToken());
request.form("areaId", areaId);
+ if(param !=null){
+ request.form("param", param);
+ }
HttpResponse result = request.execute();
- return result.body();
+ LcReturnObject returenData = JSONObject.parseObject(result.body(), LcReturnObject.class);
+ return JSONArray.parseArray(returenData.getData(), GridMemberPageListDTO.class);
}
@Override
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java
new file mode 100644
index 0000000..0c99e7a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.serviceapi.model.dto;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目
+ * description 浪潮网格员接口返回对象
+ *
+ * @author manailin
+ * Date 2021-06-22 15:30
+ **/
+@Data
+public class GridMemberPageListDTO {
+
+ private String bindUserId;
+ private String bindUserName;
+ private String birthDate;
+ private String contactPhone;
+ private String createBy;
+ private String createTime;
+ private String dutyType;
+ private String educationCode;
+ private String educationName;
+ private String genderCode;
+ private String genderName;
+ private String gridDutyId;
+ private String gridDutyName;
+ private String id;
+ private String imei;
+ private Integer isLeader;
+ private Integer jobNum;
+ private String lastReportTime;
+ private String latitude;
+ private String locateUpdateTime;
+ private String longitude;
+ private String name;
+ private String nationCode;
+ private String nationName;
+ private String orgDuty;
+ private String orgDutyDate;
+ private String orgId;
+ private String orgName;
+ private String password;
+ private String politicalAffiliationCode;
+ private String politicalAffiliationName;
+ private String standbyPhone;
+ private String updateBy;
+ private String updateTime;
+ private String workState;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
index 0ce59cf..3a28a83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java
@@ -17,6 +17,7 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.serviceapi.ServiceApiApplication;
import com.panzhihua.serviceapi.biz.LcApiService;
+import com.panzhihua.serviceapi.model.dto.GridMemberPageListDTO;
import com.panzhihua.serviceapi.model.dto.LcGridData;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -189,8 +190,8 @@
@Test
void getGridMemberListByAreaIdOrName() {
- String data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp");
- log.info(data);
+ List<GridMemberPageListDTO> data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp","");
+ // log.info(data);
}
}
\ No newline at end of file
--
Gitblit v1.7.1