Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/java/com/simuwang/base/common/result/AjaxResult.java

@@ -1,7 +1,6 @@
 package com.simuwang.base.common.result;
 
 import com.simuwang.base.common.util.StringUtil;
-import com.simuwang.base.pojo.vo.SuccessVO;
 import com.smppw.common.pojo.enums.status.ResultCode;
 
 import java.util.HashMap;
@@ -92,10 +91,7 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult success()
     {
-        SuccessVO successVO = new SuccessVO();
-        successVO.setStatus(1);
-        successVO.setMsg(ResultCode.SUCCESS.getMsg());
-        return AjaxResult.success(successVO);
+        return AjaxResult.success();
     }
 
     /**

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

@@ -33,11 +33,11 @@ public class CompanyEmailConfigVO {
      */
     private String email;
     /**
-     * 邮箱地址
+     * 是否开启，1-开启，0-关闭
      */
     private Integer openStatus;
     /**
-     * 邮箱地址
+     * 备注信息
      */
     private String remark;
 

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

@@ -33,7 +33,7 @@ public class CompanyEmailSendHistoryVO {
      */
     private String email;
     /**
-     * 发送状态
+     * 发送状态，0-失败，1-成功，-1未发送
      */
     private Integer sendStatus;
     /**

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-base/src/main/java/com/simuwang/base/pojo/vo/IdVO.java

@@ -13,9 +13,16 @@ import java.util.List;
 @Data
 public class IdVO {
 
+    /**
+     * 主键ID
+     */
     private Integer id;
-
+    /**
+     * 公司ID
+     */
     private String companyId;
-
+    /**
+     * 批量ID集合
+     */
     private List<Integer> idList;
 }

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

@@ -26,7 +26,7 @@ public class MailboxInfoVO {
      */
     private String password;
     /**
-     * 协议
+     * 协议,pop3|imap
      */
     private String protocol;
     /**

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

@@ -1,15 +0,0 @@
-package com.simuwang.base.pojo.vo;
-
-import lombok.Data;
-
-/**
- * FileName: SaveSuccessVO
- * Author:   chenjianhua
- * Date:     2024/9/12 14:17
- * Description: ${DESCRIPTION}
- */
-@Data
-public class SuccessVO {
-    private Integer status;
-    private String msg;
-}

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

@@ -5,7 +5,6 @@ import com.simuwang.base.common.page.TableDataInfo;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
 import com.simuwang.base.pojo.vo.IdVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 import com.simuwang.manage.api.base.BaseController;
 import com.simuwang.manage.service.CompanyEmailConfigService;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
@@ -16,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
-
 /**
  * 公司邮箱配置管理
  * Author:   chenjianhua
@@ -32,9 +30,12 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
     @Autowired
     private CompanyEmailConfigService companyEmailConfigService;
+
     /**
-     * 表格查询
-     * @param email
+     * 公司邮箱页面展示查询
+     * @param companyName 公司名称
+     * @param email 邮箱地址
+     * @param sendStatus 发送状态，0-失败，1-成功，-1未发送
      * @return
      */
     @RequestMapping("search-company-email")
@@ -47,7 +48,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
     /**
      * 查询邮箱发送历史
-     * @param companyId
+     * @param companyId 公司ID
      * @return
      */
     @RequestMapping("search-email-history")
@@ -58,8 +59,8 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
 
     /**
-     * 查询邮箱发送历史
-     * @param companyId
+     * 查询邮箱配置信息
+     * @param companyId 公司ID
      * @return
      */
     @RequestMapping("search-email-config")
@@ -69,7 +70,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     }
 
     /**
-     * 删除邮箱配置
+     * 根据公司ID删除邮箱配置
      * @param comyanyEmailIdVO
      * @return
      */
@@ -77,8 +78,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo deleteEmail(@RequestBody IdVO comyanyEmailIdVO){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
         try{
-            SuccessVO successVO = companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
-            vo.setData(successVO);
+            companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
@@ -86,15 +86,14 @@ public class CompanyEmailSendHistoryController extends BaseController {
         return vo;
     }
     /**
-     * 删除邮箱发送历史数据
+     * 根据ID批量删除邮箱发送历史数据
      * @param comyanyEmailIdVO
      * @return
      */
     @PostMapping("delete-email-history")
     public ResultVo deleteEmailHistory(@RequestBody IdVO comyanyEmailIdVO){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
-        SuccessVO successVO = companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
-        vo.setData(successVO);
+        companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
         return vo;
     }
 
@@ -107,8 +106,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            SuccessVO saveSuccessVO = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
-            vo.setData(saveSuccessVO);
+            companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
@@ -125,8 +123,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            SuccessVO saveSuccessVO = companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
-            vo.setData(saveSuccessVO);
+            companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
@@ -135,7 +132,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     }
 
     /**
-     * 删除邮箱配置
+     * 根据ID删除邮箱配置
      * @param comyanyEmailIdVO
      * @return
      */
@@ -143,8 +140,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo deleteCompanyEmailConfig(@RequestBody IdVO comyanyEmailIdVO){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
         try{
-            SuccessVO saveSuccessVO = companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
-            vo.setData(saveSuccessVO);
+            companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
         }catch (Exception e){
             vo = new ResultVo(ResultCode.DELETE_FAILED);
             logger.error(e.getMessage(),e);

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

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * FileName: CompanyInformationController
+ * 公司信息查询
  * Author:   chenjianhua
  * Date:     2024/9/6 15:25
  * Description: ${DESCRIPTION}

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

@@ -1,16 +1,13 @@
 package com.simuwang.manage.api.email;
 
 import com.simuwang.base.common.page.TableDataInfo;
-import com.simuwang.base.common.result.AjaxResult;
 import com.simuwang.base.pojo.vo.IdVO;
 import com.simuwang.base.pojo.vo.MailboxInfoTableVO;
 import com.simuwang.base.pojo.vo.MailboxInfoVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 import com.simuwang.manage.api.base.BaseController;
 import com.simuwang.manage.service.EmailConfigService;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.common.pojo.enums.status.ResultCode;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +34,7 @@ public class EmailConfigController extends BaseController {
 
     /**
      * 页面展示查询
-     * @param email
+     * @param email 邮箱
      * @return
      */
     @RequestMapping("search-email-list")
@@ -53,23 +50,14 @@ public class EmailConfigController extends BaseController {
     @RequestMapping("save-email-config")
     public ResultVo saveEmailConfig(@RequestBody MailboxInfoVO mailboxInfoVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
-        SuccessVO successVO = new SuccessVO();
-        vo.setData(successVO);
         try{
             if(mailboxInfoVO.getId() == null && !emailConfigService.checkEmailUnique(mailboxInfoVO.getEmail())){
-                successVO.setMsg("邮箱地址已存在，无需添加");
-                successVO.setStatus(0);
-                vo.setData(successVO);
                 vo.setCode(ResultCode.SAVE_FAILED.getCode());
                 vo.setMsg("邮箱地址已存在，无需添加");
                 return vo;
             }
             emailConfigService.saveEmailConfig(mailboxInfoVO);
-            successVO.setMsg(ResultCode.SAVE_SUCCESS.getMsg());
-            successVO.setStatus(1);
         }catch (Exception e){
-            successVO.setMsg(ResultCode.SAVE_FAILED.getMsg());
-            successVO.setStatus(0);
             vo.setCode(ResultCode.SAVE_FAILED.getCode());
             logger.error(e.getMessage(),e);
         }
@@ -77,42 +65,36 @@ public class EmailConfigController extends BaseController {
     }
 
     /**
-     * 保存邮箱配置
+     * 批量删除邮箱配置
      * @param idVO
      * @return
      */
     @RequestMapping("delete-email-config")
     public ResultVo deleteEmailConfig(@RequestBody IdVO idVO){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS.getCode());
-        SuccessVO successVO = new SuccessVO();
-        vo.setData(successVO);
         try{
             emailConfigService.deleteEmailConfig(idVO.getIdList());
-            successVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
-            successVO.setStatus(1);
         }catch (Exception e){
             logger.error(e.getMessage(),e);
-            successVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
-            successVO.setStatus(0);
+            vo.setCode(ResultCode.DELETE_FAILED.getCode());
         }
         return vo;
     }
 
+    /**
+     * 邮箱连接测试
+     * @param mailboxInfoVO
+     * @return
+     */
     @RequestMapping("connect-test")
     public ResultVo connectTest(@RequestBody MailboxInfoVO mailboxInfoVO){
         ResultVo vo = new ResultVo(ResultCode.SUCCESS.getCode());
-        SuccessVO successVO = new SuccessVO();
-        vo.setData(successVO);
         String msg = "";
         try{
             msg = emailConfigService.connectTest(mailboxInfoVO);
             vo.setMsg(msg);
-            successVO.setMsg(msg);
-            successVO.setStatus(1);
         }catch (Exception e){
             vo.setMsg(e.getMessage());
-            successVO.setMsg(e.getMessage());
-            successVO.setStatus(0);
         }
         return vo;
     }

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

@@ -6,8 +6,11 @@ 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 com.smppw.common.pojo.ResultVo;
+import com.smppw.common.pojo.enums.status.ResultCode;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -35,20 +38,24 @@ public class ParseEmailController extends BaseController {
     @Autowired
     private ParseEmailService parseEmailService;
 
+    @Autowired
+    private EmailParseApiService emailParseApiService;
     /**
      * 保存邮件类型识别配置
      * @param emailTypeRuleVO
      * @return
      */
     @PostMapping("/save-email-type")
-    public AjaxResult saveEmailType(@RequestBody EmailTypeRuleVO emailTypeRuleVO){
+    public ResultVo saveEmailType(@RequestBody EmailTypeRuleVO emailTypeRuleVO){
+        ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
             parseEmailService.saveEmailType(emailTypeRuleVO);
         }catch (Exception e){
             logger.error(e.getMessage(),e);
-            return AjaxResult.error("保存失败");
+            vo.setCode(ResultCode.SAVE_SUCCESS.getCode());
+            vo.setMsg(e.getMessage());
         }
-        return AjaxResult.success();
+        return vo;
     }
 
     /**
@@ -57,22 +64,16 @@ public class ParseEmailController extends BaseController {
      * @return
      */
     @GetMapping("/search-email-type")
-    public AjaxResult searchEmailType(){
-        EmailTypeRuleVO emailTypeRuleVO = new EmailTypeRuleVO();
-        try{
-            emailTypeRuleVO = parseEmailService.searchEmailType();
-        }catch (Exception e){
-            logger.error(e.getMessage(),e);
-            return AjaxResult.error("查询失败");
-        }
-        return AjaxResult.success(emailTypeRuleVO);
+    public ResultVo searchEmailType(){
+        EmailTypeRuleVO emailTypeRuleVO = parseEmailService.searchEmailType();
+        return ResultVo.ok(emailTypeRuleVO);
     }
 
     /**
-     * 表格查询
-     * @param emailTitle
-     * @param emailType
-     * @param parseStatus
+     * 邮箱配置页面展示查询
+     * @param emailTitle -邮件标题
+     * @param emailType -邮件类型
+     * @param parseStatus 解析状态:1-成功,2-净值缺失，3-未匹配基金，4-净值<=0,5-资产净值<=0
      * @return
      */
     @GetMapping("/search-email-list")
@@ -89,9 +90,9 @@ public class ParseEmailController extends BaseController {
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult searchEmail(@PathVariable("id") Integer id){
+    public ResultVo searchEmail(@PathVariable("id") Integer id){
         EmailParseInfoVO result = parseEmailService.searchEmailById(id);
-        return AjaxResult.success(result);
+        return ResultVo.ok(result);
     }
 
     /**
@@ -100,13 +101,13 @@ public class ParseEmailController extends BaseController {
      * @return
      */
     @GetMapping("/search-email-count")
-    public AjaxResult searchEmailCount(@RequestParam("parseDate") String parseDate){
+    public ResultVo searchEmailCount(@RequestParam("parseDate") String parseDate){
         Map<String,Integer> result = parseEmailService.searchEmailCount(parseDate);
-        return AjaxResult.success(result);
+        return ResultVo.ok(result);
     }
 
     /**
-     * 下载邮件附件
+     * 根据fileId下载邮件附件
      * @param fileId
      * @return
      */
@@ -131,13 +132,13 @@ public class ParseEmailController extends BaseController {
     }
 
     /**
-     * 重新解析
+     * 根据邮件ID重新解析
      * @param id
      * @return
      */
     @GetMapping("/reparse/{id}")
-    public AjaxResult reparse(@PathVariable("id")Integer id){
-
-        return AjaxResult.success();
+    public ResultVo reparse(@PathVariable("id")Integer id){
+        emailParseApiService.reparseEmail(id);
+        return ResultVo.ok(null);
     }
 }

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

@@ -46,11 +46,14 @@ public class FundInformationController extends BaseController {
     }
 
     /**
-     * 页面查询
-     * @param fundShortName
-     * @param companyShortName
-     * @param navFrequency
-     * @param assetFrequency
+     *  页面展示查询
+     * @param fundId 基金ID
+     * @param fundShortName 基金简称
+     * @param companyShortName 公司简称
+     * @param navFrequency 净值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     * @param assetFrequency 规模报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     * @param startDate 净值开始时间
+     * @param endDate 净值结束时间
      * @return
      */
     @RequestMapping("search-list")

service-manage/src/main/java/com/simuwang/manage/service/CompanyEmailConfigService.java

@@ -1,7 +1,6 @@
 package com.simuwang.manage.service;
 
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 
 import java.util.List;
 
@@ -13,9 +12,9 @@ import java.util.List;
  */
 public interface CompanyEmailConfigService {
 
-    SuccessVO saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS);
+    void saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS);
 
-    SuccessVO deleteCompanyEmailConfig(Integer id);
+    void deleteCompanyEmailConfig(Integer id);
 
-    SuccessVO updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO);
+    void updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO);
 }

service-manage/src/main/java/com/simuwang/manage/service/CompanyEmailSendHistoryService.java

@@ -2,7 +2,6 @@ package com.simuwang.manage.service;
 
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 
 import java.util.List;
 
@@ -16,9 +15,9 @@ public interface CompanyEmailSendHistoryService {
     List<CompanyEmailSendHistoryVO> searchCompanyEmail(String companyName, String email, Integer sendStatus);
     List<CompanyEmailSendHistoryVO> searchEmailHistory(String companyId);
 
-    SuccessVO deleteEmail(String email);
+    void deleteEmail(String email);
 
-    SuccessVO deleteEmailHistory(List<Integer> idList);
+    void deleteEmailHistory(List<Integer> idList);
 
     List<CompanyEmailConfigVO> searchEmailConfig(String companyId);
 }

service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailConfigServiceImpl.java

@@ -3,9 +3,7 @@ package com.simuwang.manage.service.impl;
 import com.simuwang.base.mapper.CompanyEmailConfigMapper;
 import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 import com.simuwang.manage.service.CompanyEmailConfigService;
-import com.smppw.common.pojo.enums.status.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,8 +21,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     @Autowired
     private CompanyEmailConfigMapper companyEmailConfigMapper;
     @Override
-    public SuccessVO saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
-        SuccessVO saveSuccessVO = new SuccessVO();
+    public void saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
         try{
             for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
                 CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
@@ -42,52 +39,30 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                     companyEmailConfigMapper.saveCompanyEmailConfig(emailConfigDO);
                 }
             }
-            saveSuccessVO.setStatus(1);
-            saveSuccessVO.setMsg(ResultCode.SAVE_SUCCESS.getMsg());
         }catch (Exception e){
-            saveSuccessVO.setStatus(0);
-            saveSuccessVO.setMsg(ResultCode.SAVE_FAILED.getMsg());
+
         }
-        return saveSuccessVO;
     }
 
     @Override
-    public SuccessVO deleteCompanyEmailConfig(Integer id) {
-        SuccessVO saveSuccessVO = new SuccessVO();
-        try {
-            CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectById(id);
-            if (configDO != null) {
-                configDO.setIsvalid(0);
-                configDO.setUpdateTime(new Date());
-                companyEmailConfigMapper.updateById(configDO);
-            }
-            saveSuccessVO.setStatus(1);
-            saveSuccessVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
-        }catch (Exception e){
-            saveSuccessVO.setStatus(0);
-            saveSuccessVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
+    public void deleteCompanyEmailConfig(Integer id) {
+        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectById(id);
+        if (configDO != null) {
+            configDO.setIsvalid(0);
+            configDO.setUpdateTime(new Date());
+            companyEmailConfigMapper.updateById(configDO);
         }
-        return saveSuccessVO;
     }
 
     @Override
-    public SuccessVO updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
-        SuccessVO saveSuccessVO = new SuccessVO();
-        try {
-            CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(companyEmailConfigVO.getId());
-            if(configDO != null){
-                configDO.setEmail(companyEmailConfigVO.getEmail());
-                configDO.setCompanyId(companyEmailConfigVO.getCompanyId());
-                configDO.setCompanyName(companyEmailConfigVO.getCompanyName());
-                configDO.setUpdateTime(new Date());
-                companyEmailConfigMapper.updateCompanyEmailConfig(configDO);
-            }
-            saveSuccessVO.setStatus(1);
-            saveSuccessVO.setMsg(ResultCode.SUCCESS.getMsg());
-        }catch (Exception e){
-            saveSuccessVO.setStatus(0);
-            saveSuccessVO.setMsg(ResultCode.SAVE_FAILED.getMsg());
+    public void updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
+        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(companyEmailConfigVO.getId());
+        if(configDO != null){
+            configDO.setEmail(companyEmailConfigVO.getEmail());
+            configDO.setCompanyId(companyEmailConfigVO.getCompanyId());
+            configDO.setCompanyName(companyEmailConfigVO.getCompanyName());
+            configDO.setUpdateTime(new Date());
+            companyEmailConfigMapper.updateCompanyEmailConfig(configDO);
         }
-        return saveSuccessVO;
     }
 }

service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailSendHistoryServiceImpl.java

@@ -4,9 +4,7 @@ import com.simuwang.base.mapper.CompanyEmailConfigMapper;
 import com.simuwang.base.mapper.CompanyEmailSendHistoryMapper;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
-import com.simuwang.base.pojo.vo.SuccessVO;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
-import com.smppw.common.pojo.enums.status.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,37 +36,19 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     @Transactional
-    public SuccessVO deleteEmail(String companyId) {
-        SuccessVO successVO = new SuccessVO();
-        try{
-            List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
-            //删除配置
-            companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
-            //删除历史
-            if(emailList.size() > 0){
-                companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
-            }
-            successVO.setStatus(1);
-            successVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
-        }catch (Exception e){
-            successVO.setStatus(0);
-            successVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
+    public void deleteEmail(String companyId) {
+        List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
+        //删除配置
+        companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
+        //删除历史
+        if(emailList.size() > 0){
+            companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
         }
-        return successVO;
     }
 
     @Override
-    public SuccessVO deleteEmailHistory(List<Integer> idList) {
-        SuccessVO successVO = new SuccessVO();
-        try {
-            companyEmailSendHistoryMapper.deleteEmailHistoryByIds(idList);
-            successVO.setStatus(1);
-            successVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
-        }catch (Exception e){
-            successVO.setStatus(0);
-            successVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
-        }
-        return successVO;
+    public void deleteEmailHistory(List<Integer> idList) {
+        companyEmailSendHistoryMapper.deleteEmailHistoryByIds(idList);
     }
 
     @Override