From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
index 4816b9a..0d66ff1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -1,19 +1,22 @@
package com.panzhihua.service_grid.dao;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.model.vos.screen.*;
import com.panzhihua.service_grid.model.dos.EventDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
/**
* DAO
@@ -40,23 +43,30 @@
* @param pagePublicityEventDTO
* @return
*/
- IPage<EventVO> findPublicityByPage(Page page, @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);
+ IPage<EventVO> findPublicityByPage(Page page,
+ @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);
+
/**
* 地图模块-根据网格id查询网格办件事件
- * @param gridId 网格id
- * @return 网格办件事件
+ *
+ * @param gridId
+ * 网格id
+ * @return 网格办件事件
*/
List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId);
/**
* 根据网格员id查询网格员头像url
- * @param gridMemberId 网格员id
- * @return 头像url
+ *
+ * @param gridMemberId
+ * 网格员id
+ * @return 头像url
*/
- String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
+ Map<String, String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
/**
* 查询事件（管理）列表
+ *
* @param page
* @param pageEventManageDTO
* @return
@@ -65,16 +75,20 @@
/**
* 查询事件（管理）列表
+ *
* @param page
* @param pagePublicityEventCommunityDTO
* @return
*/
- IPage<EventVO> findCommunityPublicityByPage(Page page, @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO);
+ IPage<EventVO> findCommunityPublicityByPage(Page page,
+ @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO);
/**
* 后台管理-统计模块
- * @param communityId 社区id
- * @return 统计信息
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计信息
*/
EventStatisticsAllAdminVO eventStatistics(@Param("communityId") Long communityId);
@@ -82,37 +96,72 @@
/**
* 根据网格id查询网格统计数据
- * @param gridId 网格id
- * @return 网格统计数据
+ *
+ * @param gridId
+ * 网格id
+ * @return 网格统计数据
*/
GridEventStatisticsVO getGridEventStatisticsByApp(@Param("gridId") Long gridId);
/**
* 查询网格事件统计数据
- * @param statisticsDTO 请求参数
- * @return 网格事件统计数据
+ *
+ * @param statisticsDTO
+ * 请求参数
+ * @return 网格事件统计数据
*/
- GridEventStatisticsDetailVO getGridEventDetailStatisticsByApp(@Param("statisticsDTO") GridEventStatisticsDTO statisticsDTO);
+ GridEventStatisticsDetailVO
+ getGridEventDetailStatisticsByApp(@Param("statisticsDTO") GridEventStatisticsDTO statisticsDTO);
/**
* 查询时间发布者基本信息
+ *
* @param gridMemberId
* @return
*/
- Map<String, Object> getUserBaseInfo(@Param("gridMemberId")Long gridMemberId);
+ Map<String, Object> getUserBaseInfo(@Param("gridMemberId") Long gridMemberId);
/**
* 事件大屏查询事件列表
- * @param eventListDTO 请求参数
- * @return 事件列表
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 事件列表
*/
IPage<EventListVO> getScreenEventList(Page page, @Param("eventListDTO") ScreenEventListDTO eventListDTO);
/**
* 特殊人群上报-社区人口数据列表
- * @param specialPopulationDTO 请求参数
- * @return 社区人口数据列表
+ *
+ * @param specialPopulationDTO
+ * 请求参数
+ * @return 社区人口数据列表
*/
- IPage<EventSpecialPopulationVO> specialPopulationList(Page page, @Param("specialPopulationDTO") PageEventSpecialPopulationDTO specialPopulationDTO);
+ IPage<EventSpecialPopulationVO> specialPopulationList(Page page,
+ @Param("specialPopulationDTO") PageEventSpecialPopulationDTO specialPopulationDTO);
+ Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
+
+ DateScreenVO countByAvgCommunityId(@Param("communityId") Long communityId);
+
+ List<EventDetailWorkVO> getWorkScreenEventList(@Param("communityId") Long communityId);
+
+ EventWorkVO countByTime(@Param("start") String start, @Param("end") String end,
+ @Param("communityId") Long communityId);
+
+ EventTypeWorkVO getComplete(@Param("communityId") Long communityId);
+
+ EventTypeWorkVO getNoComplete(@Param("communityId") Long communityId);
+
+ Map<String, Long> getSSPEventTotal(@Param("communityId") Long communityId);
+
+ List<EventGridIncidentStatisticsVO> getEventListByCommunityId(@Param("communityId") Long communityId);
+
+ List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
+
+ ScreenDrawEventPopulationTotalVO getVillagePopulationTotal(@Param("villageId") Long villageId);
+
+ List<Map<String, Object>> getMemberBuildName(@Param("userId") Long userId);
+
+ Integer getPopulationByLabelCount(@Param("floor") String floor, @Param("villageId") Long villageId);
}
--
Gitblit v1.7.1