From 39782aec34cb5a1d6a9aef6ccab58c9cd9fa2d69 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 15 Jun 2023 16:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3dao=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/EnterpriseUserDAO.java | 6 ++++- .../cool/store/dao/UserRegionMappingDAO.java | 25 +++++++++++++++++++ .../store/mapper/EnterpriseUserMapper.java | 9 +++++++ .../store/mapper/UserRegionMappingMapper.java | 14 +++++++++++ .../resources/mapper/EnterpriseUserMapper.xml | 19 ++++++++++++++ .../mapper/UserRegionMappingMapper.xml | 8 ++++++ .../coolstore-partner-service.iml | 1 + coolstore-partner-service/pom.xml | 4 +++ .../coolstore-partner-webb.iml | 1 + .../resources/application-local.properties | 2 +- .../coolstore-partner-webc.iml | 1 + pom.xml | 5 ++++ 12 files changed, 93 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index b7ec414df..35df62fe0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -29,7 +29,7 @@ public class EnterpriseUserDAO { return enterpriseUserMapper.getUserInfoById(userId); } - public List getUserInfoByUserIds(List userIdList){ + public List getUserInfoByUserIds(List userIdList){ if(CollectionUtils.isEmpty(userIdList)){ return Lists.newArrayList(); } @@ -60,4 +60,8 @@ public class EnterpriseUserDAO { } return enterpriseUserMapper.deleteUserByUserId(userId); } + + public List searchUserByRegionIdsAndKeyword(List regionIds, String keyword, boolean isLeader){ + return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, isLeader); + } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java index bb2a20c00..953411d2b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java @@ -4,6 +4,7 @@ import com.cool.store.constants.CommonConstants; import com.cool.store.entity.UserRegionMappingDO; import com.cool.store.enums.DataSourceEnum; import com.cool.store.mapper.UserRegionMappingMapper; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -59,4 +60,28 @@ public class UserRegionMappingDAO { return userRegionMappingMapper.deleteUserRegionByUserId(userId); } + /** + * 获取一个区域下直挂的人 + * @param regionId + * @return + */ + public List getUserListByRegionId(String regionId){ + if(StringUtils.isBlank(regionId)){ + return Lists.newArrayList(); + } + return userRegionMappingMapper.getUserListByRegionId(regionId); + } + + /** + * 获取一个人所属的部门 + * @param userId + * @return + */ + public List getRegionIdsByUserId(String userId){ + if(StringUtils.isBlank(userId)){ + return Lists.newArrayList(); + } + return userRegionMappingMapper.getRegionIdsByUserId(userId); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index fb9a1cd58..bb043adb0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -52,4 +52,13 @@ public interface EnterpriseUserMapper { * @return */ Integer deleteUserByUserId(@Param("userId") String userId); + + /** + * 根据关键字搜索部门下的用户 + * @param regionIds + * @param keyword + * @param isLeader + * @return + */ + List searchUserByRegionIdsAndKeyword(@Param("regionIds") List regionIds, @Param("keyword") String keyword, @Param("isLeader") boolean isLeader); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java index bc4d256ef..afd2ce57d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java @@ -54,4 +54,18 @@ public interface UserRegionMappingMapper { * @return */ Integer deleteUserRegionByUserId(@Param("userId") String userId); + + /** + * 获取一个区域下是直挂的人 + * @param regionId + * @return + */ + List getUserListByRegionId(@Param("regionId") String regionId); + + /** + * 获取人所在的区域 + * @param userId + * @return + */ + List getRegionIdsByUserId(@Param("userId") String userId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index c33abf8a8..7b89849c0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -261,4 +261,23 @@ update enterprise_user set deleted = 1 where user_id = #{userId} + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml index 861475f2c..4560fc962 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml @@ -123,4 +123,12 @@ update user_region_mapping set deleted = 1 where user_id = #{userId} + + + + \ No newline at end of file diff --git a/coolstore-partner-service/coolstore-partner-service.iml b/coolstore-partner-service/coolstore-partner-service.iml index 761caf1cb..6cda7d6d9 100644 --- a/coolstore-partner-service/coolstore-partner-service.iml +++ b/coolstore-partner-service/coolstore-partner-service.iml @@ -141,5 +141,6 @@ + \ No newline at end of file diff --git a/coolstore-partner-service/pom.xml b/coolstore-partner-service/pom.xml index b14527b8a..1422f9c1d 100644 --- a/coolstore-partner-service/pom.xml +++ b/coolstore-partner-service/pom.xml @@ -59,6 +59,10 @@ com.xuxueli xxl-job-core + + com.aliyun + dytnsapi20200217 + \ No newline at end of file diff --git a/coolstore-partner-webb/coolstore-partner-webb.iml b/coolstore-partner-webb/coolstore-partner-webb.iml index fe481cb8c..ab3cdc788 100644 --- a/coolstore-partner-webb/coolstore-partner-webb.iml +++ b/coolstore-partner-webb/coolstore-partner-webb.iml @@ -106,6 +106,7 @@ + diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 33d502d30..e3eb4fe20 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -36,7 +36,7 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = http://localhost:31100 +isv.domain = http://localhost:31100/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=zK2oVEz4G1ts23d2 diff --git a/coolstore-partner-webc/coolstore-partner-webc.iml b/coolstore-partner-webc/coolstore-partner-webc.iml index 399bb9f2b..bef9271d3 100644 --- a/coolstore-partner-webc/coolstore-partner-webc.iml +++ b/coolstore-partner-webc/coolstore-partner-webc.iml @@ -104,6 +104,7 @@ + diff --git a/pom.xml b/pom.xml index c1eea1c2b..02ccc0a58 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,11 @@ xxl-job-core 2.3.0 + + com.aliyun + dytnsapi20200217 + 1.0.28 +