Browse Source

公司邮箱配置保存接口

chenjianhua 7 months ago
parent
commit
ba12cd07f5

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

@@ -1,6 +1,8 @@
 package com.simuwang.base.common.result;
 
 import com.simuwang.base.common.util.StringUtil;
+import com.simuwang.base.pojo.vo.SaveSuccessVO;
+import com.smppw.common.pojo.enums.status.ResultCode;
 
 import java.util.HashMap;
 import java.util.Objects;
@@ -90,7 +92,10 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult success()
     {
-        return AjaxResult.success("操作成功");
+        SaveSuccessVO successVO = new SaveSuccessVO();
+        successVO.setStatus(1);
+        successVO.setMsg(ResultCode.SUCCESS.getMsg());
+        return AjaxResult.success(successVO);
     }
 
     /**
@@ -100,7 +105,7 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult success(Object data)
     {
-        return AjaxResult.success("操作成功", data);
+        return AjaxResult.success("", data);
     }
 
     /**

+ 0 - 18
service-base/src/main/java/com/simuwang/base/pojo/vo/CompanyEmailConfigSaveVO.java

@@ -1,18 +0,0 @@
-package com.simuwang.base.pojo.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * FileName: CompanyEmailConfigDO
- * Author:   chenjianhua
- * Date:     2024/9/7 12:45
- * Description: ${DESCRIPTION}
- */
-@Data
-public class CompanyEmailConfigSaveVO {
-
-    private List<CompanyEmailConfigVO> companyEmailConfigVOList;
-
-}

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

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

+ 1 - 1
service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -46,7 +46,7 @@
                r.asset_Frequency as assetFrequency,
                r.frequency_remark as frequencyRemark
         from PPW_EMAIL.pvn_fund_info f
-        join PPW_EMAIL.company_information c on f.trust_id = c.company_id
+        join PPW_EMAIL.pvn_company_info c on f.trust_id = c.company_id
         left join (select nv.fund_id,max(nv.price_date) as last_price_date from PPW_EMAIL.nav nv where nv.isvalid =1 group by nv.fund_id) n
         on f.fund_id = n .fund_id
         left join PPW_EMAIL.fund_report_frequency r on r.fund_id = f.fund_id and r.isvalid =1

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

@@ -3,9 +3,9 @@ package com.simuwang.manage.api.company;
 
 import com.simuwang.base.common.page.TableDataInfo;
 import com.simuwang.base.common.result.AjaxResult;
-import com.simuwang.base.pojo.vo.CompanyEmailConfigSaveVO;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
+import com.simuwang.base.pojo.vo.SaveSuccessVO;
 import com.simuwang.manage.api.base.BaseController;
 import com.simuwang.manage.service.CompanyEmailConfigService;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
-import java.util.Map;
 
 /**
  * FileName: CompanyInformationController
@@ -99,7 +98,8 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
+            SaveSuccessVO saveSuccessVO = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
+            vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
@@ -116,7 +116,8 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         try{
-            companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
+            SaveSuccessVO saveSuccessVO = companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
+            vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
@@ -133,7 +134,8 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public ResultVo deleteCompanyEmailConfig(@RequestParam("id")Integer id){
         ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS);
         try{
-            companyEmailConfigService.deleteCompanyEmailConfig(id);
+            SaveSuccessVO saveSuccessVO = companyEmailConfigService.deleteCompanyEmailConfig(id);
+            vo.setData(saveSuccessVO);
         }catch (Exception e){
             vo = new ResultVo(ResultCode.DELETE_FAILED);
             logger.error(e.getMessage(),e);

+ 4 - 3
service-manage/src/main/java/com/simuwang/manage/service/CompanyEmailConfigService.java

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

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

@@ -3,7 +3,9 @@ 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.manage.service.CompanyEmailConfigService;
+import com.smppw.common.pojo.enums.status.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,44 +24,71 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     @Autowired
     private CompanyEmailConfigMapper companyEmailConfigMapper;
     @Override
-    public void saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
-        for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
-            CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
-            emailConfigDO.setCompanyId(emailConfigVO.getCompanyId());
-            emailConfigDO.setCompanyName(emailConfigVO.getCompanyName());
-            emailConfigDO.setEmail(emailConfigVO.getEmail());
-            emailConfigDO.setOpenStatus(emailConfigVO.getOpenStatus());
-            emailConfigDO.setIsvalid(1);
-            emailConfigDO.setUpdateTime(new Date());
-            if(emailConfigVO.getId() != null){
-                emailConfigDO.setId(emailConfigVO.getId());
-                companyEmailConfigMapper.updateCompanyEmailConfig(emailConfigDO);
-            }else{
-                emailConfigDO.setCreateTime(new Date());
-                companyEmailConfigMapper.saveCompanyEmailConfig(emailConfigDO);
+    public SaveSuccessVO saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
+        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+        try{
+            for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
+                CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
+                emailConfigDO.setCompanyId(emailConfigVO.getCompanyId());
+                emailConfigDO.setCompanyName(emailConfigVO.getCompanyName());
+                emailConfigDO.setEmail(emailConfigVO.getEmail());
+                emailConfigDO.setOpenStatus(emailConfigVO.getOpenStatus());
+                emailConfigDO.setIsvalid(1);
+                emailConfigDO.setUpdateTime(new Date());
+                if(emailConfigVO.getId() != null){
+                    emailConfigDO.setId(emailConfigVO.getId());
+                    companyEmailConfigMapper.updateCompanyEmailConfig(emailConfigDO);
+                }else{
+                    emailConfigDO.setCreateTime(new Date());
+                    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 void deleteCompanyEmailConfig(Integer id) {
-        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectById(id);
-        if(configDO != null){
-            configDO.setIsvalid(0);
-            configDO.setUpdateTime(new Date());
-            companyEmailConfigMapper.updateById(configDO);
+    public SaveSuccessVO deleteCompanyEmailConfig(Integer id) {
+        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+        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.SUCCESS.getMsg());
+        }catch (Exception e){
+            saveSuccessVO.setStatus(0);
+            saveSuccessVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
         }
+        return saveSuccessVO;
     }
 
     @Override
-    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);
+    public SaveSuccessVO updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
+        SaveSuccessVO saveSuccessVO = new SaveSuccessVO();
+        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());
         }
+        return saveSuccessVO;
     }
 }