fix:修复年度报告和月度报告识别错误问题

service-base/src/main/java/com/simuwang/base/pojo/dos/report/ReportFinancialIndicatorsDO.java

@@ -19,4 +19,8 @@ public class ReportFinancialIndicatorsDO extends BaseReportDO {
     private BigDecimal nav;
     private BigDecimal profit;
     private BigDecimal realizedIncome;
+    /**
+     * 期末可供分配利润
+     */
+    private BigDecimal undistributedProfit;
 }

service-base/src/main/java/com/simuwang/base/pojo/dto/report/ReportFinancialIndicatorsDTO.java

@@ -20,6 +20,10 @@ public class ReportFinancialIndicatorsDTO extends BaseReportDTO<ReportFinancialI
     private BigDecimal nav;
     private BigDecimal profit;
     private BigDecimal realizedIncome;
+    /**
+     * 期末可供分配利润
+     */
+    private BigDecimal undistributedProfit;
 
     @Override
     public ReportFinancialIndicatorsDO toEntity() {
@@ -31,6 +35,7 @@ public class ReportFinancialIndicatorsDTO extends BaseReportDTO<ReportFinancialI
         entity.setNav(this.nav);
         entity.setProfit(this.profit);
         entity.setRealizedIncome(this.realizedIncome);
+        entity.setUndistributedProfit(this.undistributedProfit);
         return entity;
     }
 
@@ -43,6 +48,7 @@ public class ReportFinancialIndicatorsDTO extends BaseReportDTO<ReportFinancialI
                 ", fundAssetSize=" + fundAssetSize +
                 ", nav=" + nav +
                 ", profit=" + profit +
+                ", undistributedProfit=" + undistributedProfit +
                 ", realizedIncome=" + realizedIncome +
                 '}';
     }

service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -364,9 +364,9 @@ public class EmailParseService {
                 registerNumber = matcher.group();
             }
             int type = 0;
-            if (fileName.contains("季报")) {
+            if (fileName.contains("季报") || fileName.contains("季度")) {
                 type = 1;
-            } else if (fileName.contains("年报")) {
+            } else if (fileName.contains("年报") || fileName.contains("年度")) {
                 type = 2;
             }
             String api = "/api/v1/parse/amac_report";

service-deploy/src/main/resources/application.yml

@@ -69,7 +69,7 @@ email-rule:
 
 email:
   file:
-    path: /data/file/nav
+    path: /home/wwwroot/shzq_dataapi/file/nav
   parse:
     force-template-enable: true