From b084d3277cf3d0dfa93ed0c890cd1f3ccf566602 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Aug 2021 15:35:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmetuser/result/ListStaffResultDTO.java | 2 ++ .../service/epmetuser/impl/EpmetUserServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java index d9fe352c1e..b465f8ec3e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java @@ -13,6 +13,8 @@ import java.util.List; public class ListStaffResultDTO implements Serializable { private static final long serialVersionUID = 7129564173128153335L; + //工作人员所属组织Id + private String agencyId = ""; //工作人员用户id private String staffId = ""; //工作人员姓名 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 9188197a25..ab72a11410 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -457,7 +457,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { List orgList = govOrgService.getStaffOrgName(staffIdList); //3.封装数据并返回 - resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> re.setOrgName(s.getOrgName()))); + resultList.forEach(re -> orgList.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> { + re.setAgencyId(s.getAgencyId()); + re.setOrgName(s.getOrgName()); + })); return resultList; } From 3c29a9f82562178fd45f47db2fed2f6d3cae7964 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 15:47:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=AA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/InfoGroupReceiversDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml index e57f5bbaf8..d407b12bc2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml @@ -16,7 +16,6 @@ #{groupId} - ) From c77d468a44f7b41eb46bc0008ba0873da161baea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 15:49:05 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml index 083bcd133f..d0486df646 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml @@ -29,7 +29,7 @@ and irg.id=#{receiverGroupId} - order by irg.CREATED_TIME asc,igr.id asc + order by irg.CREATED_TIME desc From 03680e8415c7d8e990ac0f7b4fb4c2fc251fcd67 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 16:05:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/InfoServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index 1dbb43ad80..df18eaa2c8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -317,6 +317,16 @@ public class InfoServiceImpl extends BaseServiceImpl implem if (infoReceiverGroupDao.selectCountName(formDTO.getName().trim(),formDTO.getCustomerId(),formDTO.getUserId()) > 1) { throw new RenException(EpmetErrorCode.INFO_GROUP_NAME_EXISTS.getCode(), EpmetErrorCode.INFO_GROUP_NAME_EXISTS.getMsg()); } + + Set members=new LinkedHashSet(); + members.addAll(formDTO.getStaffIdList()); + members.addAll(orgStaffIds); + if(CollectionUtils.isEmpty(members)&&members.contains(formDTO.getUserId())){ + members.remove(formDTO.getUserId()); + } + if(CollectionUtils.isEmpty(members)){ + throw new RenException(EpmetErrorCode.PLEASE_CHOOSE_MEMBER.getCode(), EpmetErrorCode.PLEASE_CHOOSE_MEMBER.getMsg()); + } InfoReceiverGroupEntity groupEntity=new InfoReceiverGroupEntity(); groupEntity.setCustomerId(formDTO.getCustomerId()); groupEntity.setName(formDTO.getName()); @@ -324,9 +334,6 @@ public class InfoServiceImpl extends BaseServiceImpl implem // 4、插入小组表 infoReceiverGroupDao.insert(groupEntity); - Set members=new LinkedHashSet(); - members.addAll(formDTO.getStaffIdList()); - members.addAll(orgStaffIds); members.forEach(memStaffId->{ // 5、插入群成员表 InfoGroupReceiversEntity memberEntity=new InfoGroupReceiversEntity(); From 7b358dc461a5185504054cbb3d132eb7d00d8ef1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 27 Aug 2021 16:08:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=84=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/InfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index df18eaa2c8..292cf37b2d 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -321,7 +321,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem Set members=new LinkedHashSet(); members.addAll(formDTO.getStaffIdList()); members.addAll(orgStaffIds); - if(CollectionUtils.isEmpty(members)&&members.contains(formDTO.getUserId())){ + if(CollectionUtils.isNotEmpty(members)&&members.contains(formDTO.getUserId())){ members.remove(formDTO.getUserId()); } if(CollectionUtils.isEmpty(members)){ From 2e645b3cf91325ccc13006483087eaae3d1d5bc2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Aug 2021 16:09:50 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=97=A0=E5=8F=AF=E5=A5=88=E4=BD=95?= =?UTF-8?q?=E8=8A=B1=E8=90=BD=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java | 2 ++ .../com/epmet/dataaggre/controller/EpmetUserController.java | 1 + .../com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java index 6be616d569..ea545fb8a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java @@ -53,6 +53,8 @@ public class StaffListFormDTO implements Serializable { private String userId; //起止巡查开始时间 private String patrolStartTime; + //token中客户Id + private String customerId; public interface Staff extends CustomerClientShowGroup {} } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 3c20f3dad8..25cbe6a146 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -100,6 +100,7 @@ public class EpmetUserController { /*if (formDTO.getTime() != 1 && formDTO.getTime() != 3) { throw new RenException("参数错误，最近时间值不正确"); }*/ + formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(epmetUserService.staffPatrolList(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index 5fef749e49..a046a17f9c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -46,7 +46,7 @@ public interface CustomerStaffDao extends BaseDao { * @Description 按staffId查询基础信息 * @author sun */ - List selectByStaffIds(@Param("staffIds") List staffIds, @Param("realName") String realName); + List selectByStaffIds(@Param("customerId") String customerId, @Param("staffIds") List staffIds, @Param("realName") String realName); /** * @Description 模糊查询用户、角色信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ab72a11410..0f3c738d8f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -296,7 +296,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { List staffList = new ArrayList<>(); //2-1.按名字检索时先查询人员基础信息 if (!StringUtils.isEmpty(formDTO.getStaffName())) { - staffList = customerStaffDao.selectByStaffIds(null, formDTO.getStaffName()); + staffList = customerStaffDao.selectByStaffIds(formDTO.getCustomerId(), null, formDTO.getStaffName()); if (!CollectionUtils.isEmpty(staffList)) { formDTO.setStaffId(staffList.get(0).getUserId()); }else { @@ -308,7 +308,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查） if (CollectionUtils.isEmpty(staffList)) { List staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); - staffList = customerStaffDao.selectByStaffIds(staffIdList, null); + staffList = customerStaffDao.selectByStaffIds(formDTO.getCustomerId(), staffIdList, null); } //3.封装数据并返回 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index b57e89ac99..9b5da74efb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -20,7 +20,8 @@ * FROM customer_staff - WHERE 1=1 + WHERE del_flag = '0' + AND customer_id = #{customerId} AND real_name = #{realName} From 3521a1aaec2ffc16eb6600ed0aa266359f8edfff Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 27 Aug 2021 16:13:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/common/CustomerStaffRedis.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java index 831d2f177d..509b12339f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java @@ -2,6 +2,7 @@ package com.epmet.commons.tools.redis.common; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.CommonAggFeignClient; @@ -102,14 +103,17 @@ public class CustomerStaffRedis { * @param staffId */ public static Map getStaffRoleMap(String customerId, String staffId) { - String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId); - Map roleMap = (Map) customerStaffRedis.redisUtils.hGet(key, ROLE_MAP_KEY); - if (!CollectionUtils.isEmpty(roleMap)) { - return roleMap; - } - - reloadStaffCache(staffId, key); - return getStaffRoleMap(customerId, staffId); + int retryTime = 0; + do { + String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId); + Map roleMap = (Map) customerStaffRedis.redisUtils.hGet(key, ROLE_MAP_KEY); + if (!CollectionUtils.isEmpty(roleMap)) { + return roleMap; + } + retryTime++; + reloadStaffCache(staffId, key); + } while (retryTime < NumConstant.TWO); + return null; } /**