diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java index 7723b141..61fae781 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java @@ -453,7 +453,12 @@ public class SsoLoginServiceImpl implements SsoLoginService { String post = HttpUtil.post(AdminConfig.queryUserUrl, jsonObject.toString(), 300000); log.info("获取菜单信息返回：{}", post); if (StringUtils.isNotBlank(post)) { - SsoReturnUserModel ssoReturnUserModel = JSON.parseObject(post, SsoReturnUserModel.class); + jsonObject = JSONObject.parseObject(post); + SsoReturnUserModel ssoReturnUserModel = new SsoReturnUserModel(); + ssoReturnUserModel.setCode(jsonObject.getString("code")); + ssoReturnUserModel.setMessage(jsonObject.getString("message")); + ssoReturnUserModel.setData(JSON.parseObject(jsonObject.getString("data"), SsoUser.class)); + //SsoReturnUserModel ssoReturnUserModel = JSON.parseObject(post, SsoReturnUserModel.class); if ("0000".equals(ssoReturnUserModel.getCode())) { List sysMenuEntities = this.toMenu(ssoReturnUserModel.getData()); 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 3a126273..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,16 @@ public class EmailMaintainController extends AbstractController { /** * 编辑数据 * - * @param id id + * @param pramsMap * @return 删除结果 */ @PostMapping("/delete") - public ResponseEntity delete(@RequestParam String id) { + public ResponseEntity delete(@RequestBody Map pramsMap) { + + String id = pramsMap.get("id").toString(); + + log.info("传入的删除参数id={}",id); + DynamicContextHolder.push(DbConstant.BASICS_READ); boolean b = emailMaintainService.deleteById(id); if(b){ @@ -173,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 + "行，用户编码不能为空"); @@ -192,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; } @@ -201,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); @@ -215,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-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index 9d3d1a52..7c7362df 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -29,7 +29,7 @@