From 05bd97aab35b27be282fd45d013e1330edda2cc0 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 16:21:53 +0800
Subject: [PATCH] 修复bug-401-【综治后台管理--事件管理】搜索事件功能未生效
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 304 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 279 insertions(+), 25 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 2b8986b..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
@@ -2,11 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.service.EventService;
@@ -14,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -31,25 +30,27 @@
private EventService eventService;
/**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
*/
- @PostMapping("/add")
- R add(@RequestBody EventAddDTO eventAddDTO){
- return eventService.add(eventAddDTO);
- };
-
+ @GetMapping("/getUnUploadEvent")
+ List<EventDetailsVO> getUnUploadEvent(){
+ return eventService.getUnUploadEvent();
+ }
/**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
+ * description 更新上传是否成功标识
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
*/
- @PostMapping("/edit")
- R edit(@RequestBody EventEditDTO eventEditDTO){
- return eventService.edit(eventEditDTO);
- };
-
+ @GetMapping("/updateLcUploadFlag")
+ Boolean updateLcUploadFlag(Long id){
+ return eventService.updateLcUploadFlag(id);
+ }
/**
* 分页查找事件
* @param pageEventDTO
@@ -62,14 +63,23 @@
/**
* 删除事件
- * @param EventDeleteDTO
+ * @param commonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/delete")
- R delete(@RequestBody EventDeleteDTO EventDeleteDTO){
- return eventService.delete(EventDeleteDTO);
- };
+ R delete(@RequestBody CommonEventDeleteDTO commonEventDeleteDTO){
+ return eventService.delete(commonEventDeleteDTO);
+ }
+ /**
+ * 批量删除
+ * @param eventDeleteDTO
+ * @return
+ */
+ @PostMapping("/deleteEventBatch")
+ R deleteEventBatch(@RequestBody EventDeleteDTO eventDeleteDTO){
+ return eventService.deleteEventBatch(eventDeleteDTO);
+ }
/**
* 查询事件详细信息
* @param id 事件 id
@@ -78,6 +88,250 @@
@PostMapping("/{id}")
R<EventDetailsVO> eventDetails(@PathVariable("id") Long id){
return eventService.eventDetails(id);
- };
+ }
+ /**
+ * 添加突发事件
+ * @param commonEventAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/addCommon")
+ R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
+ return eventService.addCommon(commonEventAddDTO);
+ }
+ /**
+ * 保存草稿
+ * @param {classNameFirstLower}AddDTO 添加事件传递对象
+ * @return 新增结果
+ */
+ @PostMapping("/saveDraft")
+ R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO){
+ return eventService.saveDraft(commonEventEditDTO);
+ }
+
+
+ /**
+ * 事件上报社区
+ * @param commonEventReportDTO
+ * @return
+ */
+ @PostMapping("/report")
+ R report(@RequestBody CommonEventReportDTO commonEventReportDTO){
+ return eventService.report(commonEventReportDTO);
+ }
+
+
+ /**
+ * 事件撤销
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/emergenciesRevoke")
+ R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO){
+ return eventService.emergenciesRevoke(eventRevokeDTO);
+ }
+ /**
+ * 处理事件
+ * @param commonEventDealDTO
+ * @return
+ */
+ @PostMapping("/dealEvent")
+ R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO){
+ switch (commonEventDealDTO.getOperateType()){
+ case 1:
+ return eventService.communityDealEvent(commonEventDealDTO);
+ case 0:
+ return eventService.dealEvent(commonEventDealDTO);
+ default:
+ return R.fail("参数错误");
+ }
+ }
+
+ /**
+ * 处理事件
+ * @param commonEventVerifyDTO
+ * @return
+ */
+ @PostMapping("/verify")
+ R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO){
+ return eventService.verifyEvent(commonEventVerifyDTO);
+ }
+
+ /**
+ * 重新发布事件
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/republish")
+ R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
+ return eventService.republishEvent(commonEventRepublishDTO);
+ }
+
+ /**
+ * 批量发布事件
+ * @param commonEventBatchRepublishDTO
+ * @return
+ */
+ @PostMapping("/batchRepublishEvent")
+ R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO){
+ return eventService.batchRepublishEvent(commonEventBatchRepublishDTO);
+ }
+ /**
+ * 草稿发布
+ * @param commonEventPublicDTO
+ * @return
+ */
+ @PostMapping("/draftRelease")
+ R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO){
+ return eventService.draftRelease(commonEventPublicDTO);
+ }
+
+ /**
+ * 保存殊人群事件上报草稿
+ * @param specialEventEditDTO
+ * @return
+ */
+ @PostMapping("/saveSpecialDraft")
+ R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO){
+ return eventService.saveSpecialDraft(specialEventEditDTO);
+ }
+
+
+ /**
+ * 特殊人员信息上报
+ * @param specialEventAddDTO
+ * @return
+ */
+ @PostMapping("/addSpecial")
+ R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO){
+ return eventService.addSpecial(specialEventAddDTO);
+ }
+
+ /**
+ * 获取指定特殊人员信息
+ * @param idCard
+ * @return
+ */
+ @PostMapping("/getSpecialPopulation")
+ R getSpecialPopulation(@RequestBody String idCard){
+ return eventService.getSpecialPopulation(idCard);
+ }
+
+
+ /**
+ * 添加发布宣传教育事件
+ * @param publicityEventAddDTO 请求参数
+ * @return 上报结果
+ */
+ @PostMapping("/addPublicity")
+ R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO){
+ return eventService.addPublicity(publicityEventAddDTO);
+ }
+
+ /**
+ * 保存宣传教育事件草稿
+ * @param publicityEventEditDTO 请求参数
+ * @return 保存结果
+ */
+ @PostMapping("/savePublicityDraft")
+ R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO) {
+ return eventService.savePublicityDraft(publicityEventEditDTO);
+ }
+ /**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("/queryPublicity")
+ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO){
+ return eventService.selectPublicity(pagePublicityEventDTO);
+ }
+
+ /**
+ * 分页查询宣传教育事件
+ * @param pagePublicityEventDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("/queryPublicityCommunity")
+ R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO){
+ return eventService.selectCommunityPublicity(pagePublicityEventDTO);
+ }
+
+ /**
+ * 分页查询宣传教育事件
+ * @return 结果
+ */
+ @PostMapping("/actList")
+ R<ComActVO> actList(){
+ return eventService.actList();
+ }
+
+ /**
+ * 查询管理事件
+ * @param pageEventManageDTO
+ * @return
+ */
+ @PostMapping("/manage/list")
+ R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO){
+ return eventService.eventToManage(pageEventManageDTO);
+ }
+
+ /**
+ * 社区网格后台标记事件无效
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/markInvalid")
+ R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO){
+ return eventService.markEventInvalid(eventRevokeDTO);
+ }
+
+ /**
+ * 批量事件标为无效
+ * @param eventBatchRevokeDTO
+ * @return
+ */
+ @PostMapping("/batchMarkInvalid")
+ R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO){
+ return eventService.batchMarkEventInvalid(eventBatchRevokeDTO);
+ }
+
+ /**
+ * 社区网格后台重新发布已标记无效的事件
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/republishInvalid")
+ R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
+ return eventService.republishInvalidEvent(commonEventRepublishDTO);
+ }
+
+ /**
+ * 查询距离当前事件最近的网格数据
+ * @param pageEventGridNearbyDTO
+ * @return
+ */
+ @PostMapping("/grid/nearby")
+ R getNearByGrid(@RequestBody PageEventGridNearbyDTO pageEventGridNearbyDTO){
+ return eventService.getNearByGrid(pageEventGridNearbyDTO);
+ }
+
+ /**
+ * 直接上报社区
+ * @param commonEventDirectReportDTO
+ * @return
+ */
+ @PostMapping("/reportDirect")
+ 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