Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

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

@@ -2,10 +2,11 @@

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.*;

import java.util.List;

/**
 *
@@ -497,11 +498,11 @@

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

    /**
     * 网格数据待处理统计信息
@@ -623,6 +624,15 @@
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/event/queryPublicityCommunity")
    R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO);


    /**
     * 分页查询社区列表
     * @return  结果
     */
@@ -690,7 +700,7 @@
     * @return  网格列表
     */
    @PostMapping("/eventgriddata/data/list")
    R getGridDataList(PageEventGridDataAdminDTO eventGridDataDTO);
    R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);

    /**
     * 查询社区下所有网格员
@@ -699,6 +709,30 @@
     */
    @PostMapping("/eventgriddata/member/list")
    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);

    /**
     * 后台新增网格
@@ -747,4 +781,44 @@
     */
    @PostMapping("/easy/admin/publicity")
    R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/eventgriddata/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/eventgriddata/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);

    /**
     * 后台管理-统计模块
     * @param communityId   社区id
     * @return  统计信息
     */
    @GetMapping("/statistics/admin/eventStatistics")
    R eventStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 后台管理-删除网格
     * @param Ids   网格id集合
     * @return  删除结果
     */
    @PostMapping("/eventgriddata/data/delete")
    R deleteGridData(@RequestBody List<Long> Ids);

    /**
     * 后台管理-网格员统计
     * @param statisticsAdminDTO    请求参数
     * @return  网格员统计信息
     */
    @GetMapping("/statistics/admin/gridMemberStatistics")
    R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
}