Skip to content

Y
yd-email
Commit 59016175 by zhangxingmin
Options

push

parent 1dcd3f9e
Showing with 12 additions and 9 deletions
yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailFileServiceImpl.java
...@@ -130,7 +130,7 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService { ...@@ -130,7 +130,7 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService {
try { try {
// 远程调用Feign，通用Excel导入接口 // 远程调用Feign，通用Excel导入接口
Result<ImportResult> result = apiExcelFeignClient.importExcel(file, 0, 0, null); Result<ImportResult> result = apiExcelFeignClient.importExcel(file, 0, 0, null,2);
ImportResult importResult = result.getData(); ImportResult importResult = result.getData();
if (Objects.isNull(result.getData()) || (!Objects.isNull(result.getData()) && !importResult.isSuccess())) { if (Objects.isNull(result.getData()) || (!Objects.isNull(result.getData()) && !importResult.isSuccess())) {
return Result.fail("Excel导入失败: " + (importResult.getMessage() != null ? importResult.getMessage() : "未知错误")); return Result.fail("Excel导入失败: " + (importResult.getMessage() != null ? importResult.getMessage() : "未知错误"));
...@@ -362,7 +362,7 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService { ...@@ -362,7 +362,7 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService {
public Result importContactExcel(MultipartFile file) { public Result importContactExcel(MultipartFile file) {
try { try {
// 远程调用Feign，通用Excel导入接口 // 远程调用Feign，通用Excel导入接口
Result<ImportResult> result = apiExcelFeignClient.importExcel(file, 0, 0, null); Result<ImportResult> result = apiExcelFeignClient.importExcel(file, 0, 0, null,2);
ImportResult importResult = result.getData(); ImportResult importResult = result.getData();
if (Objects.isNull(result.getData()) || (!Objects.isNull(result.getData()) && !importResult.isSuccess())) { if (Objects.isNull(result.getData()) || (!Objects.isNull(result.getData()) && !importResult.isSuccess())) {
return Result.fail("Excel导入失败: " + (importResult.getMessage() != null ? importResult.getMessage() : "未知错误")); return Result.fail("Excel导入失败: " + (importResult.getMessage() != null ? importResult.getMessage() : "未知错误"));
......
yd-email-feign/src/main/java/com/yd/email/feign/enums/GeneralVariableEnum.java
...@@ -2,11 +2,13 @@ package com.yd.email.feign.enums; ...@@ -2,11 +2,13 @@ package com.yd.email.feign.enums;
public enum GeneralVariableEnum { public enum GeneralVariableEnum {
GENERAL_CONTACT("联系人","{{name}}"), // GENERAL_CONTACT("联系人","{{name}}"),
GENERAL_EMAIL("邮箱","{{email}}"), GENERAL_EMAIL("收件人邮箱","{{email}}"),//TODO
GENERAL_CC_EMAIL("抄送人","{{ccEmail}}"), GENERAL_CC_EMAIL("抄送人","{{ccEmail}}"),//TODO
GENERAL_APPELLATION("称谓","{{appellation}}"), GENERAL_APPELLATION("收件人称谓","{{appellation}}"),//TODO
GENERAL_COMPANTNAME("公司","{{compantName}}"), GENERAL_COMPANTNAME("公司","{{compantName}}"),//TODO
; ;
//字典项标签（名称） //字典项标签（名称）
......
yd-email-feign/src/main/java/com/yd/email/feign/utils/StringUtil.java
...@@ -49,8 +49,9 @@ public class StringUtil { ...@@ -49,8 +49,9 @@ public class StringUtil {
if (StringUtils.isBlank(content)) { if (StringUtils.isBlank(content)) {
return false; return false;
} }
return (content.contains(GeneralVariableEnum.GENERAL_CONTACT.getItemValue()) return (
|| content.contains(GeneralVariableEnum.GENERAL_APPELLATION.getItemValue()) // content.contains(GeneralVariableEnum.GENERAL_CONTACT.getItemValue()) ||
content.contains(GeneralVariableEnum.GENERAL_APPELLATION.getItemValue())
|| content.contains(GeneralVariableEnum.GENERAL_COMPANTNAME.getItemValue()) || content.contains(GeneralVariableEnum.GENERAL_COMPANTNAME.getItemValue())
|| content.contains(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue()) || content.contains(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue())
|| content.contains(GeneralVariableEnum.GENERAL_EMAIL.getItemValue()) || content.contains(GeneralVariableEnum.GENERAL_EMAIL.getItemValue())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment