From 10b9d2f33c8fd9f3d47998b2672bba60bb1c2251 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 25 一月 2022 11:00:34 +0800
Subject: [PATCH] 商业街反馈问题修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 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 7a5d5a4..2a6ff6b 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
@@ -21,6 +21,9 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
+import com.panzhihua.service_user.dao.*;
+import com.panzhihua.service_user.entity.SysAppConfig;
+import com.panzhihua.service_user.entity.SysTemplateConfig;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -94,21 +97,6 @@
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;
@@ -179,6 +167,10 @@
private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
@Resource
private ComActFourMemberDao comActFourMemberDao;
+ @Resource
+ private SysAppConfigDao sysAppConfigDao;
+ @Resource
+ private SysTemplateConfigDao sysTemplateConfigDao;
// @Resource
// private GridService gridService;
@@ -313,8 +305,13 @@
new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
} else {
LambdaQueryWrapper<SysUserDO> wrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type);
- wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).or()
- .eq(SysUserDO::getPhone, name));
+ if (type == 11) {
+ //只允许通过account登录
+ wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name));
+ } else {
+ wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).or()
+ .eq(SysUserDO::getPhone, name));
+ }
sysUserDO = userDao.selectOne(wrapper);
}
boolean empty = ObjectUtils.isEmpty(sysUserDO);
@@ -330,7 +327,16 @@
loginUserInfoVO.setType(sysUserDO.getType());
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);// 暂时 身份证判断实名制
if(sysUserDO.getCommunityId()!=null){
+ ComActVO comActVO = userDao.selectCommunity(sysUserDO.getCommunityId());
loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
+ if(comActVO!=null){
+ loginUserInfoVO.setComActVO(comActVO);
+ SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
+ if(sysAppConfig!=null){
+ loginUserInfoVO.setAppId(sysAppConfig.getAppId());
+ loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
+ }
+ }
}
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
@@ -377,6 +383,13 @@
ComActVO comActVO = userDao.selectCommunity(userCommunityId);
if (comActVO != null) {
loginUserInfoVO.setCommunityName(comActVO.getName());
+ loginUserInfoVO.setComActVO(comActVO);
+ loginUserInfoVO.setAreaCode(comActVO.getAreaCode());
+ SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
+ if(sysAppConfig!=null){
+ loginUserInfoVO.setAppId(sysAppConfig.getAppId());
+ loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
+ }
}
}
if (!ObjectUtils.isEmpty(phone)) {
@@ -627,7 +640,7 @@
* @return 人员详情
*/
@Override
- public R detailUser(Long userId) {
+ public R<LoginUserInfoVO> detailUser(Long userId) {
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
if (userId < 100000000l) {
SysUserDO sysUserDO = userDao.selectById(userId);
@@ -687,6 +700,10 @@
ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
+ loginUserInfoVO.setAreaCode(comActVO.getAreaCode());
+ }
+ else{
+ loginUserInfoVO.setAreaCode("510423");
}
//是否是社区物业人员
int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
@@ -849,7 +866,7 @@
}
sysUserDO.setFaceState(null);
SysUserDO sysUserDO1 =
- userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
+ userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard).eq(SysUserDO::getCommunityId,loginUserInfoVO.getCommunityId()));
if (!ObjectUtils.isEmpty(sysUserDO1)) {
return R.fail("身份证已经存在");
}
@@ -873,9 +890,10 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
+ SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, loginUserInfoVO.getComActVO()).eq(SysTemplateConfig::getType,5));
// 用户实名认证推送消息
WxUtil.sendSubscribeRZSH(user.getOpenid(), accessToken, "实名认证",
- com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(), "认证成功");
+ com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(), "认证成功",sysTemplateConfig.getTemplateId());
} catch (Exception e) {
log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
}
@@ -1242,7 +1260,7 @@
// 获取所有权限id
List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda()
- .eq(SysMenuDO::getCommunityId, 2L).orderByAsc(SysMenuDO::getOrderNum));
+ .eq(SysMenuDO::getCommunityId, 2L).eq(SysMenuDO::getVisible,0).orderByAsc(SysMenuDO::getOrderNum));
if (!menuDOList.isEmpty()) {
menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
@@ -1719,9 +1737,9 @@
* @return 展示数据
*/
@Override
- public R dataKanban() {
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
- List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder();
+ public R dataKanban(String areaCode) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(areaCode);
+ List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder(areaCode);
List<String> communityUserX = new ArrayList<>();
List<Integer> communityUserY = new ArrayList<>();
@@ -2735,7 +2753,7 @@
*/
@Override
public R dataKanBans(DataKanBansDto dataKanBansDto){
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAreaCode());
List<String> communityUserX = new ArrayList<>();
List<Integer> communityUserY = new ArrayList<>();
@@ -2745,9 +2763,9 @@
List<DataKanbanDTO> dataKanbanDTOS = null;
if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
- dataKanbanDTOS = userDao.selectCommunityUserOrderMonth();
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(dataKanBansDto.getAreaCode());
}else{
- dataKanbanDTOS = userDao.selectCommunityUserOrder();
+ dataKanbanDTOS = userDao.selectCommunityUserOrder(dataKanBansDto.getAreaCode());
}
if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
dataKanbanDTOS.forEach(dataKanbanDTO -> {
@@ -2760,7 +2778,7 @@
List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
serverndays.forEach(date -> {
// 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(date);
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
communityActiveUserY.add(dataKanbanDTO.getNum());
communityActiveUserZ.add(dataKanbanDTO.getDayNum());
@@ -2778,11 +2796,11 @@
* @return 用户数据统计汇总
*/
@Override
- public R communityStatistics(){
+ public R communityStatistics(String areaCode){
//返回结果数据
IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
//查询所有街道
- List<IndexUserStreetVo> streetList = userDao.getUserStreetList();
+ List<IndexUserStreetVo> streetList = userDao.getUserStreetList(areaCode);
streetList.forEach(street -> {
List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
street.setCommunityList(communityList);
@@ -2792,8 +2810,8 @@
}
@Override
- public R communityStatisticsExport(){
- return R.ok(userDao.getUserCommunityExcelExport());
+ public R communityStatisticsExport(String areaCode){
+ return R.ok(userDao.getUserCommunityExcelExport(areaCode));
}
/**
@@ -2856,12 +2874,8 @@
} catch (Exception e) {
e.printStackTrace();
log.error("修改数字商业街商家用户报错【{}】", e.getMessage());
- if (e.getMessage().contains("union_phone_type")) {
- return R.fail("手机号已存在");
- } else if (e.getMessage().contains("union_account_type")) {
+ if (e.getMessage().contains("union_account_type") || e.getMessage().contains("23000")) {
return R.fail("账户已经存在");
- }else if(e.getMessage().contains("23000")){
- return R.fail("手机号已存在");
} else {
return R.fail("账户或手机号已存在，请重新填写尝试");
}
--
Gitblit v1.7.1