Quellcode durchsuchen

fix:修复报告入库报错问题

wangzaijun vor 7 Monaten
Ursprung
Commit
3bdc809a4f

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

@@ -1,5 +1,6 @@
 package com.simuwang.base.pojo.dos.report;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
@@ -33,5 +34,6 @@ public class ReportFundInfoDO extends BaseReportDO {
     private String trustName;
 
     private Date dueDate;
-    private String isReviewed;
+    @TableField(value = "reviewed")
+    private Integer isReviewed;
 }

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

@@ -32,7 +32,7 @@ public class ReportFundInfoDTO extends BaseReportDTO<ReportFundInfoDO> {
     private String trustName;
 
     private String dueDate;
-    private String isReviewed;
+    private Integer isReviewed;
 
     @Override
     public ReportFundInfoDO toEntity() {

+ 3 - 3
service-daq/src/main/java/com/simuwang/daq/components/PythonReportConverter.java

@@ -97,16 +97,16 @@ public class PythonReportConverter {
         dto.setSecondaryBenchmark(obj.getStr("secondary_benchmark"));
         dto.setTrustName(obj.getStr("trust_name"));
         dto.setDueDate(obj.getStr("due_date"));
-        dto.setIsReviewed(obj.getStr("is_reviewed"));
+        dto.setIsReviewed(obj.getInt("is_reviewed"));
         return dto;
     }
 
     private static List<ReportNetReportDTO> convertNetReport(JSONObject jsonObject) {
         List<ReportNetReportDTO> dtos = ListUtil.list(false);
-        if (jsonObject == null || !jsonObject.containsKey("new_report")) {
+        if (jsonObject == null || !jsonObject.containsKey("net_report")) {
             return dtos;
         }
-        JSONArray jsonArray = jsonObject.getJSONArray("new_report");
+        JSONArray jsonArray = jsonObject.getJSONArray("net_report");
         if (CollUtil.isEmpty(jsonArray)) {
             return dtos;
         }

+ 8 - 5
service-deploy/src/test/java/com/simuwang/ApplicationTest.java

@@ -26,9 +26,12 @@ public class ApplicationTest {
     @Test
     public void test() {
         MailboxInfoDTO emailInfoDTO = new MailboxInfoDTO();
-        emailInfoDTO.setUserId(2374315);
-        emailInfoDTO.setAccount("wangzaijun@simuwang.com");
-        emailInfoDTO.setPassword("WZJ2twy1314");
+//        emailInfoDTO.setUserId(2374315);
+//        emailInfoDTO.setAccount("wangzaijun@simuwang.com");
+//        emailInfoDTO.setPassword("WZJ2twy1314");
+        emailInfoDTO.setUserId(2395446);
+        emailInfoDTO.setAccount("mozuwen@simuwang.com");
+        emailInfoDTO.setPassword("Mzw@0306");
         emailInfoDTO.setHost("imap.exmail.qq.com");
         emailInfoDTO.setPort("993");
         emailInfoDTO.setProtocol("imap");
@@ -39,8 +42,8 @@ public class ApplicationTest {
 //        emailInfoDTO.setPort("993");
 //        emailInfoDTO.setProtocol("imap");
 
-        Date startDate = DateUtil.parse("2024-09-25 16:20:00", DateConst.YYYY_MM_DD_HH_MM_SS);
-        Date endDate = DateUtil.parse("2024-09-25 17:00:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        Date startDate = DateUtil.parse("2024-09-26 10:20:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        Date endDate = DateUtil.parse("2024-09-26 19:00:00", DateConst.YYYY_MM_DD_HH_MM_SS);
         try {
             emailParseService.parseEmail(emailInfoDTO, startDate, endDate);
         } catch (Exception e) {