From e9d5fb4b01c383fa5b01bf5e730d4e3da73f266e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 十二月 2021 11:27:15 +0800
Subject: [PATCH] 12/30 河门口大屏特殊修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 5 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 f8e0d0a..34d571b 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
@@ -14,11 +14,6 @@
import javax.annotation.Resource;
-import cn.hutool.core.util.IdcardUtil;
-import com.panzhihua.common.model.dtos.DataKanBansDto;
-import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.service_user.dao.*;
-import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -37,6 +32,7 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
@@ -59,6 +55,11 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.IndexUserCommunityVo;
+import com.panzhihua.common.model.vos.community.IndexUserStatisticsVo;
+import com.panzhihua.common.model.vos.community.IndexUserStreetVo;
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;
@@ -84,10 +85,41 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.service_user.dao.ComActFourMemberDao;
+import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
+import com.panzhihua.service_user.dao.ComMngUserTagDAO;
+import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper;
+import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper;
+import com.panzhihua.service_user.dao.RoleDAO;
+import com.panzhihua.service_user.dao.SysMenuDAO;
+import com.panzhihua.service_user.dao.SysOperLogDAO;
+import com.panzhihua.service_user.dao.SysRoleMenuDAO;
+import com.panzhihua.service_user.dao.SysUserAgreementDAO;
+import com.panzhihua.service_user.dao.SysUserFeedbackDAO;
+import com.panzhihua.service_user.dao.SysUserInputDAO;
+import com.panzhihua.service_user.dao.SysUserNoticeDAO;
+import com.panzhihua.service_user.dao.SysUserRoleDAO;
+import com.panzhihua.service_user.dao.UserDao;
+import com.panzhihua.service_user.model.dos.ComActFourMember;
+import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
+import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
+import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
+import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
+import com.panzhihua.service_user.model.dos.SysMenuDO;
+import com.panzhihua.service_user.model.dos.SysOperLogDO;
+import com.panzhihua.service_user.model.dos.SysRoleDO;
+import com.panzhihua.service_user.model.dos.SysRoleMenuDO;
+import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
+import com.panzhihua.service_user.model.dos.SysUserDO;
+import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
+import com.panzhihua.service_user.model.dos.SysUserInputDO;
+import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
+import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
+import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
// import com.panzhihua.common.service.grid.GridService;
@@ -325,6 +357,7 @@
loginUserInfoVO.setIsmemberrole(2);
loginUserInfoVO.setIsFourMember(2);
loginUserInfoVO.setIsCommunityWorker(2);
+ loginUserInfoVO.setIsPropertyWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -346,6 +379,11 @@
Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
if(countFourMember>0){
loginUserInfoVO.setIsFourMember(1);
+ }
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId);
+ if (countPropertyWorker > 0) {
+ loginUserInfoVO.setIsPropertyWorker(1);
}
// 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
@@ -584,6 +622,7 @@
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("人员不存在");
}
+
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -637,6 +676,9 @@
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
+ loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
@@ -2741,4 +2783,20 @@
public R communityStatisticsExport(){
return R.ok(userDao.getUserCommunityExcelExport());
}
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @Override
+ public R getUserInfoByUnionId(String unionId) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
+ if (isNull(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ return R.ok(loginUserInfoVO);
+ }
}
--
Gitblit v1.7.1