Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-04 c62d25bf9cf51d7421035abd6489945e77db1f04

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -2,7 +2,6 @@

import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -497,11 +496,11 @@

    /**
     * 处理事件
     * @param commonEventRepublicDTO
     * @param commonEventRepublishDTO
     * @return
     */
    @PostMapping("/event/republish")
    R republishEvent(@RequestBody CommonEventRepublicDTO commonEventRepublicDTO);
    R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);

    /**
     * 网格数据待处理统计信息
@@ -690,7 +689,7 @@
     * @return  网格列表
     */
    @PostMapping("/eventgriddata/data/list")
    R getGridDataList(PageEventGridDataAdminDTO eventGridDataDTO);
    R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);

    /**
     * 查询社区下所有网格员
@@ -701,6 +700,30 @@
    R getGridMemberLists(@RequestParam("communityId") Long communityId);

    /**
     * 查询管理事件
     * @param pageEventManageDTO
     * @return
     */
    @PostMapping("/event/manage/list")
    R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO);

    /**
     * 社区网格后台标记事件无效
     * @param eventRevokeDTO
     * @return
     */
    @PostMapping("/event/markInvalid")
    R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO);

    /**
     * 社区网格后台重新发布已标记无效的事件
     * @param commonEventRepublishDTO
     * @return
     */
    @PostMapping("/event/republishInvalid")
    R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);

    /**
     * 后台新增网格
     * @param eventGridDataDTO  请求参数
     * @return  新增结果