fix:删除错误的测试

service-base/pom.xml

@@ -221,6 +221,11 @@
             <version>2.0.53</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 <!--    <build>-->

service-base/src/main/java/com/simuwang/base/config/ShiroConfig.java

@@ -146,6 +146,7 @@ public class ShiroConfig {
     private Map<String, String> filterChainDefinition() {
         Map<String, String> map = MapUtil.newHashMap(20, true);
         map.put("/static/**", "anon");
+        map.put("/v1/test/**", "anon");
         map.put("/v1/login", "anon");
         map.put("/v1/rsa-key", "anon");
         map.put("/v1/**", "anon");

service-base/src/main/java/com/simuwang/base/pojo/dto/sys/RoleAddCmd.java

@@ -37,7 +37,7 @@ public class RoleAddCmd extends BaseAddCmd<SysRoleDO> {
         SysRoleDO entity = new SysRoleDO();
         entity.setRoleName(this.roleName);
         entity.setRoleKey(this.roleKey);
-        entity.setRoleSort(this.roleSort);
+        entity.setRoleSort(this.roleSort == null ? 10 : this.roleSort);
         entity.setStatus(this.status);
         entity.setRemark(this.remark);
         return entity;

service-daq/src/main/java/com/simuwang/daq/components/PDMonthlyReportParser.java

@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
  */
 @Component("monthly-report:pdf")
 public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNavInfo> {
-    private final EmailFieldMappingMapper fieldMappingMapper;
     private final List<Table> extNavTables = ListUtil.list(true);
+    private final EmailFieldMappingMapper fieldMappingMapper;
     private String reportName = null;
     private Table baseInfoTable = null;
     private List<ValueLabelVO> fieldMapper = null;
@@ -131,7 +131,9 @@ public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNav
     }
 
     private void buildInfo(Map<String, Object> extInfoMap, Object info) {
-        extInfoMap.forEach((k, v) -> {
+        for (Map.Entry<String, Object> entry : extInfoMap.entrySet()) {
+            String k = entry.getKey();
+            Object v = entry.getValue();
             String fieldValue = StrUtil.toStringOrNull(v);
             if (fieldValue.startsWith("-") || fieldValue.endsWith("-")) {
                 fieldValue = null;
@@ -143,17 +145,25 @@ public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNav
                 String fieldName = vo.getValue();
                 List<String> labels = StrUtil.split(vo.getLabel(), ",");
                 if (labels.contains(k)) {
-                    ReflectUtil.setFieldValue(info, fieldName, fieldValue);
+                    try {
+                        ReflectUtil.setFieldValue(info, fieldName, fieldValue);
+                    } catch (Exception e) {
+                        this.logger.warn("{} 字段值设置错误：{}", fieldName, e.getMessage());
+                    }
                     break;
                 }
                 for (String label : labels) {
                     if (k.contains(label)) {
-                        ReflectUtil.setFieldValue(info, fieldName, fieldValue);
+                        try {
+                            ReflectUtil.setFieldValue(info, fieldName, fieldValue);
+                        } catch (Exception e) {
+                            this.logger.warn("{} 字段值设置错误：{}", fieldName, e.getMessage());
+                        }
                         break;
                     }
                 }
             }
-        });
+        }
     }
 
     @Override
@@ -257,7 +267,7 @@ public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNav
         } else if (matcher3.find()) {
             reportName = matcher3.group();
         } else {
-            return null;
+            reportName = text;
         }
         return reportName.replace("（", "(").replace("）", ")");
     }

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

@@ -1,8 +1,20 @@
 package com.simuwang.daq.service;
 
+import com.simuwang.daq.components.ReportParser;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ReportParseService {
-//    private
+    private final ReportParser parser;
+
+    public ReportParseService(ReportParser parser) {
+        this.parser = parser;
+    }
+
+    public void parse() {
+//        this.parser.parse(1, "D:\\Documents\\workspace\\idea\\smppw\\data-daq\\service-daq\\src\\main\\java\\com\\simuwang\\daq\\utils\\12931.pdf", "幻方量化1000指数专享1号5期私募证券投资基金宁波幻方量化投资管理合伙企业（有限合伙）");
+        this.parser.parse(1,
+                "D:\\Documents\\workspace\\idea\\smppw\\data-daq\\service-daq\\src\\main\\java\\com\\simuwang\\daq\\utils\\12931.pdf",
+                "古曲泉发一号私募证券投资基金上海古曲私募基金管理有限公司");
+    }
 }

service-deploy/pom.xml

@@ -41,10 +41,22 @@
             <artifactId>service-daq</artifactId>
         </dependency>
 
+        <!-- JUnit 5 -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

service-deploy/src/main/test/java/com/simuwang/datadaq/DataTrusteeApplicationTests.java

@@ -1,63 +0,0 @@
-package com.simuwang.datadaq;
-
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
-import com.simuwang.base.common.conts.DateConst;
-import com.simuwang.base.pojo.dto.MailboxInfoDTO;
-import com.simuwang.daq.service.EmailParseApiService;
-import com.simuwang.daq.service.EmailParseService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@SpringBootTest
-class DataTrusteeApplicationTests {
-
-    @Autowired
-    private EmailParseService emailParseService;
-
-    @Autowired
-    private EmailParseApiService emailParseApiService;
-
-    @Test
-    public void test() {
-        MailboxInfoDTO emailInfoDTO = new MailboxInfoDTO();
-        emailInfoDTO.setUserId(2395446);
-        emailInfoDTO.setAccount("mozuwen@simuwang.com");
-        emailInfoDTO.setPassword("Mzw@0306");
-        emailInfoDTO.setHost("imap.exmail.qq.com");
-        emailInfoDTO.setPort("993");
-        emailInfoDTO.setProtocol("imap");
-//
-//        emailInfoDTO.setAccount("jjpj_test");
-//        emailInfoDTO.setPassword("shzq#919");
-//        emailInfoDTO.setHost("mail.shzq.com");
-//        emailInfoDTO.setPort("993");
-//        emailInfoDTO.setProtocol("imap");
-        Map<Integer, List<String>> emailTypeMap = MapUtil.newHashMap();
-        emailTypeMap.put(1, List.of("净值"));
-        Date startDate = DateUtil.parse("2024-09-19 20:56:00", DateConst.YYYY_MM_DD_HH_MM_SS);
-        Date endDate = DateUtil.parse("2024-09-19 21:00:00", DateConst.YYYY_MM_DD_HH_MM_SS);
-        try {
-            emailParseService.parseEmail(emailInfoDTO, startDate, endDate);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Test
-    public void testReparseEmail() {
-        emailParseApiService.reparseEmail(7);
-    }
-
-
-    @Test
-    public void testReparseFile() {
-        emailParseApiService.reparseFile(ListUtil.toList(40,43));
-    }
-}

service-manage/src/main/java/com/simuwang/manage/api/test/ReportParseTestApi.java

@@ -0,0 +1,21 @@
+package com.simuwang.manage.api.test;
+
+import com.simuwang.daq.service.ReportParseService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/v1/test/parse")
+public class ReportParseTestApi {
+    private final ReportParseService service;
+
+    public ReportParseTestApi(ReportParseService service) {
+        this.service = service;
+    }
+
+    @GetMapping("monthly")
+    public void monthly() {
+        this.service.parse();
+    }
+}