From 41f2ee6f18bdc5c484d08d83929ebbcc9db9545e Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 22 Apr 2023 15:20:18 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=20=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/EmailMaintainController.java | 24 ++++++++++++++----- .../model/mailGather/EmailMaintainVo.java | 2 ++ .../impl/EmailMaintainServiceImpl.java | 6 +++++ .../src/main/resources/bootstrap-std.yaml | 4 ++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 02a4f2b1..d5027fe9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -139,11 +140,13 @@ public class EmailMaintainController extends AbstractController { /** * 编辑数据 * - * @param id id + * @param pramsMap * @return 删除结果 */ @PostMapping("/delete") - public ResponseEntity delete(@RequestBody String id) { + public ResponseEntity delete(@RequestBody Map pramsMap) { + + String id = pramsMap.get("id").toString(); log.info("传入的删除参数id={}",id); @@ -176,9 +179,11 @@ public class EmailMaintainController extends AbstractController { } List errorMsgList = Lists.newArrayList(); List mailList = Lists.newArrayList(); - - int resultIndex = 2; + List mailTitleList = new ArrayList<>(); + int resultIndex = 1; for (EmailMaintainExcel maintainExcel : emailMaintainExcels) { + + resultIndex++; String userId = maintainExcel.getUserId(); if (StringUtils.isBlank(userId)) { errorMsgList.add("第" + resultIndex + "行，用户编码不能为空"); @@ -195,7 +200,7 @@ public class EmailMaintainController extends AbstractController { errorMsgList.add("第" + resultIndex + "行，邮箱地址不能为空"); continue; } - if(!"@qq.com".equals(address) || !"@163.com".equals(address)){ + if(!address.contains("@qq.com") && !address.contains("@163.com")){ errorMsgList.add("第" + resultIndex + "行，不支持该邮箱类型"); continue; } @@ -204,9 +209,17 @@ public class EmailMaintainController extends AbstractController { errorMsgList.add("第" + resultIndex + "行，授权码不能为空"); continue; } + + if(mailTitleList.contains(maintainExcel.getEmailAddress())){ + errorMsgList.add("第" + resultIndex + "行，用户邮箱地址重复，请核实！"); + continue; + } + mailTitleList.add(maintainExcel.getEmailAddress()); + EmailMaintainVo maintainVo = new EmailMaintainVo(); maintainVo.setId(UUIDUtils.generateShortUuid()); maintainVo.setCompanyCode(deptId); + maintainVo.setDeptId(deptId); maintainVo.setDeptName(deptName); maintainVo.setUsername(userName); maintainVo.setUserId(userId); @@ -218,7 +231,6 @@ public class EmailMaintainController extends AbstractController { maintainVo.setCreateTime(new Date()); maintainVo.setModifyTime(new Date()); mailList.add(maintainVo); - resultIndex++; } if (ObjectUtil.isNotEmpty(errorMsgList)) { JSONObject json = new JSONObject(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java index 2eaf2b0d..6d31465c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java @@ -13,6 +13,8 @@ public class EmailMaintainVo extends CommonDTO { public String id; + public String xh; + public String deptId; private String companyCode; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index 338a5daa..c5839165 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -50,6 +50,12 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { int size = (int)pramsMap.get("size"); PageHelper.startPage(curr, size); List emailMaintainVos = emailMaintainDao.queryAllByLimit(pramsMap); + if(emailMaintainVos !=null && emailMaintainVos.size() > 0) { + for (int i = 0; i < emailMaintainVos.size(); i++) { + EmailMaintainVo emailMaintainVo = emailMaintainVos.get(i); + emailMaintainVo.setXh(i + 1 + ""); + } + } PageInfo pageInfo = new PageInfo<>(emailMaintainVos); // 设置记录总数 json.put("total", pageInfo.getTotal()); diff --git a/dxhy-erp/src/main/resources/bootstrap-std.yaml b/dxhy-erp/src/main/resources/bootstrap-std.yaml index 7c52edcd..2b0faa83 100644 --- a/dxhy-erp/src/main/resources/bootstrap-std.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-std.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 @@ -19,7 +19,7 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 登录用户名 username: nacos # Nacos config 登录密码