统一请求的url

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

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

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

@@ -146,10 +146,10 @@ public class ShiroConfig {
         map.put("/v1/login", "anon");
         map.put("/v1/rsa-key", "anon");
         map.put("/test/**", "anon");
-        map.put("/company/**", "anon");
-        map.put("/parse/**", "anon");
-        map.put("/fund/**", "anon");
-        map.put("/email/**", "anon");
+        map.put("/v1/company/**", "anon");
+        map.put("/v1/parse/**", "anon");
+        map.put("/v1/fund/**", "anon");
+        map.put("/v1/email/**", "anon");
         map.put("/v1/**", "jwt");
         map.put("/**", "jwt");
         return map;

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailSendHistoryMapper.java

@@ -23,5 +23,5 @@ public interface CompanyEmailSendHistoryMapper {
 
     void deleteEmailHistory(@Param("emailList")List<String> email);
 
-    void deleteEmailHistoryByIds(@Param("ids") String[] split);
+    void deleteEmailHistoryByIds(@Param("ids") List<Integer> idList);
 }

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

@@ -39,7 +39,7 @@ public class CompanyEmailSendHistoryVO {
     /**
      * 发送时间
      */
-    private Date sendTime;
+    private String sendTime;
     /**
      * 发送备注
      */

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

@@ -0,0 +1,21 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * FileName: ComyanyEmailIdVO
+ * Author:   chenjianhua
+ * Date:     2024/9/12 17:20
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class ComyanyEmailIdVO {
+
+    private Integer id;
+
+    private String companyId;
+
+    private List<Integer> idList;
+}

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * Description: ${DESCRIPTION}
  */
 @Data
-public class SaveSuccessVO {
+public class SuccessVO {
     private Integer status;
     private String msg;
 }

service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -29,7 +29,7 @@
             cec.company_id,
             c.company_name,
             listagg(cec.email,',') as email,
-            max(cesh.send_time) as send_time,
+            DATE_FORMAT(max(cesh.send_time),'%Y-%m-%d %H:%i:%s') as send_time,
             cesh.send_remark,
             cesh.send_status
         FROM
@@ -38,6 +38,8 @@
         ON cec.company_id = c.company_id
         LEFT JOIN PPW_EMAIL.company_email_send_history cesh
         ON cec.email = cesh.email AND cesh.isvalid = 1
+        LEFT JOIN (select me.email as email,max(me.send_time) as send_time from PPW_EMAIL.company_email_send_history me where isvalid =1 group by me.email) maxce
+        ON cec.email = maxce.email
         WHERE cec.isvalid = 1 and c.isvalid=1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('',#{companyName},'') or c.company_short_name like concat('',#{companyName},''))

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("/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,8 @@ import com.simuwang.base.common.page.TableDataInfo;
 import com.simuwang.base.common.result.AjaxResult;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
-import com.simuwang.base.pojo.vo.SaveSuccessVO;
+import com.simuwang.base.pojo.vo.ComyanyEmailIdVO;
+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;
@@ -24,7 +25,7 @@ import java.util.List;
  * Description: ${DESCRIPTION}
  */
 @RestController
-@RequestMapping("/company")
+@RequestMapping("/v1/company")
 public class CompanyEmailSendHistoryController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(CompanyEmailSendHistoryController.class);
     @Autowired
@@ -70,23 +71,32 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
     /**
      * 删除邮箱配置
-     * @param companyId
+     * @param comyanyEmailIdVO
      * @return
      */
     @PostMapping("delete-company-email")
-    public AjaxResult deleteEmail(@RequestParam(value = "companyId")String companyId){
-        companyEmailSendHistoryService.deleteEmail(companyId);
-        return AjaxResult.success();
+    public ResultVo deleteEmail(@RequestBody ComyanyEmailIdVO comyanyEmailIdVO){
+        ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
+        try{
+            SuccessVO successVO = companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
+            vo.setData(successVO);
+        }catch (Exception e){
+            vo = new ResultVo(ResultCode.SAVE_FAILED);
+            logger.error(e.getMessage(),e);
+        }
+        return vo;
     }
     /**
      * 删除邮箱发送历史数据
-     * @param ids
+     * @param comyanyEmailIdVO
      * @return
      */
     @PostMapping("delete-email-history")
-    public AjaxResult deleteEmailHistory(String ids){
-        companyEmailSendHistoryService.deleteEmailHistory(ids);
-        return AjaxResult.success();
+    public ResultVo deleteEmailHistory(@RequestBody ComyanyEmailIdVO comyanyEmailIdVO){
+        ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
+        SuccessVO successVO = companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
+        vo.setData(successVO);
+        return vo;
     }
 
     /**
@@ -98,7 +108,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            SaveSuccessVO saveSuccessVO = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
+            SuccessVO saveSuccessVO = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
             vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
@@ -116,7 +126,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            SaveSuccessVO saveSuccessVO = companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
+            SuccessVO saveSuccessVO = companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
             vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
@@ -127,14 +137,14 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
     /**
      * 删除邮箱配置
-     * @param id
+     * @param comyanyEmailIdVO
      * @return
      */
     @PostMapping("delete-email-config")
-    public ResultVo deleteCompanyEmailConfig(@RequestParam("id")Integer id){
+    public ResultVo deleteCompanyEmailConfig(@RequestBody ComyanyEmailIdVO comyanyEmailIdVO){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
         try{
-            SaveSuccessVO saveSuccessVO = companyEmailConfigService.deleteCompanyEmailConfig(id);
+            SuccessVO saveSuccessVO = companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
             vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.DELETE_FAILED);

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * Description: ${DESCRIPTION}
  */
 @RestController
-@RequestMapping("/company")
+@RequestMapping("/v1/company")
 public class CompanyInformationController {
     @Autowired
     private CompanyInformationService companyInformationService;

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

@@ -24,7 +24,7 @@ import java.util.List;
  * Description: ${DESCRIPTION}
  */
 @RestController
-@RequestMapping("/email")
+@RequestMapping("/v1/email")
 public class EmailConfigController extends BaseController {
 
     @Autowired

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

@@ -29,7 +29,7 @@ import java.util.Map;
  * Description: ${DESCRIPTION}
  */
 @RestController
-@RequestMapping("/parse")
+@RequestMapping("/v1/parse")
 public class ParseEmailController extends BaseController {
 
     @Autowired

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

@@ -23,7 +23,7 @@ import java.util.Map;
  * Description: ${DESCRIPTION}
  */
 @RestController
-@RequestMapping("/fund")
+@RequestMapping("/v1/fund")
 public class FundInformationController extends BaseController {
 
     private static final Logger logger = LoggerFactory.getLogger(FundInformationController.class);

service-manage/src/main/java/com/simuwang/manage/api/system/SysConfigController.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Controller
-@RequestMapping("/system/config")
+@RequestMapping("/v1/system/config")
 public class SysConfigController extends BaseController
 {
     private String prefix = "system/config";

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

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

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

@@ -2,6 +2,7 @@ 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;
 
@@ -15,9 +16,9 @@ public interface CompanyEmailSendHistoryService {
     List<CompanyEmailSendHistoryVO> searchCompanyEmail(String companyName, String email, Integer sendStatus);
     List<CompanyEmailSendHistoryVO> searchEmailHistory(String companyId);
 
-    void deleteEmail(String email);
+    SuccessVO deleteEmail(String email);
 
-    void deleteEmailHistory(String ids);
+    SuccessVO deleteEmailHistory(List<Integer> idList);
 
     List<CompanyEmailConfigVO> searchEmailConfig(String companyId);
 }

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

@@ -3,13 +3,12 @@ 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.SaveSuccessVO;
+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;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -24,8 +23,8 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     @Autowired
     private CompanyEmailConfigMapper companyEmailConfigMapper;
     @Override
-    public SaveSuccessVO saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
-        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+    public SuccessVO saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
+        SuccessVO saveSuccessVO = new SuccessVO();
         try{
             for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
                 CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
@@ -53,8 +52,8 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     }
 
     @Override
-    public SaveSuccessVO deleteCompanyEmailConfig(Integer id) {
-        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+    public SuccessVO deleteCompanyEmailConfig(Integer id) {
+        SuccessVO saveSuccessVO = new SuccessVO();
         try {
             CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectById(id);
             if (configDO != null) {
@@ -63,7 +62,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 companyEmailConfigMapper.updateById(configDO);
             }
             saveSuccessVO.setStatus(1);
-            saveSuccessVO.setMsg(ResultCode.SUCCESS.getMsg());
+            saveSuccessVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
         }catch (Exception e){
             saveSuccessVO.setStatus(0);
             saveSuccessVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
@@ -72,8 +71,8 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     }
 
     @Override
-    public SaveSuccessVO updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
-        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+    public SuccessVO updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
+        SuccessVO saveSuccessVO = new SuccessVO();
         try {
             CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(companyEmailConfigVO.getId());
             if(configDO != null){

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

@@ -4,7 +4,9 @@ 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;
@@ -36,20 +38,37 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     @Transactional
-    public void deleteEmail(String companyId) {
-
-        List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
-        //删除配置
-        companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
-        //删除历史
-        if(emailList.size() > 0){
-            companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
+    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());
         }
+        return successVO;
     }
 
     @Override
-    public void deleteEmailHistory(String ids) {
-        companyEmailSendHistoryMapper.deleteEmailHistoryByIds(ids.split(","));
+    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;
     }
 
     @Override