From 35bbb8056c74ed8266f9634c18338e153e297d91 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 11:33:40 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=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 --- .../com/dxhy/core/config/WebConfiguration.java | 3 ++- .../mailGather/EmailMaintainController.java | 16 ++++++++++++---- .../core/dao/mailGather/EmailMaintainDao.java | 8 ++++++++ .../service/mailGather/EmailMaintainService.java | 2 ++ .../impl/EmailMaintainServiceImpl.java | 6 ++++++ dxhy-core/src/main/resources/bootstrap-std.yaml | 12 ++++++------ .../mapper/mailGather/EmailMaintainMapper.xml | 4 ++++ 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java index d6e1ef66..2edb5e0c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java +++ b/dxhy-core/src/main/java/com/dxhy/core/config/WebConfiguration.java @@ -65,8 +65,9 @@ public class WebConfiguration implements WebMvcConfigurer { private ArrayList getIncludePathPatterns() { ArrayList list = new ArrayList<>(); String[] urls = - {"/mailGatherLog/**","/emailMaintain/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", + {"/mailGatherLog/**","/excel/apply","/excel/applyForSDNY", "/ftp/download", "/scan/get/scaninfo", "/setPwd", "/resetPwd", "/invoiceDetail/info", "/invoiceDetail/saleInfo", "/smcy/info", "/invoiceDetail/companyPoolInvoiceDetail/**", "/pool/**"}; +// ,"/emailMaintain/**" Collections.addAll(list, urls); return list; } 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 866fe548..35ddadd5 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 @@ -214,6 +214,13 @@ public class EmailMaintainController extends AbstractController { errorMsgList.add("第" + resultIndex + "行，用户邮箱地址重复，请核实！"); continue; } + + int i = emailMaintainService.selectByEmail(maintainExcel.getEmailAddress()); + if(i>0){ + errorMsgList.add("第" + resultIndex + "行，邮箱数据已存在，请核实！"); + continue; + } + mailTitleList.add(maintainExcel.getEmailAddress()); EmailMaintainVo maintainVo = new EmailMaintainVo(); @@ -227,7 +234,8 @@ public class EmailMaintainController extends AbstractController { String encode = Base64Encoding.encode(password); maintainVo.setEmailPassword(encode); maintainVo.setDelStatus("0"); - maintainVo.setCreateUser(getUserInfo().getLoginname()); + maintainVo.setCreateUser("yf"); +// maintainVo.setCreateUser(getUserInfo().getLoginname()); maintainVo.setCreateTime(new Date()); maintainVo.setModifyTime(new Date()); mailList.add(maintainVo); @@ -261,16 +269,16 @@ public class EmailMaintainController extends AbstractController { if(StringUtils.isEmpty(userCode)){ return ResponseEntity.ok(R.error("数据不能为空！")); } - DynamicContextHolder.push(DbConstant.BASICS_READ); String userName = emailMaintainService.getUserName(userCode); + JSONObject json = new JSONObject(); if(StringUtils.isNotEmpty(userName)){ - JSONObject json = new JSONObject(); json.put("datalist", userName); log.debug("返回结果：{}", json.toJSONString()); String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); + }else{ + return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据")); } - return ResponseEntity.ok(R.error("未查询到相应数据！")); } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java index 67042ce5..906245d7 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java @@ -53,6 +53,14 @@ public interface EmailMaintainDao extends BaseMapper { */ int insertBatch(@Param("entities") List entities); + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int selectByEmail(@Param("email") String email); + /** * 批量新增或按主键更新数据（MyBatis原生foreach方法） * diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java index d855e687..39d12fe3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java @@ -52,5 +52,7 @@ public interface EmailMaintainService { int insertBatch(List entities); + int selectByEmail(String email); + EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain); } 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 cfca00b3..4d678356 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 @@ -117,6 +117,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { @Override public String getUserName(String userCode) { + DynamicContextHolder.push(DbConstant.BASICS_READ); return emailMaintainDao.getUserName(userCode); } @@ -125,6 +126,11 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { return emailMaintainDao.insertBatch(entities); } + @Override + public int selectByEmail(String email) { + return emailMaintainDao.selectByEmail(email); + } + @Override public EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain) { return emailMaintainDao.getEmailMaintainVo(emailMaintain); diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index c4522dab..466beb99 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,13 +4,13 @@ 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 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -19,9 +19,9 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index c318f25e..0d695302 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -165,5 +165,9 @@ select username from sys_user where loginname = #{userCode} + +