From 23340bcc9533c2ecfef08230878cc4cbcb8c480a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 03 六月 2021 15:58:45 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 0f5e1cf..1c9f3b9 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
@@ -8,6 +8,8 @@
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.ComMapGridDetailVO;
+import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.dao.*;
@@ -18,7 +20,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 +35,8 @@
@Resource
private EventGridDataMapper eventGridDataMapper;
+ @Resource
+ private EventMapper eventMapper;
/**
* 新增区县/街道/社区/网格员网格数据管理
* @param eventGridDataAddDTO
@@ -101,4 +107,39 @@
return R.fail();
}
+ @Override
+ public R getUserGrid(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.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);
+ }
+
}
--
Gitblit v1.7.1