API注释添加,去除冗余代码

service-base/src/main/java/com/simuwang/base/pojo/vo/EmailParseInfoVO.java

@@ -31,7 +31,7 @@ public class EmailParseInfoVO {
      */
     private Integer emailType;
     /**
-     * 解析状态
+     * 解析状态:1-成功,2-净值缺失，3-未匹配基金，4-净值<=0,5-资产净值<=0
      */
     private Integer parseStatus;
 

service-manage/pom.xml

@@ -19,6 +19,10 @@
             <groupId>com.simuwang</groupId>
             <artifactId>service-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.simuwang</groupId>
+            <artifactId>service-daq</artifactId>
+        </dependency>
     </dependencies>
 
 <!--    <build>-->

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailConfigController.java

@@ -1,25 +0,0 @@
-package com.simuwang.manage.api.company;
-
-import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
-import com.simuwang.manage.service.CompanyEmailConfigService;
-import com.smppw.common.pojo.ResultVo;
-import com.smppw.common.pojo.enums.status.ResultCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * FileName: CompanyInformationController
- * Author:   chenjianhua
- * Date:     2024/9/6 15:25
- * Description: ${DESCRIPTION}
- */
-@RestController
-@RequestMapping("/v1/company")
-public class CompanyEmailConfigController {
-    private static final Logger logger = LoggerFactory.getLogger(CompanyEmailConfigController.class);
-
-}

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -36,9 +36,9 @@ public class CompanyEmailSendHistoryController extends BaseController {
      * @return
      */
     @RequestMapping("search-company-email")
-    public TableDataInfo searchCompanyEmail(@RequestParam(value = "companyName",required = false)String companyName,
-                                            @RequestParam(value = "email",required = false)String email,
-                                            @RequestParam(value = "sendStatus",required = false)Integer sendStatus){
+    public TableDataInfo searchCompanyEmail(@RequestParam(value = "companyName",required = false,name = "公司名称")String companyName,
+                                            @RequestParam(value = "email",required = false,name = "邮箱")String email,
+                                            @RequestParam(value = "sendStatus",required = false,name = "发送状态，0-失败，1-成功，-1未发送")Integer sendStatus){
         List<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchCompanyEmail(companyName,email,sendStatus);
         return getDataTable(result);
     }
@@ -49,7 +49,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
      * @return
      */
     @RequestMapping("search-email-history")
-    public TableDataInfo searchEmailHistory(@RequestParam(value = "companyId")String companyId){
+    public TableDataInfo searchEmailHistory(@RequestParam(value = "companyId",name = "公司ID")String companyId){
         List<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchEmailHistory(companyId);
         return getDataTable(result);
     }
@@ -61,7 +61,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
      * @return
      */
     @RequestMapping("search-email-config")
-    public TableDataInfo searchEmailConfig(@RequestParam(value = "companyId",required = false)String companyId){
+    public TableDataInfo searchEmailConfig(@RequestParam(value = "companyId",required = false,name = "公司ID")String companyId){
         List<CompanyEmailConfigVO> result = companyEmailSendHistoryService.searchEmailConfig(companyId);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/email/EmailConfigController.java

@@ -38,7 +38,7 @@ public class EmailConfigController extends BaseController {
      * @return
      */
     @RequestMapping("search-email-list")
-    public TableDataInfo searchEmailConfigList(@RequestParam(value = "email",required = false)String email){
+    public TableDataInfo searchEmailConfigList(@RequestParam(value = "email",required = false,name = "邮箱")String email){
         List<MailboxInfoTableVO> result = emailConfigService.searchEmailConfigList(email);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailController.java

@@ -6,6 +6,7 @@ import com.simuwang.base.common.util.EncodeUtil;
 import com.simuwang.base.pojo.vo.EmailFileInfoVO;
 import com.simuwang.base.pojo.vo.EmailParseInfoVO;
 import com.simuwang.base.pojo.vo.EmailTypeRuleVO;
+import com.simuwang.daq.service.EmailParseApiService;
 import com.simuwang.manage.api.base.BaseController;
 import com.simuwang.manage.service.ParseEmailService;
 import jakarta.servlet.ServletOutputStream;
@@ -35,6 +36,8 @@ public class ParseEmailController extends BaseController {
     @Autowired
     private ParseEmailService parseEmailService;
 
+    @Autowired
+    private EmailParseApiService emailParseApiService;
     /**
      * 保存邮件类型识别配置
      * @param emailTypeRuleVO
@@ -76,9 +79,9 @@ public class ParseEmailController extends BaseController {
      * @return
      */
     @GetMapping("/search-email-list")
-    public TableDataInfo searchEmailList(@RequestParam(value = "emailTitle",required = false)String emailTitle,
-                                         @RequestParam(value = "emailType",required = false)Integer emailType,
-                                         @RequestParam(value = "parseStatus",required = false)Integer parseStatus){
+    public TableDataInfo searchEmailList(@RequestParam(value = "emailTitle",required = false,name = "邮件标题")String emailTitle,
+                                         @RequestParam(value = "emailType",required = false,name = "邮件类型")Integer emailType,
+                                         @RequestParam(value = "parseStatus",required = false,name = "解析状态:1-成功,2-净值缺失，3-未匹配基金，4-净值<=0,5-资产净值<=0")Integer parseStatus){
         List<EmailParseInfoVO> result = parseEmailService.searchEmailList(emailTitle,emailType,parseStatus);
         return getDataTable(result);
     }
@@ -106,7 +109,7 @@ public class ParseEmailController extends BaseController {
     }
 
     /**
-     * 下载邮件附件
+     * 根据fileId下载邮件附件
      * @param fileId
      * @return
      */
@@ -131,13 +134,13 @@ public class ParseEmailController extends BaseController {
     }
 
     /**
-     * 重新解析
+     * 根据邮件ID重新解析
      * @param id
      * @return
      */
     @GetMapping("/reparse/{id}")
     public AjaxResult reparse(@PathVariable("id")Integer id){
-
+        emailParseApiService.reparseEmail(id);
         return AjaxResult.success();
     }
 }

service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -55,13 +55,13 @@ public class FundInformationController extends BaseController {
      */
     @RequestMapping("search-list")
     public List<FundInformationVO> searchFundInfoList(
-              @RequestParam(value = "fundId",required = false)String fundId,
-              @RequestParam(value = "fundShortName",required = false)String fundShortName,
-              @RequestParam(value = "companyShortName",required = false)String companyShortName,
-              @RequestParam(value = "navFrequency",required = false)Integer navFrequency,
-              @RequestParam(value = "assetFrequency",required = false)Integer assetFrequency,
-              @RequestParam(value = "startDate",required = false)Integer startDate,
-              @RequestParam(value = "endDate",required = false)Integer endDate){
+              @RequestParam(value = "fundId",required = false,name = "基金ID")String fundId,
+              @RequestParam(value = "fundShortName",required = false,name = "基金简称")String fundShortName,
+              @RequestParam(value = "companyShortName",required = false,name = "公司简称")String companyShortName,
+              @RequestParam(value = "navFrequency",required = false,name = "净值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频")Integer navFrequency,
+              @RequestParam(value = "assetFrequency",required = false,name = "规模报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频")Integer assetFrequency,
+              @RequestParam(value = "startDate",required = false,name = "净值开始时间")Integer startDate,
+              @RequestParam(value = "endDate",required = false,name = "净值结束时间")Integer endDate){
         List<FundInformationVO> result = fundInformationService.searchFundInfoList(fundId,fundShortName,companyShortName,navFrequency,assetFrequency,startDate,endDate);
         return result;
     }