Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -28,12 +29,12 @@

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @param screenEventDTO   请求参数
     * @return  统计结果
     */
    @GetMapping("/getScreenEvent")
    public R event(@RequestParam("communityId") Long communityId) {
        return R.ok(comMngPopulationService.getScreenEvent(communityId));
    @PostMapping("/getScreenEvent")
    public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
        return R.ok(comMngPopulationService.getScreenEvent(screenEventDTO));
    }

    /**
@@ -46,11 +47,23 @@
        return R.ok(comMngPopulationService.getScreenCivil(communityId));
    }

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    @GetMapping("/getScreenGirds")
    public R grids(@RequestParam("communityId") Long communityId) {
        return R.ok(comMngPopulationService.getScreenGirds(communityId));
    }

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    @PostMapping("/getScreenEventDetail")
    public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
        return R.ok(comMngPopulationService.getScreenEventDetail(eventDetailDTO));