瀏覽代碼

fix:修复bug

wangzaijun 7 月之前
父節點
當前提交
e5cf188a6a

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

@@ -10,4 +10,11 @@ public abstract class BaseReportDTO<T extends BaseReportDO> {
     private Integer fileId;
 
     public abstract T toEntity();
+
+    @Override
+    public String toString() {
+        return "{" +
+                "fileId=" + fileId +
+                '}';
+    }
 }

+ 9 - 0
service-base/src/main/java/com/simuwang/base/pojo/dto/report/PythonResult.java

@@ -11,4 +11,13 @@ public class PythonResult<T extends ReportData> {
     private String msg;
 
     private T data;
+
+    @Override
+    public String toString() {
+        return "{" +
+                "status=" + status +
+                ", msg='" + msg + '\'' +
+                ", data=" + data +
+                '}';
+    }
 }

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

@@ -4,14 +4,19 @@ import com.simuwang.base.common.enums.ReportType;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 @Setter
 @Getter
 public abstract class ReportData {
-    public abstract ReportType getReportType();
-
     private ReportBaseInfoDTO baseInfo;
-
     private ReportFundInfoDTO fundInfo;
+
+    public abstract ReportType getReportType();
+
+    @Override
+    public String toString() {
+        return "{" +
+                "baseInfo=" + baseInfo +
+                ", fundInfo=" + fundInfo +
+                '}';
+    }
 }

+ 3 - 0
service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -237,6 +237,9 @@ public class EmailParseService {
                 String body = HttpUtil.post(this.pyBaseUrl + api, JSONUtil.toJsonStr(params));
                 PythonResult<?> result = PythonReportConverter.convert(JSONUtil.parseObj(body), type);
                 reportData = result.getData();
+                if (log.isInfoEnabled()) {
+                    log.info("报告{}结果为:\n{}",params, reportData);
+                }
             } catch (Exception e) {
                 log.error("请求python的报告解析接口报错\n{}", ExceptionUtil.stacktraceToString(e));
             } finally {

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

@@ -64,7 +64,7 @@ public class ReportParseUtil {
         String body = HttpUtil.post(baseUrl + api, JSONUtil.toJsonStr(params));
         JSONObject obj = JSONUtil.parseObj(body);
         PythonResult<?> result = PythonReportConverter.convert(obj, type);
-        System.out.println(obj);
+        System.out.println(result);
 
 //        List<ValueLabelVO> fieldMapper = ListUtil.list(false);
 //        fieldMapper.add(new ValueLabelVO("fundName", "基金名称"));