From e23f9ac4b32e7dd1386f1050b7b669ace97f187f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 27 七月 2021 21:58:03 +0800
Subject: [PATCH] [新增]新增根据区域ID，查询下属的网络列表数据
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 16 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 de93413..9ea9166 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
@@ -3,9 +3,11 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.api.EventFile;
import com.panzhihua.common.model.dtos.api.EventInfo;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.serviceapi.biz.LcApiService;
import com.panzhihua.serviceapi.model.dto.LcGridData;
+import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -59,7 +61,7 @@
@ApiOperation(value = "提交事件登记关联的文件或者图片信息")
@PostMapping("lc/event/upload/file")
public R automationUploadFile(@RequestBody EventFile eventFile) {
- return lcApiService.submitEventRelationFile(eventFile);
+ return lcApiService.submitEventOrVisitRecordRelationFile(eventFile);
}
/**
@@ -89,35 +91,49 @@
@ApiOperation(value = "获取指定事件信息")
@GetMapping("lc/event/getEventInfoById")
public String getEventInfoById(String eventId) {
- try {
- return lcApiService.getEventInfoById(eventId);
- } catch (Exception e) {
- log.error("获取指定事件信息出现错误：{}", e.getMessage());
- }
- return eventId;
+ return lcApiService.getEventInfoById(eventId);
}
/**
* 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) {
+ public R getGridMemberListByAreaIdOrName(String areaId,String param) {
try {
- return lcApiService.getGridMemberListByAreaIdOrName(eventId);
+ return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
} catch (Exception e) {
- log.error("获取所有或者根据姓名和工号查询,分页出现错误：{}", e.getMessage());
+ log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
- return eventId;
+ return R.ok(Collections.emptyList());
}
/**
- * description 获取指定区域网格列表
+ * description 获取指定区域网格列表,树形结构。不包括具体的网格数据。
+ *
+ * @param areaId 区域ID
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
+ @GetMapping("lc/grid/tree")
+ public R getGridTreeByAreaId(String areaId) {
+ try {
+ return R.ok(lcApiService.getGridTreeByAreaId(areaId));
+ } catch (Exception e) {
+ log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
+ }
+ return R.ok(Collections.emptyList());
+ }
+
+ /**
+ * description 获取指定区域网格数据列表
*
* @param areaId 区域ID
* @return String 事件信息
@@ -126,13 +142,87 @@
*/
@ApiOperation(value = "获取指定区域网格列表")
@GetMapping("lc/grid/list")
- public List<LcGridData> getGridListByAreaId(String areaId) {
+ public R getGridDataListByAreaId(String areaId) {
try {
- return lcApiService.getGridListByAreaId(areaId);
+ return R.ok(lcApiService.getGridDataListByAreaId(areaId));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
- return Collections.emptyList();
+ return R.ok(Collections.emptyList());
+ }
+ /**
+ * description 流动人口 走访详情
+ *
+ * @param recordId 流动人口走访任务ID
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "流动人口 走访详情")
+ @GetMapping("lc/event/getFlowPersonVisitRecordDetailById")
+ public String getFlowPersonVisitRecordDetailById(String recordId) {
+ return lcApiService.getFlowPersonVisitRecordDetailById(recordId);
}
+ /**
+ * description 流动人口 走访记录列表
+ *
+ * @param lcKeyPersonVisitRecordQueryDTO 入参参数
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = " 流动人口 走访记录列表,分页")
+ @GetMapping("lc/event/getFlowPersonVisitRecordPage")
+ public String getFlowPersonVisitRecordPage(@RequestBody LcKeyPersonVisitRecordQueryDTO lcKeyPersonVisitRecordQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return lcApiService.getFlowPersonVisitRecordPage(lcKeyPersonVisitRecordQueryDTO, loginUserInfo.getUserId());
+ }
+
+
+ /**
+ * description 重点人口 走访详情
+ *
+ * @param recordId 流动人口走访任务ID
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "重点人口 走访详情")
+ @GetMapping("lc/event/getKeyPersonVisitRecordDetailById")
+ public String getKeyPersonVisitRecordDetailById(String recordId) {
+ return lcApiService.getKeyPersonVisitRecordDetailById(recordId);
+ }
+
+ /**
+ * description 重点人口 走访记录列表
+ *
+ * @param lcKeyPersonVisitRecordQueryDTO 入参参数
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = " 重点人口 走访记录列表")
+ @GetMapping("lc/event/getKeyPersonVisitRecordPage")
+ public String getKeyPersonVisitRecordPage(@RequestBody LcKeyPersonVisitRecordQueryDTO lcKeyPersonVisitRecordQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return lcApiService.getKeyPersonVisitRecordPage(lcKeyPersonVisitRecordQueryDTO, loginUserInfo.getUserId());
+ }
+
+
+ /**
+ * description 自动上传走访记录
+ *
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "自动上传重点人员和流动人员走访记录")
+ @GetMapping("lc/auto/upload/visit_record")
+ public void automationUploadVisitRecord() {
+ try {
+ lcApiService.automationUploadVisitRecord();
+ } catch (Exception e) {
+ log.error("自动上传重点人员走访记录：{}", e.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1