日志完善

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

@@ -32,6 +32,6 @@ public class ReportFundInfoDO extends BaseReportDO {
     private String secondaryBenchmark;
     private String trustName;
 
-    private String dueDate;
+    private Date dueDate;
     private String isReviewed;
 }

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

@@ -13,8 +13,6 @@ public abstract class BaseReportDTO<T extends BaseReportDO> {
 
     @Override
     public String toString() {
-        return "{" +
-                "fileId=" + fileId +
-                '}';
+        return "fileId=" + fileId;
     }
 }

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

@@ -15,4 +15,12 @@ public class MonthlyReportData extends ReportData {
     public ReportType getReportType() {
         return ReportType.MONTHLY;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", netReport=" + netReport +
+                '}';
+    }
 }

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

@@ -23,4 +23,15 @@ public class QuarterlyReportData extends ReportData {
     public ReportType getReportType() {
         return ReportType.QUARTERLY;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", assetAllocation=" + assetAllocation +
+                ", financialIndicators=" + financialIndicators +
+                ", investmentIndustry=" + investmentIndustry +
+                ", shareChange=" + shareChange +
+                '}';
+    }
 }

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

@@ -40,4 +40,15 @@ public class ReportAssetAllocationDTO extends BaseReportDTO<ReportAssetAllocatio
         entity.setRemark(this.remark);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", assetType='" + assetType + '\'' +
+                ", columnName='" + columnName + '\'' +
+                ", marketValue=" + marketValue +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
 }

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

@@ -34,4 +34,14 @@ public class ReportBaseInfoDTO extends BaseReportDTO<ReportBaseInfoDO> {
         entity.setReportType(this.reportType);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", reportDate='" + reportDate + '\'' +
+                ", reportName='" + reportName + '\'' +
+                ", reportType='" + reportType + '\'' +
+                '}';
+    }
 }

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

@@ -14,9 +14,8 @@ public abstract class ReportData {
 
     @Override
     public String toString() {
-        return "{" +
-                "baseInfo=" + baseInfo +
+        return "baseInfo=" + baseInfo +
                 ", fundInfo=" + fundInfo +
-                '}';
+                ", reportType" + this.getReportType();
     }
 }

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

@@ -33,4 +33,17 @@ public class ReportFinancialIndicatorsDTO extends BaseReportDTO<ReportFinancialI
         entity.setRealizedIncome(this.realizedIncome);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", level='" + level + '\'' +
+                ", endDate=" + endDate +
+                ", fundAssetSize=" + fundAssetSize +
+                ", nav=" + nav +
+                ", profit=" + profit +
+                ", realizedIncome=" + realizedIncome +
+                '}';
+    }
 }

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

@@ -53,8 +53,21 @@ public class ReportFundInfoDTO extends BaseReportDTO<ReportFundInfoDO> {
         entity.setRiskReturnDesc(this.riskReturnDesc);
         entity.setSecondaryBenchmark(this.secondaryBenchmark);
         entity.setTrustName(this.trustName);
-        entity.setDueDate(this.dueDate);
+        entity.setDueDate(this.dueDate == null ? null : DateUtil.parseDate(this.dueDate));
         entity.setIsReviewed(this.isReviewed);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", advisorName='" + advisorName + '\'' +
+                ", fundName='" + fundName + '\'' +
+                ", inceptionDate='" + inceptionDate + '\'' +
+                ", registerNumber='" + registerNumber + '\'' +
+                ", trustName='" + trustName + '\'' +
+                ", dueDate='" + dueDate + '\'' +
+                '}';
+    }
 }

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

@@ -51,4 +51,17 @@ public class ReportInvestmentIndustryDTO extends BaseReportDTO<ReportInvestmentI
         entity.setRatio(this.ratio);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", industryCode='" + industryCode + '\'' +
+                ", industryName='" + industryName + '\'' +
+                ", investType=" + investType +
+                ", isbCode='" + isbCode + '\'' +
+                ", marketValue=" + marketValue +
+                ", ratio=" + ratio +
+                '}';
+    }
 }

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

@@ -47,4 +47,17 @@ public class ReportNetReportDTO extends BaseReportDTO<ReportNetReportDO> {
         entity.setNav(this.nav);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", level='" + level + '\'' +
+                ", valuationDate='" + valuationDate + '\'' +
+                ", cumulativeNav=" + cumulativeNav +
+                ", endTotalShares=" + endTotalShares +
+                ", fundAssetSize=" + fundAssetSize +
+                ", nav=" + nav +
+                '}';
+    }
 }

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

@@ -51,4 +51,17 @@ public class ReportShareChangeDTO extends BaseReportDTO<ReportShareChangeDO> {
         entity.setSubscription(this.subscription);
         return entity;
     }
+
+    @Override
+    public String toString() {
+        return "{" +
+                super.toString() +
+                ", level='" + level + '\'' +
+                ", initTotalShares=" + initTotalShares +
+                ", redemption=" + redemption +
+                ", sharePerAsset=" + sharePerAsset +
+                ", split=" + split +
+                ", subscription=" + subscription +
+                '}';
+    }
 }

service-daq/src/main/java/com/simuwang/daq/components/writer/AbstractReportWriter.java

@@ -37,7 +37,7 @@ public abstract class AbstractReportWriter<T extends ReportData> implements Repo
                 this.baseInfoMapper.insert(entity);
             }
         } catch (Exception e) {
-            this.logger.error("报告解析结果只报告基本信息保存报错\n{}", ExceptionUtil.stacktraceToString(e));
+            this.logger.error("报告解析结果之报告基本信息保存报错\n{}", ExceptionUtil.stacktraceToString(e));
         }
         try {
             ReportFundInfoDTO fundInfo = reportData.getFundInfo();
@@ -46,7 +46,7 @@ public abstract class AbstractReportWriter<T extends ReportData> implements Repo
                 this.fundInfoMapper.insert(entity);
             }
         } catch (Exception e) {
-            this.logger.error("报告解析结果只基金信息保存报错\n{}", ExceptionUtil.stacktraceToString(e));
+            this.logger.error("报告解析结果之基金信息保存报错\n{}", ExceptionUtil.stacktraceToString(e));
         }
         try {
             // 其他信息保存

service-daq/src/main/java/com/simuwang/daq/components/writer/MonthlyReportWriter.java

@@ -27,7 +27,8 @@ public class MonthlyReportWriter extends AbstractReportWriter<MonthlyReportData>
     protected void writeExtData(MonthlyReportData reportData) {
         List<ReportNetReportDTO> netReport = reportData.getNetReport();
         if (CollUtil.isNotEmpty(netReport)) {
-            List<ReportNetReportDO> entityList = netReport.stream().map(ReportNetReportDTO::toEntity).collect(Collectors.toList());
+            List<ReportNetReportDO> entityList = netReport.stream()
+                    .map(ReportNetReportDTO::toEntity).collect(Collectors.toList());
             this.netReportMapper.insert(entityList);
         }
     }