Merge branch 'master' into test

puhanshu

2021-12-30 a7002e25ec105e5f73c27f91944f1c0b4991c355

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

@@ -2,6 +2,8 @@

import javax.annotation.Resource;

import com.panzhihua.service_grid.dao.EventGridMemberRelationMapper;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
@@ -26,6 +28,8 @@

    @Resource
    private EventService eventService;
    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;

    /**
     * 事件大屏查询事件列表
@@ -64,6 +68,16 @@
    }

    /**
     * 新版绘制多边形统计数据
     * @param eventListDTO
     * @return
     */
    @PostMapping("/getCivilDrawListNew")
    public R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
        return eventService.getCivilDrawListNew(eventListDTO);
    }

    /**
     * 大屏-根据小区id查询小区统计人数
     * 
     * @param villageId
@@ -75,4 +89,35 @@
        return eventService.civilVillageStatistics(villageId);
    }

    /**
     * 查询社区网格员运动轨迹
     * @param communityId   社区id
     * @return  社区网格员运动轨迹
     */
    @GetMapping("/member/trajectory")
    public R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId){
        return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
    }

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/comprehensive/governance")
    public R getComprehensiveGovernanceStatics() {
        return eventService.getComprehensiveGovernanceStatics();
    }

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId
     *            小区id
     * @return 小区统计数据
     */
    @GetMapping("/village/statistics-new")
    public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
        return eventService.civilVillageStatisticsNew(villageId);
    }

}