优化

zhanghua

2023-09-08 7ef4892f9f24f941aca37e6b3991b808a0aca619

 ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java

@@ -14,7 +14,6 @@
import com.ycl.mapper.message.SmsAuditMapper;
import com.ycl.mapper.user.UmsDepartManageMapper;
import com.ycl.service.message.ISmsAuditService;
import com.ycl.service.message.factory.SmsSender;
import com.ycl.service.user.UmsAdminService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +24,7 @@

/**
 * <p>
 *  短信审核 服务实现类
 * 短信审核 服务实现类
 * </p>
 *
 * @author mg
@@ -41,8 +40,6 @@

    @Resource
    private UmsAdminService adminService;
    @Resource
    private SmsSender smsSender;

    @Override
    public IPage<SmsAudit> list(SmsAudit smsAudit) {
@@ -72,18 +69,14 @@
        queryDeptWrapper.in(UmsDepartManage::getUserId, ids);
        List<UmsDepartManage> depts = umsDepartManageMapper.selectList(queryDeptWrapper);
        //部门去重
        List<UmsDepartManage> uniques = depts.stream().collect(
                Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o->o.getDepartId()))),
                        ArrayList::new));
        List<UmsDepartManage> uniques = depts.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getDepartId()))), ArrayList::new));
        List<Long> deptLeadIds = uniques.stream().map(UmsDepartManage::getDepartId).collect(Collectors.toList());
        LambdaQueryWrapper<UmsDepartManage> queryDeptLeadWrapper = new LambdaQueryWrapper<>();
        queryDeptLeadWrapper.in(UmsDepartManage::getDepartId, deptLeadIds).eq(UmsDepartManage::getIsLeader,1);
        queryDeptLeadWrapper.in(UmsDepartManage::getDepartId, deptLeadIds).eq(UmsDepartManage::getIsLeader, 1);
        List<UmsDepartManage> deptLeads = umsDepartManageMapper.selectList(queryDeptLeadWrapper);

        //审核去重
        List<UmsDepartManage> uniqueLeads = deptLeads.stream().collect(
                Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o->o.getUserId()))),
                        ArrayList::new));
        List<UmsDepartManage> uniqueLeads = deptLeads.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUserId()))), ArrayList::new));
        //添加短信审核
        List<SmsAudit> audits = new ArrayList<>();
        for (UmsDepartManage depart : uniqueLeads) {
@@ -104,8 +97,7 @@

    @Override
    public Boolean checkSms(MessageSmsParam messageSmsParam) {
        switch (messageSmsParam.getStatus())
        {
        switch (messageSmsParam.getStatus()) {
            //未通过
            case 0:
                noPassMethod(messageSmsParam);
@@ -119,6 +111,7 @@
        }
        return true;
    }

    @Transactional
    public void passMethod(MessageSmsParam messageSmsParam) {
        Message message = messageMapper.selectById(messageSmsParam.getMessageId());
@@ -128,8 +121,6 @@
        //id换成手机号
        String targetToPhone = adminService.getTargetTo(message.getTargetTo(), message.getChannelCode());
        message.setTargetTo(targetToPhone);
        //发送短信
        smsSender.sendSms(message);

        Message updateMessage = new Message();
        updateMessage.setSendTime(new Date());
@@ -143,17 +134,20 @@
        //审核短信更新
        updateSmsAudit(messageSmsParam);
    }

    @Transactional
    public void noPassMethod(MessageSmsParam messageSmsParam) {
        //审核短信更新
        updateSmsAudit(messageSmsParam);
    }

    public void updateSmsAudit(MessageSmsParam messageSmsParam) {
        SmsAudit smsAudit = packageData(messageSmsParam);
        LambdaQueryWrapper<SmsAudit> smsAuditUpdate = new LambdaQueryWrapper<>();
        smsAuditUpdate.eq(SmsAudit::getMessageId, messageSmsParam.getMessageId());
        baseMapper.update(smsAudit,smsAuditUpdate);
        baseMapper.update(smsAudit, smsAuditUpdate);
    }

    public SmsAudit packageData(MessageSmsParam messageSmsParam) {
        SmsAudit smsAudit = new SmsAudit();
        smsAudit.setMessageId(messageSmsParam.getMessageId());