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

CeDo

2021-06-07 3d56d066ffc89c650cf49d0a9075305c2a12d83d

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java

@@ -1,12 +1,10 @@
package com.panzhihua.service_grid.api;

import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -18,8 +16,23 @@
    @Resource
    private EventService eventService;

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

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