From 7e2b1cce36643fe48aec347e8ec1bbf3d25c3d4e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:09:45 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
index 74b917c..075c658 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.google.common.base.Joiner;
import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridDataService;
@@ -18,7 +19,9 @@
import org.springframework.beans.BeanUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -31,6 +34,8 @@
@Resource
private EventGridDataMapper eventGridDataMapper;
+ @Resource
+ private EventMapper eventMapper;
/**
* 新增区县/街道/社区/网格员网格数据管理
* @param eventGridDataAddDTO
@@ -59,22 +64,6 @@
return R.ok();
}
return R.fail();
- }
-
- /**
- * 分页查找区县/街道/社区/网格员网格数据管理
- * @param pageEventGridDataDTO
- * @return 维护结果
- */
- public R<IPage<EventGridDataVO>> query(PageEventGridDataDTO pageEventGridDataDTO){
- Page page = new Page(1,10);
- if(pageEventGridDataDTO.getPageNum()!=null) {
- page.setCurrent(pageEventGridDataDTO.getPageNum());
- }
- if(pageEventGridDataDTO.getPageSize()!=null) {
- page.setSize(pageEventGridDataDTO.getPageSize());
- }
- return R.ok(eventGridDataMapper.findByPage(page, pageEventGridDataDTO));
}
/**
@@ -114,4 +103,62 @@
return R.ok(eventGridDataMapper.selectUserGrid(page, pageEventGridDataDTO));
}
+ /**
+ * 地图模块-根据网格id查询网格详细信息
+ * @param gridId 网格id
+ * @return 网格详细信息
+ */
+ @Override
+ public R getMapGridDetail(Long gridId){
+ ComMapGridDetailVO gridDetailVO = new ComMapGridDetailVO();
+ //查询网格信息
+ EventGridDataDO eventGridDataDO = this.baseMapper.selectById(gridId);
+ if(eventGridDataDO == null){
+ return R.fail("未查询到网格信息");
+ }
+ BeanUtils.copyProperties(eventGridDataDO,gridDetailVO);
+ //查询网格待办事件
+ List<ComMapGridEventVO> gridEventList = eventMapper.getEventByGridId(gridId);
+ if(!gridEventList.isEmpty()){
+ gridDetailVO.setGridEventList(gridEventList);
+ }
+ return R.ok(gridDetailVO);
+ }
+
+ @Override
+ public R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO) {
+ List<UserEventGridDataVO> userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
+ return R.ok(userEventGridDataVO);
+ }
+
+ /**
+ * 分页查询网格
+ * @param eventGridDataDTO 请求参数
+ * @return 网格列表
+ */
+ @Override
+ public R getGridMemberList(PageEventGridDataDTO eventGridDataDTO){
+ IPage<EventGridAdminVO> gridAdminVOIPage = this.baseMapper.findByPage(new Page(eventGridDataDTO.getPageNum(),eventGridDataDTO.getPageSize()),eventGridDataDTO);
+ if(!gridAdminVOIPage.getRecords().isEmpty()){
+ gridAdminVOIPage.getRecords().forEach(gridMember -> {
+ List<String> members = this.baseMapper.getGridMember(gridMember.getId());
+ if(!members.isEmpty()){
+ String memberNames = Joiner.on(",").join(members);
+ gridMember.setGridMemberName(memberNames);
+ }
+ });
+ }
+ return R.ok(gridAdminVOIPage);
+ }
+
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ @Override
+ public R getGridMemberLists(Long communityId){
+ return R.ok(this.baseMapper.getGridMemberLists(communityId));
+ }
+
}
--
Gitblit v1.7.1