|
@@ -15,6 +15,7 @@ import com.simuwang.base.common.util.StringUtil;
|
|
|
import com.simuwang.base.pojo.dto.EmailContentInfoDTO;
|
|
|
import com.simuwang.base.pojo.dto.EmailFundNavDTO;
|
|
|
import com.simuwang.base.pojo.dto.FieldPositionDTO;
|
|
|
+import com.simuwang.logging.LoggingService;
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
@@ -36,6 +37,7 @@ import java.util.stream.Collectors;
|
|
|
public class NavEmailParser extends AbstractEmailParser {
|
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(AbstractEmailParser.class);
|
|
|
+ private final LoggingService loggingService;
|
|
|
|
|
|
@Value("${email.file.path}")
|
|
|
private String path;
|
|
@@ -50,9 +52,10 @@ public class NavEmailParser extends AbstractEmailParser {
|
|
|
|
|
|
private static final List<String> NOT_CONVERT_FIELD_LIST = ListUtil.toList("TA代码");
|
|
|
|
|
|
- public NavEmailParser(ValuationEmailParser valuationEmailParser, EmailTemplateService emailTemplateService) {
|
|
|
+ public NavEmailParser(ValuationEmailParser valuationEmailParser, EmailTemplateService emailTemplateService, LoggingService loggingService) {
|
|
|
this.valuationEmailParser = valuationEmailParser;
|
|
|
this.emailTemplateService = emailTemplateService;
|
|
|
+ this.loggingService = loggingService;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -107,6 +110,7 @@ public class NavEmailParser extends AbstractEmailParser {
|
|
|
}
|
|
|
//如果通用模板解析不到正确数据,就走模板解析一次
|
|
|
if (successNavCount == 0 || forceTemplateEnable) {
|
|
|
+ log.info("走模版解析"+emailContentInfoDTO.getFilePath());
|
|
|
List<EmailFundNavDTO> templateFundNavDTOList = emailTemplateService.parseUsingTemplate(emailContentInfoDTO);
|
|
|
if(CollUtil.isNotEmpty(templateFundNavDTOList)){
|
|
|
emailFundNavDTOList.addAll(templateFundNavDTOList);
|