From 2c8b9868fe8c45320eb18fd5d6b51ec770c30610 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 24 七月 2021 11:43:57 +0800
Subject: [PATCH] 注释用户实名认证请求公安接口
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index 5de056e..dd73f50 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -3,13 +3,15 @@
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.EventGridMemberRelationAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridVO;
+import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
@@ -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,15 +35,22 @@
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
+ @Resource
+ private UserService userService;
+
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
- public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
+ public R add(EventGridMemberAddDTO eventGridMemberAddDTO){
+
+ userService.addGridUser(eventGridMemberAddDTO);
+
+
+
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
- eventGridMemberRelationDO.setCreateAt(new Date());
+ eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
return R.ok();
}
@@ -48,12 +59,12 @@
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
- public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
+ public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
+ BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
//eventGridMemberRelationDO.setUpdateAt(new Date());
if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
return R.ok();
@@ -101,4 +112,75 @@
return R.fail();
}
+ /**
+ * 根据网格员id查询关联网格列表
+ * @param userId 网格员id
+ * @return 网格列表
+ */
+ @Override
+ public R getMapGridListByApp(Long userId){
+ return R.ok(this.baseMapper.getMapGridListByApp(userId));
+ }
+
+ /**
+ * 查询市平台网格员列表
+ * @return 市平台网格员列表
+ */
+ @Override
+ public R lcList(){
+ return R.ok(this.baseMapper.getGridMemberLcList());
+ }
+
+ @Override
+ public R gridMemberCascadeList(EventGridMemberCascadeAddDTO memberCascadeAddDTO){
+ if(memberCascadeAddDTO.getType() == null){
+ return R.fail("参数错误");
+ }
+ List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());
+
+ List<GridMemberCascadeVO> result = new ArrayList<>();
+ if(!memberCascadeList.isEmpty()){
+ memberCascadeList.forEach(cascade -> {
+ if(memberCascadeAddDTO.getType().equals(1)){//过滤无小区的社区
+ Integer count = this.baseMapper.getVillageCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else if(memberCascadeAddDTO.getType().equals(2)){//过滤无楼栋的小区
+ Integer count = this.baseMapper.getBuildingCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else{
+ if(!cascade.getName().contains("栋")){
+ cascade.setName(cascade.getName() + "栋");
+ }
+ result.add(cascade);
+ }
+ });
+ }
+ return R.ok(result);
+ }
+
+ @Override
+ public R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO){
+ return R.ok(eventGridMemberRelationMapper.getMapGridListsByApp(cascadeListDTO));
+ }
+
+ @Override
+ public R getMapGridsListsByApp(Long userId){
+ List<EventMapGridCascadeVO> resultList = new ArrayList<>();
+ List<EventMapGridCascadeVO> list = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,1,null);
+ if(!list.isEmpty()){
+ list.forEach(gridCascadeVO -> {
+ List<EventMapGridCascadeVO> childList = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,2,gridCascadeVO.getGridId());
+ if(!childList.isEmpty()){
+ gridCascadeVO.setChildList(childList);
+ resultList.add(gridCascadeVO);
+ }
+ });
+ }
+ return R.ok(resultList);
+ }
+
}
--
Gitblit v1.7.1