优化

MrShi

2025-08-19 30e858fa504b268b9b436afca0a1259cf6e8c488

 server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -13,11 +13,9 @@
import com.doumee.core.utils.qiyeweixin.model.response.*;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.CompanyMemberMapper;
import com.doumee.dao.business.ManagersMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyMember;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.dto.LoginH5DTO;
import com.doumee.dao.web.dto.UpdEmailDTO;
@@ -28,14 +26,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestHeader;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -47,8 +50,11 @@
 * @since 2025/04/02 17:49
 */
@Service
@Slf4j
public class MemberServiceImpl implements MemberService {

    @Resource(name="sessionRedisTemplate")
    private RedisTemplate<Object, Serializable> redisTemplate;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
@@ -57,6 +63,8 @@
    private CompanyMapper companyMapper;
    @Autowired
    private CompanyMemberMapper companyMemberMapper;
    @Autowired
    private ManagersMapper managersMapper;

    @Override
    public Integer create(Member member) {
@@ -220,6 +228,11 @@
            //不包含下级组织
            queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"'  and cm.member_id=t.id");
        }

        if(Objects.nonNull(pageWrap.getModel().getIsSendCopy())&&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getIsSendCopy())){
            queryWrapper.apply(" t.id in ( select MEMBER_ID  from managers where  ISDELETED= 0 and STATUS = 0 and TYPE = 1  ) ");
        }

        queryWrapper.orderByAsc(Member::getCreateDate);
        PageData<Member> record =  PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
        if(record!=null && record.getRecords()!=null){
@@ -239,6 +252,7 @@
    }

    @Override
    @Transactional
    public  void syncQwAll(){
        if(Constants.DEALING_MEMBER_SYNC){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，同步任务正在进行，请稍后刷新页面重试！");
@@ -256,15 +270,20 @@
            LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            Date date = new Date();
            List<QywxUserListResponse>  list = new ArrayList<>();
            int index =0;
            for(Company c : companyList){
                List<QywxUserListResponse> tList =   QywxUtil.getUserList(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode(),c.getQwId());
                if(tList!=null){
                    log.error((index++)+"==============="+c.getName()+"============人员数量："+tList.size());
                    list.addAll(tList);
                }else{
                    log.error((index++)+"==============="+c.getName()+"============人员数量：0");
                }
            }
            if(list == null || list.size() ==0){
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未同步到任何组织信息！");
            }
            log.error( "###################=================人员总数量："+list.size());
            List<Member>  memberList = memberMapper.selectList(new LambdaQueryWrapper<Member>().eq(Member::getIsdeleted,Constants.ZERO));
            List<Member>  newList = new ArrayList<>();
            List<Member>  updateList = new ArrayList<>();
@@ -299,7 +318,7 @@
                        if(StringUtils.isNotBlank(comNames)){
                            comNames += ",";
                        }
                        comNames += c.getNamePath();
                        comNames += StringUtils.defaultString(c.getNamePath(),c.getName());
                    }
                }
                cm.setCompanyList(qycom);
@@ -431,18 +450,18 @@
        }
        String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
        //根据code换区企业微信ID
        QywxBaseResponse<String> qwIdBaseResponse= null;// QywxUtil.getUserInfoByCode(token,dto.getCode());
//        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录码解析失败，请联系管理员");
//        }
//        if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录失败："+qwIdBaseResponse.getErrmsg());
//        }
//        if(Objects.isNull(qwIdBaseResponse.getData())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信用户信息解析失败，请联系管理员");
//        }
//        String qwId = qwIdBaseResponse.getData();
        String qwId = dto.getCode();
        QywxBaseResponse<String> qwIdBaseResponse =  QywxUtil.getUserInfoByCode(token,dto.getCode());
        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录码解析失败，请联系管理员");
        }
        if(!Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录失败："+qwIdBaseResponse.getErrmsg());
        }
        if(Objects.isNull(qwIdBaseResponse.getData())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信用户信息解析失败，请联系管理员");
        }
        String qwId = qwIdBaseResponse.getData();
//        String qwId = dto.getCode();
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
        if(Objects.isNull(member)){
            //根据企业微信ID 查询用户信息
@@ -450,7 +469,7 @@
            if(Objects.isNull(qywxUserInfoResponse)||Objects.isNull(qywxUserInfoResponse.getErrcode())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信获取用户信息解析失败，请联系管理员");
            }
            if(Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
            if(!Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信获取用户信息失败："+qwIdBaseResponse.getErrmsg());
            }
            member = new Member();
@@ -463,6 +482,10 @@
            member.setQwId(qwId);
            memberMapper.insert(member);
        }
        //查询是否有权限
        member.setDcaButton(managersMapper.selectCount(new QueryWrapper<Managers>().lambda()
                .eq(Managers::getIsdeleted,Constants.ZERO).eq(Managers::getMemberId,member.getId())
                .eq(Managers::getType,Constants.TWO))>Constants.ZERO?Constants.ONE:Constants.ZERO);
        return member;
    }