From c1f945bc80699c368d467c6211908de27fb6255c Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 19 十一月 2021 17:36:15 +0800
Subject: [PATCH] 物业宣传相关代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 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 41c2119..2dce573 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
@@ -15,6 +15,8 @@
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;
@@ -57,8 +59,6 @@
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.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
@@ -324,6 +324,8 @@
}
loginUserInfoVO.setIsmemberrole(2);
loginUserInfoVO.setIsFourMember(2);
+ loginUserInfoVO.setIsCommunityWorker(2);
+ loginUserInfoVO.setIsPropertyWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -346,12 +348,18 @@
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);
Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId);
if (countTeam != null && countTeam > 0) {
loginUserInfoVO.setIsmemberrole(1);
+ loginUserInfoVO.setIsCommunityWorker(1);
} else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
loginUserInfoVO.setIsmemberrole(1);
} else if (isSysUser != null && isSysUser > 0) {
@@ -582,6 +590,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));
@@ -635,6 +644,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);
@@ -2587,10 +2599,6 @@
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, convenientMerchantDTO.getPhone()));
- if (nonNull(sysUserDO)) {
- return R.fail("手机号已经存在");
- }
// sys_user 表
sysUserDO = new SysUserDO();
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
@@ -2599,7 +2607,7 @@
sysUserDO.setType(10);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(convenientMerchantDTO.getPhone());
+ sysUserDO.setPhone(null);
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
try {
@@ -2675,4 +2683,72 @@
}
}
}
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @Override
+ public R dataKanBans(DataKanBansDto dataKanBansDto){
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
+ List<String> communityUserX = new ArrayList<>();
+ List<Integer> communityUserY = new ArrayList<>();
+
+ List<String> communityActiveUserX = new ArrayList<>();
+ List<Integer> communityActiveUserY = new ArrayList<>();
+ List<Integer> communityActiveUserZ = new ArrayList<>();
+
+ List<DataKanbanDTO> dataKanbanDTOS = null;
+ if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth();
+ }else{
+ dataKanbanDTOS = userDao.selectCommunityUserOrder();
+ }
+ if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
+ dataKanbanDTOS.forEach(dataKanbanDTO -> {
+ communityUserX.add(dataKanbanDTO.getName());
+ communityUserY.add(dataKanbanDTO.getNum());
+ });
+ }
+
+ // 获取最近二十天数据
+ List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
+ serverndays.forEach(date -> {
+ // 查询社区活动数量
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(date);
+ communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
+ communityActiveUserY.add(dataKanbanDTO.getNum());
+ communityActiveUserZ.add(dataKanbanDTO.getDayNum());
+ });
+ indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
+ indexDataKanbanVO.setCommunityAddUserY(communityActiveUserY);
+ indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserZ);
+ indexDataKanbanVO.setCommunityUserX(communityUserX);
+ indexDataKanbanVO.setCommunityUserY(communityUserY);
+ return R.ok(indexDataKanbanVO);
+ }
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @Override
+ public R communityStatistics(){
+ //返回结果数据
+ IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
+ //查询所有街道
+ List<IndexUserStreetVo> streetList = userDao.getUserStreetList();
+ streetList.forEach(street -> {
+ List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
+ street.setCommunityList(communityList);
+ });
+ userStatisticsVo.setStreetList(streetList);
+ return R.ok(userStatisticsVo);
+ }
+
+ @Override
+ public R communityStatisticsExport(){
+ return R.ok(userDao.getUserCommunityExcelExport());
+ }
}
--
Gitblit v1.7.1