Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

 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;

    /**
     * 事件大屏查询事件列表
@@ -75,4 +79,23 @@
        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();
    }

}