From 2311db11bf1d681ba2825e2ed5963b51d815e809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 11 Jan 2023 14:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E4=B8=8D=E5=BD=B1=E5=93=8D=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kingGroupDistributionRecordController.java | 8 +- ...WorkingGroupDistributionRecordService.java | 7 +- ...ingGroupDistributionRecordServiceImpl.java | 140 ++++++++++-------- 3 files changed, 86 insertions(+), 69 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index d4ae01c9..fa085bbd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -261,8 +261,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< @ApiOperation(value="资料分发-分发", notes="资料分发-分发") @PostMapping(value = "/add") public Result add(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { - payWorkingGroupDistributionRecordService.add(payWorkingGroupDistributionRecord); - return Result.OK("分发成功！"); + List list = payWorkingGroupDistributionRecordService.add(payWorkingGroupDistributionRecord); + return Result.OK("分发成功！",list); } /** @@ -276,8 +276,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< @ApiOperation(value="资料分发-批量分发", notes="资料分发-批量分发") @PostMapping(value = "/addBatch") public Result addBatch(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { - payWorkingGroupDistributionRecordService.addBatch(payWorkingGroupDistributionRecord); - return Result.OK("添加成功！"); + List list = payWorkingGroupDistributionRecordService.addBatch(payWorkingGroupDistributionRecord); + return Result.OK("分发成功！",list); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java index 45da766f..51317b28 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupDistributionRecordService.java @@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; -import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * @Description: pay_working_group_distribution_record @@ -24,7 +25,7 @@ public interface IPayWorkingGroupDistributionRecordService extends IService add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord); /** * @Description 批量分发 * @Author lqt @@ -33,7 +34,7 @@ public interface IPayWorkingGroupDistributionRecordService extends IService addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord); /** * 企业端资料下载分页列表查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 08ed1392..4f2a984c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -87,7 +87,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl add(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){ throw new JeroBootException("成员id不能为空!"); } @@ -208,44 +208,52 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); list.forEach(p->{ - List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? - Objects.equals(item.getTemporaryContactsId(),p.getId()) : - Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listStr)){ - return; - } + try { + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? + Objects.equals(item.getTemporaryContactsId(),p.getId()) : + Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStr)){ + return; + } - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(p.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isEmpty(p.getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("workGroupName", finalMsg); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setListFile(listFile); + sendMessageDTO.setBusType("C_OPEN_TYPE12"); + JSONObject json = new JSONObject(); + if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + json.put("id",listStr.get(0).getSubId()); + }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){ + json.put("id",listStr.get(0).getProjectId()); + } + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }catch (Exception e){ + if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){ + listMsg.add(p.getName() + "邮件发送失败"); + } } - if(!StringUtils.isEmpty(p.getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); - } - HashMap map = new HashMap<>(); - map.put("workGroupName", finalMsg); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setListFile(listFile); - sendMessageDTO.setBusType("C_OPEN_TYPE12"); - JSONObject json = new JSONObject(); - if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ - json.put("id",listStr.get(0).getSubId()); - }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){ - json.put("id",listStr.get(0).getProjectId()); - } - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); }); + return listMsg; } @Override - public void addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { + public List addBatch(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) { if(StringUtils.isBlank(payWorkingGroupDistributionRecord.getContactsIds())){ throw new JeroBootException("成员id不能为空!"); } @@ -394,39 +402,47 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); list.forEach(p->{ - List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? - Objects.equals(item.getTemporaryContactsId(),p.getId()) : - Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listStr)){ - return; + try { + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? + Objects.equals(item.getTemporaryContactsId(),p.getId()) : + Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStr)){ + return; + } + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isEmpty(p.getPhone())){ + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("workGroupName", finalMsg); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setListFile(listFile); + sendMessageDTO.setBusType("C_OPEN_TYPE12"); + JSONObject json = new JSONObject(); + if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + json.put("id",listStr.get(0).getSubId()); + }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){ + json.put("id",listStr.get(0).getProjectId()); + } + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }catch (Exception e){ + if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getName() + "邮件发送失败")){ + listMsg.add(p.getName() + "邮件发送失败"); + } } - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(p.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - if(!StringUtils.isEmpty(p.getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); - } - HashMap map = new HashMap<>(); - map.put("workGroupName", finalMsg); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG12.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setListFile(listFile); - sendMessageDTO.setBusType("C_OPEN_TYPE12"); - JSONObject json = new JSONObject(); - if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ - json.put("id",listStr.get(0).getSubId()); - }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){ - json.put("id",listStr.get(0).getProjectId()); - } - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); }); + return listMsg; } @Override