From 8e5b5ecebcd244c78c081d608b6af90ba1a2644c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 16:47:37 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 4de00fd..51f89dc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -27,6 +27,7 @@
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -88,6 +89,8 @@
private EventGridMemberBuildingRelationService buildingRelationService;
@Resource
private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
+ @Resource
+ private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
// @Resource
// private GridService gridService;
@@ -1938,7 +1941,24 @@
//关联市平台网格员
if(eventGridMemberAddDTO.getLcMemberId() != null){
- this.userDao.addLcMember(eventGridMemberAddDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,eventGridMemberAddDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(eventGridMemberAddDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(eventGridMemberAddDTO.getLcBindUserId());
+ compareCodeMemberDO.setLcGridMemberName(eventGridMemberAddDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
}
//网格员关联楼栋
@@ -1988,7 +2008,12 @@
if(!gridMemberPage.getRecords().isEmpty()){
gridMemberPage.getRecords().forEach(gridMember -> {
//查询网格员关联市平台网格员id
- gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId()));
+ Map<String,String> lcMemberMap = this.userDao.getLcMemberId(gridMember.getUserId());
+ if(lcMemberMap != null){
+ gridMember.setLcGridMemberId(lcMemberMap.get("lc_grid_member_id"));
+ gridMember.setLcGridMemberName(lcMemberMap.get("lc_grid_member_name"));
+ gridMember.setLcBindUserId(lcMemberMap.get("lc_bind_user_id"));
+ }
//查询网格员关联楼栋信息
List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
@@ -2041,7 +2066,24 @@
//关联市平台网格员
if(gridMemberDTO.getLcMemberId() != null){
//关联现有的网格员信息
- this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,gridMemberDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(gridMemberDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(gridMemberDTO.getLcBindUserId());
+ compareCodeMemberDO.setLcGridMemberName(gridMemberDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
}
//清除原网格员与楼栋关联关系
this.userDao.delGridMemberRelation(sysUserDO.getUserId());
@@ -2172,4 +2214,9 @@
return R.fail();
}
}
+
+ @Override
+ public R getGridsMemberList(Long communityId){
+ return R.ok(this.userDao.getGridsMemberList(communityId));
+ }
}
--
Gitblit v1.7.1