Parcourir la source

fix:邮件解析-修复获取不全邮件正文的问题

mozuwen il y a 7 mois
Parent
commit
a90f1e52d1

+ 8 - 4
service-base/src/main/java/com/simuwang/base/common/util/ExcelUtil.java

@@ -233,6 +233,9 @@ public class ExcelUtil {
 
             Element elementRow = rows.get(rowNum);
             Elements cells = elementRow.select("td");
+            if (cells.size() == 0) {
+                cells = elementRow.select("th");
+            }
             int cellSize = cells.size();
             for (int cellNum = 0; cellNum < cellSize; cellNum++) {
                 Cell sheetRowCell = sheetRow.createCell(cellNum);
@@ -275,14 +278,15 @@ public class ExcelUtil {
         }
         return data;
     }
-    public static HSSFWorkbook getHSSFWorkbook(String sheetName, List<String> title, Map<String,List<List<String>>> valueMap, HSSFWorkbook wb) {
+
+    public static HSSFWorkbook getHSSFWorkbook(String sheetName, List<String> title, Map<String, List<List<String>>> valueMap, HSSFWorkbook wb) {
 
         // 第一步,创建一个HSSFWorkbook,对应一个Excel文件
         if (wb == null) {
             wb = new HSSFWorkbook();
         }
 
-        try{
+        try {
             // 第二步,在workbook中添加一个sheet,对应Excel文件中的sheet
             HSSFSheet sheet = wb.createSheet(sheetName);
             // 第三步,在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
@@ -314,8 +318,8 @@ public class ExcelUtil {
                     row.createCell(j).setCellValue(values.get(i).get(j));
                 }
             }
-        }catch (Exception e){
-            logger.error(e.getMessage(),e);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
         }
         return wb;
     }

+ 1 - 1
service-daq/src/main/java/com/simuwang/daq/service/NavEmailParser.java

@@ -423,7 +423,7 @@ public class NavEmailParser extends AbstractEmailParser {
 
         String assetShares = columnFieldMap.get(EmailFieldConst.PARENT_ASSET_SHARE) != null && sheetRow.getCell(columnFieldMap.get(EmailFieldConst.PARENT_ASSET_SHARE)) != null ?
                 ExcelUtil.getCellValue(sheetRow.getCell(columnFieldMap.get(EmailFieldConst.PARENT_ASSET_SHARE))) : null;
-        emailFundNavDTO.setAssetNet(ExcelUtil.numberDataStripCommas(assetShares));
+        emailFundNavDTO.setAssetShare(ExcelUtil.numberDataStripCommas(assetShares));
 
         return emailFundNavDTO;
     }