From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
index ad0caa8..150bfa5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -28,6 +29,28 @@
@Resource
private EventService eventService;
+ /**
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/getUnUploadEvent")
+ List<EventDetailsVO> getUnUploadEvent(){
+ return eventService.getUnUploadEvent();
+ }
+ /**
+ * description 更新上传是否成功标识
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/updateLcUploadFlag")
+ Boolean updateLcUploadFlag(Long id){
+ return eventService.updateLcUploadFlag(id);
+ }
/**
* 分页查找事件
* @param pageEventDTO
@@ -302,4 +325,13 @@
R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
return eventService.reportDirect(commonEventDirectReportDTO);
}
+ /**
+ * 特殊人群上报-社区人口数据列表
+ * @param specialPopulationDTO 请求参数
+ * @return 社区人口数据列表
+ */
+ @PostMapping("/special/population/list")
+ public R specialPopulationList(@RequestBody PageEventSpecialPopulationDTO specialPopulationDTO){
+ return eventService.specialPopulationList(specialPopulationDTO);
+ }
}
--
Gitblit v1.7.1