Преглед на файлове

fix:报告解析结果的类型优化

wangzaijun преди 4 седмици
родител
ревизия
6e62c1b356

+ 0 - 6
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/AnnuallyReportData.java

@@ -1,6 +1,5 @@
 package com.smppw.modaq.domain.dto.report;
 
-import com.smppw.modaq.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,9 +9,4 @@ public class AnnuallyReportData extends QuarterlyReportData {
     public AnnuallyReportData(ReportBaseInfoDTO baseInfo, ReportFundInfoDTO fundInfo) {
         super(baseInfo, fundInfo);
     }
-
-    @Override
-    public ReportType getReportType() {
-        return ReportType.ANNUALLY;
-    }
 }

+ 0 - 6
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/LetterReportData.java

@@ -1,7 +1,6 @@
 package com.smppw.modaq.domain.dto.report;
 
 import cn.hutool.core.util.StrUtil;
-import com.smppw.modaq.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,11 +15,6 @@ public class LetterReportData extends ReportData {
     }
 
     @Override
-    public ReportType getReportType() {
-        return ReportType.LETTER;
-    }
-
-    @Override
     public boolean wasFailed() {
         boolean superFlag = !super.wasFailed();
         if (!superFlag) {

+ 0 - 6
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/MonthlyReportData.java

@@ -1,6 +1,5 @@
 package com.smppw.modaq.domain.dto.report;
 
-import com.smppw.modaq.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,11 +15,6 @@ public class MonthlyReportData extends ReportData {
     }
 
     @Override
-    public ReportType getReportType() {
-        return ReportType.MONTHLY;
-    }
-
-    @Override
     public String toString() {
         return "{" +
                 super.toString() +

+ 0 - 6
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/QuarterlyReportData.java

@@ -1,6 +1,5 @@
 package com.smppw.modaq.domain.dto.report;
 
-import com.smppw.modaq.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,11 +23,6 @@ public class QuarterlyReportData extends ReportData {
     }
 
     @Override
-    public ReportType getReportType() {
-        return ReportType.QUARTERLY;
-    }
-
-    @Override
     public String toString() {
         return "{" +
                 super.toString() +

+ 1 - 5
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/ReportData.java

@@ -2,7 +2,6 @@ package com.smppw.modaq.domain.dto.report;
 
 import cn.hutool.core.util.StrUtil;
 import com.smppw.modaq.common.conts.Constants;
-import com.smppw.modaq.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -43,8 +42,6 @@ public abstract class ReportData implements Serializable {
         this.aiParse = false;
     }
 
-    public abstract ReportType getReportType();
-
     /**
      * 判断当前数据文件数据是否解析失败
      *
@@ -62,7 +59,6 @@ public abstract class ReportData implements Serializable {
     public String toString() {
         return "baseInfo=" + baseInfo +
                 ", fundInfo=" + fundInfo +
-                ", aiParse=" + aiParse +
-                ", reportType=" + this.getReportType();
+                ", aiParse=" + aiParse;
     }
 }

+ 0 - 7
mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/WeeklyReportData.java

@@ -1,18 +1,11 @@
 package com.smppw.modaq.domain.dto.report;
 
-import com.smppw.modaq.common.enums.ReportType;
-
 public class WeeklyReportData extends ReportData {
     public WeeklyReportData(ReportBaseInfoDTO baseInfo, ReportFundInfoDTO fundInfo) {
         super(baseInfo, fundInfo);
     }
 
     @Override
-    public ReportType getReportType() {
-        return ReportType.WEEKLY;
-    }
-
-    @Override
     public String toString() {
         return super.toString();
     }