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 | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 3d63d03..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
@@ -626,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);
@@ -1942,7 +1942,7 @@
}
//网格员关联楼栋
- if(!eventGridMemberAddDTO.getBuildingIds().isEmpty()){
+ if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
@@ -2011,6 +2011,7 @@
* @return 修改结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){
if(gridMemberDTO.getGridMemberId() == null){
@@ -2035,17 +2036,18 @@
try {
insert = userDao.updateById(sysUserDO);
+ //清除原本关联网格员信息
+ this.userDao.delLcMember(sysUserDO.getUserId());
//关联市平台网格员
if(gridMemberDTO.getLcMemberId() != null){
+ //关联现有的网格员信息
this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
- }else{
- this.userDao.delLcMember(sysUserDO.getUserId());
}
//清除原网格员与楼栋关联关系
this.userDao.delGridMemberRelation(sysUserDO.getUserId());
//新增网格员关联楼栋
- if(!gridMemberDTO.getBuildingIds().isEmpty()){
+ if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
gridMemberDTO.getBuildingIds().forEach(buildingId -> {
Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
@@ -2160,4 +2162,14 @@
});
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