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_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 146 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 132 insertions(+), 14 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 7d298fd..4de00fd 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
@@ -17,6 +17,8 @@
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.model.vos.grid.GridMemberVO;
+import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
@@ -28,6 +30,7 @@
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
+import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -81,6 +84,10 @@
private SysMenuDAO sysMenuDAO;
@Resource
private SysUserInputDAO sysUserInputDAO;
+ @Resource
+ private EventGridMemberBuildingRelationService buildingRelationService;
+ @Resource
+ private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
// @Resource
// private GridService gridService;
@@ -619,14 +626,14 @@
String idCard = loginUserInfoVO.getIdCard();
String name = loginUserInfoVO.getName();
log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
- try {
- boolean b = RealNameUtil.authentication(idCard, name);
- if (!b) {
- return R.fail("身份认证失败：请填写真实信息");
- }
- }catch (ServiceException serviceException){
- return R.fail(serviceException.getMessage());
- }
+// try {
+// boolean b = RealNameUtil.authentication(idCard, name);
+// if (!b) {
+// return R.fail("身份认证失败：请填写真实信息");
+// }
+// }catch (ServiceException serviceException){
+// return R.fail(serviceException.getMessage());
+// }
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setName(name);
sysUserDO.setIdCard(idCard);
@@ -1903,11 +1910,6 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
- //关联市平台网格员
-// if(eventGridMemberAddDTO.getLcMemberId() != null){
-//
-// }
-
//参数校验
SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
.eq(SysUserDO::getNickName,eventGridMemberAddDTO.getNickName()));
@@ -1933,6 +1935,31 @@
sysUserRoleDO.setUserId(sysUserDO.getUserId());
sysUserRoleDO.setRoleId(roleId);
sysUserRoleDAO.insert(sysUserRoleDO);
+
+ //关联市平台网格员
+ if(eventGridMemberAddDTO.getLcMemberId() != null){
+ this.userDao.addLcMember(eventGridMemberAddDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ }
+
+ //网格员关联楼栋
+ if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
+ List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
+ eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
+ Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
+ if(resultMap != null){
+ EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
+ buildingRelationDO.setBuildingId(buildingId);
+ buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
+ buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
+ buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
+ buildingRelationDO.setCreateAt(new Date());
+ buildingRelationList.add(buildingRelationDO);
+ }
+ });
+ if(!buildingRelationList.isEmpty()){
+ buildingRelationService.saveBatch(buildingRelationList);
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
log.error("新增后台用户报错【{}】", e.getMessage());
@@ -1956,7 +1983,26 @@
*/
@Override
public R getGridMemberList(PageEventGridMemberRelationDTO memberRelationDTO){
- return R.ok(userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum(),memberRelationDTO.getPageSize()),memberRelationDTO));
+ IPage<GridMemberVO> gridMemberPage = userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum()
+ ,memberRelationDTO.getPageSize()),memberRelationDTO);
+ if(!gridMemberPage.getRecords().isEmpty()){
+ gridMemberPage.getRecords().forEach(gridMember -> {
+ //查询网格员关联市平台网格员id
+ gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId()));
+
+ //查询网格员关联楼栋信息
+ List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
+ if(!memberBuildingList.isEmpty()){
+ memberBuildingList.forEach(memberBuilding -> {
+ if(!memberBuilding.getBuildingName().contains("栋")){
+ memberBuilding.setBuildingName(memberBuilding.getBuildingName() + "栋");
+ }
+ });
+ gridMember.setMemberBuildingList(memberBuildingList);
+ }
+ });
+ }
+ return R.ok(gridMemberPage);
}
/**
@@ -1965,6 +2011,7 @@
* @return 修改结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){
if(gridMemberDTO.getGridMemberId() == null){
@@ -1988,6 +2035,37 @@
int insert = 0;
try {
insert = userDao.updateById(sysUserDO);
+
+ //清除原本关联网格员信息
+ this.userDao.delLcMember(sysUserDO.getUserId());
+ //关联市平台网格员
+ if(gridMemberDTO.getLcMemberId() != null){
+ //关联现有的网格员信息
+ this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ }
+ //清除原网格员与楼栋关联关系
+ this.userDao.delGridMemberRelation(sysUserDO.getUserId());
+
+ //新增网格员关联楼栋
+ if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
+ List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
+ gridMemberDTO.getBuildingIds().forEach(buildingId -> {
+ Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
+ if(resultMap != null){
+ EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
+ buildingRelationDO.setBuildingId(buildingId);
+ buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
+ buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
+ buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
+ buildingRelationDO.setCreateAt(new Date());
+ buildingRelationList.add(buildingRelationDO);
+ }
+ });
+ if(!buildingRelationList.isEmpty()){
+ buildingRelationService.saveBatch(buildingRelationList);
+ }
+ }
+
} catch (Exception e) {
e.printStackTrace();
log.error("修改网格员用户报错【{}】", e.getMessage());
@@ -2044,6 +2122,7 @@
return R.ok();
}
+ @Override
public R noTips(Long userId){
SysUserDO userDO = this.userDao.selectById(userId);
if(userDO != null){
@@ -2054,4 +2133,43 @@
}
return R.fail();
}
+
+ /**
+ * 查询社区的收益说明
+ * @param communityId 社区id
+ * @return 收益说明
+ */
+ @Override
+ public R listAgreements(Long communityId){
+
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId).eq(SysUserAgreementDO::getType,5));
+ if (sysUserAgreementDOS.isEmpty()) {
+ SysUserAgreementDO agreementDO = new SysUserAgreementDO();
+ agreementDO.setCommunityId(communityId);
+ agreementDO.setName("收益说明");
+ agreementDO.setType(5);
+ agreementDO.setCreateAt(new Date());
+ agreementDO.setContent(Constants.PROFIT_EXPLAIN);
+ sysUserAgreementDAO.insert(agreementDO);
+ sysUserAgreementDOS.add(agreementDO);
+ }
+ List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
+ sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
+ sysUserAgreementVOS.add(sysUserAgreementVO);
+ });
+ return R.ok(sysUserAgreementVOS);
+ }
+
+ @Override
+ public R getGridIsOk(Long userId){
+ Integer count = this.userDao.getGridIsOk(userId);
+ if(count > 0){
+ return R.ok(count);
+ }else{
+ return R.fail();
+ }
+ }
}
--
Gitblit v1.7.1