@ -7,6 +7,7 @@ import com.baiye.config.properties.DeliveryProperties;
import com.baiye.constant.AdPlatFormConstants ;
import com.baiye.constant.AdPlatFormConstants ;
import com.baiye.constant.DefaultNumberConstants ;
import com.baiye.constant.DefaultNumberConstants ;
import com.baiye.constant.FileConstant ;
import com.baiye.constant.FileConstant ;
import com.baiye.model.dto.wechat.SendMailDTO ;
import com.baiye.modules.platform.service.dto.ImeiDTO ;
import com.baiye.modules.platform.service.dto.ImeiDTO ;
import lombok.extern.slf4j.Slf4j ;
import lombok.extern.slf4j.Slf4j ;
@ -23,7 +24,8 @@ public class FileAndMailUtil {
}
}
public static String zipFileAndSendDMPMail ( List < ImeiDTO > list , String file , String taskImeiName , DeliveryProperties deliveryProperties , Integer type ) {
public static SendMailDTO zipFileAndSendDMPMail ( List < ImeiDTO > list , String file , String taskImeiName , DeliveryProperties deliveryProperties , Integer type ) {
SendMailDTO sendMailDTO = SendMailDTO . builder ( ) . build ( ) ;
// 保存文件
// 保存文件
String csvPath = file . concat ( StrPool . DOT ) . concat ( FileConstant . CSV_FILE_SUB_NAME ) ;
String csvPath = file . concat ( StrPool . DOT ) . concat ( FileConstant . CSV_FILE_SUB_NAME ) ;
CSVFileUtil . createCsvFile ( list , csvPath ) ;
CSVFileUtil . createCsvFile ( list , csvPath ) ;
@ -34,8 +36,9 @@ public class FileAndMailUtil {
if ( ObjectUtil . isNotNull ( type ) & & type < DefaultNumberConstants . THREE_NUMBER ) {
if ( ObjectUtil . isNotNull ( type ) & & type < DefaultNumberConstants . THREE_NUMBER ) {
// 发送邮件
// 发送邮件
MailUtil. sendMail ( deliveryProperties . getEmailAddress ( ) ,
Boolean aBoolean = MailUtil. sendMail ( deliveryProperties . getEmailAddress ( ) ,
deliveryProperties . getEmailPassword ( ) , deliveryProperties . getToEmailAddress ( ) , zipPath , taskImeiName ) ;
deliveryProperties . getEmailPassword ( ) , deliveryProperties . getToEmailAddress ( ) , zipPath , taskImeiName ) ;
sendMailDTO . setSendResult ( aBoolean ) ;
// 删除文件
// 删除文件
if ( type < DefaultNumberConstants . TWO_NUMBER ) {
if ( type < DefaultNumberConstants . TWO_NUMBER ) {
boolean zipResult = FileUtil . del ( zipPath ) ;
boolean zipResult = FileUtil . del ( zipPath ) ;
@ -43,7 +46,8 @@ public class FileAndMailUtil {
log . info ( "=========================== the csv path as {}, zip path as {} csvResult as {} zipResult as {} ========================" , csvPath , zipPath , csvResult , zipResult ) ;
log . info ( "=========================== the csv path as {}, zip path as {} csvResult as {} zipResult as {} ========================" , csvPath , zipPath , csvResult , zipResult ) ;
}
}
}
}
return zipPath ;
sendMailDTO . setZipPath ( zipPath ) ;
return sendMailDTO ;
}
}
public static String zipFile ( List < ImeiDTO > list , String file , DeliveryProperties deliveryProperties ) {
public static String zipFile ( List < ImeiDTO > list , String file , DeliveryProperties deliveryProperties ) {