mail

hx-mail/src/main/java/com/fjhx/mail/controller/enterprise/EnterpriseMailboxController.java

@@ -1,16 +1,25 @@
 package com.fjhx.mail.controller.enterprise;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.enterprise.vo.EnterpriseMailboxVo;
-import com.fjhx.mail.entity.enterprise.dto.EnterpriseMailboxSelectDto;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.mail.config.MailServiceConfig;
 import com.fjhx.mail.entity.enterprise.dto.EnterpriseMailboxDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mail.entity.enterprise.dto.EnterpriseMailboxSelectDto;
+import com.fjhx.mail.entity.enterprise.vo.EnterpriseMailboxVo;
 import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
+import com.ruoyi.common.annotation.NonInterception;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -48,9 +57,13 @@ public class EnterpriseMailboxController {
     /**
      * 企业邮箱新增
      */
+    @NonInterception
     @PostMapping("/add")
-    public void add(@Validated @RequestBody EnterpriseMailboxDto enterpriseMailboxDto) {
-        enterpriseMailboxService.add(enterpriseMailboxDto);
+    public Object add(@Validated @RequestBody EnterpriseMailboxDto enterpriseMailboxDto) {
+        enterpriseMailboxDto.setCreateUser(SecurityUtils.getUserId());
+        enterpriseMailboxDto.setUpdateUser(SecurityUtils.getUserId());
+        String post = HttpUtil.post(MailServiceConfig.urlPrefix + "addEnterpriseMailbox", BeanUtil.beanToMap(enterpriseMailboxDto));
+        return JSON.parseObject(post);
     }
 
     /**

hx-mail/src/main/java/com/fjhx/mail/controller/personal/PersonalMailboxController.java

@@ -1,13 +1,19 @@
 package com.fjhx.mail.controller.personal;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.mail.config.MailServiceConfig;
 import com.fjhx.mail.entity.personal.dto.PersonalMailboxDto;
 import com.fjhx.mail.entity.personal.dto.PersonalMailboxSelectDto;
 import com.fjhx.mail.entity.personal.vo.PersonalMailboxVo;
 import com.fjhx.mail.service.personal.PersonalMailboxService;
+import com.ruoyi.common.annotation.NonInterception;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,9 +57,14 @@ public class PersonalMailboxController {
     /**
      * 个人邮箱新增
      */
+    @NonInterception
     @PostMapping("/add")
-    public void add(@Validated @RequestBody PersonalMailboxDto personalMailboxDto) {
-        personalMailboxService.add(personalMailboxDto);
+    public Object add(@Validated @RequestBody PersonalMailboxDto personalMailboxDto) {
+        personalMailboxDto.setCreateUser(SecurityUtils.getUserId());
+        personalMailboxDto.setUpdateUser(SecurityUtils.getUserId());
+        personalMailboxDto.setUserId(SecurityUtils.getUserId());
+        String post = HttpUtil.post(MailServiceConfig.urlPrefix + "addPersonalMailbox", BeanUtil.beanToMap(personalMailboxDto));
+        return JSON.parseObject(post);
     }
 
     /**