diff --git a/fw-shirasawa-common/pom.xml b/fw-shirasawa-common/pom.xml
index f346aa3..f4d4787 100644
--- a/fw-shirasawa-common/pom.xml
+++ b/fw-shirasawa-common/pom.xml
@@ -58,15 +58,4 @@
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
\ No newline at end of file
diff --git a/fw-shirasawa-dao/pom.xml b/fw-shirasawa-dao/pom.xml
index f71c70f..5ed6c9b 100644
--- a/fw-shirasawa-dao/pom.xml
+++ b/fw-shirasawa-dao/pom.xml
@@ -34,16 +34,4 @@
fw-shirasawa-common
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
\ No newline at end of file
diff --git a/fw-shirasawa-domain/pom.xml b/fw-shirasawa-domain/pom.xml
index dc1b63c..4d5f722 100644
--- a/fw-shirasawa-domain/pom.xml
+++ b/fw-shirasawa-domain/pom.xml
@@ -35,16 +35,4 @@
fw-shirasawa-sdk
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
\ No newline at end of file
diff --git a/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/ehr/EhrRpcService.java b/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/ehr/EhrRpcService.java
index 4d7edad..2a84f4b 100644
--- a/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/ehr/EhrRpcService.java
+++ b/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/ehr/EhrRpcService.java
@@ -6,6 +6,7 @@ import cn.fw.ehr.sdk.api.result.StaffInfo;
import cn.fw.shirasawa.common.utils.StringUtils;
import cn.fw.shirasawa.rpc.AbsBaseRpcService;
import cn.fw.shirasawa.rpc.ehr.dto.StaffInfoDTO;
+import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -37,6 +38,22 @@ public class EhrRpcService extends AbsBaseRpcService {
}
@Nullable
+ public UserInfoDTO user(final Long userId) {
+ StaffInfoDTO staffInfoDTO = queryStaffInfo(userId);
+ if (Objects.isNull(staffInfoDTO)) {
+ return null;
+ }
+ return UserInfoDTO.builder()
+ .id(staffInfoDTO.getId())
+ .userName(staffInfoDTO.getName())
+ .headImg(staffInfoDTO.getAvatar())
+ .mobile(staffInfoDTO.getMobile())
+ .nickName(staffInfoDTO.getName())
+ .groupId(staffInfoDTO.getGroupId())
+ .build();
+ }
+
+ @Nullable
public StaffInfoDTO queryStaffInfo(final Long userId) {
if (userId == null) {
return null;
diff --git a/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/erp/UserService.java b/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/erp/UserService.java
index 21f1d6f..6496e45 100644
--- a/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/erp/UserService.java
+++ b/fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/erp/UserService.java
@@ -1,15 +1,11 @@
package cn.fw.shirasawa.rpc.erp;
import cn.fw.data.base.domain.common.Message;
-import cn.fw.erp.sdk.api.UserApi;
import cn.fw.erp.sdk.api.UserRoleApi;
-import cn.fw.erp.sdk.api.result.UserBaseInfo;
import cn.fw.erp.sdk.api.result.UserRoleDataRange;
import cn.fw.erp.sdk.api.result.UserRoleInfo;
-import cn.fw.shirasawa.common.utils.StringUtils;
import cn.fw.shirasawa.rpc.AbsBaseRpcService;
import cn.fw.shirasawa.rpc.erp.dto.PostUserDTO;
-import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
import cn.fw.shirasawa.rpc.erp.dto.UserRoleDataRangeDTO;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
@@ -26,10 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.notNull;
/**
* 用户服务
@@ -43,10 +35,6 @@ import static org.apache.commons.lang3.Validate.notNull;
@RequiredArgsConstructor
public class UserService extends AbsBaseRpcService {
/**
- * 用户服务
- */
- private final UserApi userApi;
- /**
* 岗位用户服务
*/
private final UserRoleApi userRoleApi;
@@ -56,83 +44,6 @@ public class UserService extends AbsBaseRpcService {
private String keyPrefix;
/**
- * 根据用户ID获取用户信息
- *
- * @param userId 用户ID
- * @return 用户信息
- */
- public UserInfoDTO user(final Long userId) {
- if (Objects.isNull(userId)) {
- return null;
- }
- String key = generateKey(userId);
- String json = getFromCache(key);
- if (StringUtils.isValid(json)) {
- return JSONObject.parseObject(json, UserInfoDTO.class);
- }
- try {
- final Message msg = userApi.queryUserBaseInfo(userId);
- isTrue(msg.isSuccess(), String.format("调用ERP[根据用户ID[%s]获取用户信息]系统失败", msg.getResult()));
- final UserBaseInfo userBaseInfo = msg.getData();
- if (!msg.isSuccess() || Objects.isNull(msg.getData())) {
- return null;
- }
- UserInfoDTO userInfoDTO = new UserInfoDTO();
- userInfoDTO.setId(userBaseInfo.getUserId());
- userInfoDTO.setUserName(userBaseInfo.getUserName());
- userInfoDTO.setHeadImg(userBaseInfo.getHeadImg());
- userInfoDTO.setMobile(msg.getData().getMobile());
- setToCache(key, JSONObject.toJSONString(userInfoDTO), 60);
- return userInfoDTO;
- } catch (Exception e) {
- log.info("调用ERP[根据用户ID[{}]获取用户信息]系统失败", userId, e);
- }
- return null;
- }
-
- /**
- * 批量获取用户名字
- *
- * @param userIds 用户ID集合
- * @return 用户姓名集合
- */
- public List userNames(final List userIds) {
- if (CollectionUtils.isEmpty(userIds)) {
- return Collections.emptyList();
- }
- Message> userMsg = userApi.queryUserBaseInfos(userIds);
- isTrue(userMsg.isSuccess(), "批量获取用户信息失败");
- notNull(userMsg.getData(), "批量获取用户信息为空");
- return userMsg.getData().stream().map(UserBaseInfo::getUserName).collect(Collectors.toList());
- }
-
- /**
- * 批量获取用户
- *
- * @param userIds 用户ID集合
- * @return 用户集合
- */
- public List users(final List userIds) {
- if (CollectionUtils.isEmpty(userIds)) {
- return Collections.emptyList();
- }
- Message> userMsg = userApi.queryUserBaseInfos(userIds);
- isTrue(userMsg.isSuccess(), "批量获取用户信息失败");
- notNull(userMsg.getData(), "批量获取用户信息为空");
- List result = new ArrayList<>();
- List userBaseInfoList = userMsg.getData();
- for (UserBaseInfo userBaseInfo : userBaseInfoList) {
- UserInfoDTO userInfoDTO = new UserInfoDTO();
- userInfoDTO.setId(userBaseInfo.getUserId());
- userInfoDTO.setUserName(userBaseInfo.getUserName());
- userInfoDTO.setHeadImg(userBaseInfo.getHeadImg());
- userInfoDTO.setMobile(userBaseInfo.getMobile());
- result.add(userInfoDTO);
- }
- return result;
- }
-
- /**
* 获取某个流程角色的权限范围
*
* @param userId
diff --git a/fw-shirasawa-sdk/pom.xml b/fw-shirasawa-sdk/pom.xml
index ac75707..6e5e58e 100644
--- a/fw-shirasawa-sdk/pom.xml
+++ b/fw-shirasawa-sdk/pom.xml
@@ -57,6 +57,13 @@
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ false
+
+
\ No newline at end of file
diff --git a/fw-shirasawa-server/pom.xml b/fw-shirasawa-server/pom.xml
index db135a7..a08bcb5 100644
--- a/fw-shirasawa-server/pom.xml
+++ b/fw-shirasawa-server/pom.xml
@@ -149,13 +149,6 @@
true
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
diff --git a/fw-shirasawa-service/pom.xml b/fw-shirasawa-service/pom.xml
index 88c0190..e60832a 100644
--- a/fw-shirasawa-service/pom.xml
+++ b/fw-shirasawa-service/pom.xml
@@ -117,15 +117,4 @@
fw-dfs-sdk
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
\ No newline at end of file
diff --git a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
index 9c6bcc2..8f095e0 100644
--- a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
+++ b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
@@ -15,12 +15,15 @@ import cn.fw.shirasawa.domain.vo.SecretReportHistoryVO;
import cn.fw.shirasawa.domain.vo.pool.CluePoolVO;
import cn.fw.shirasawa.domain.vo.pool.FollowPoolListVO;
import cn.fw.shirasawa.domain.vo.pool.FollowRecordPoolVO;
-import cn.fw.shirasawa.rpc.erp.UserService;
+import cn.fw.shirasawa.rpc.ehr.EhrRpcService;
import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
import cn.fw.shirasawa.rpc.member.MemberRpcService;
import cn.fw.shirasawa.rpc.oop.OopService;
import cn.fw.shirasawa.rpc.oop.dto.ShopDTO;
-import cn.fw.shirasawa.service.data.*;
+import cn.fw.shirasawa.service.data.CluePoolService;
+import cn.fw.shirasawa.service.data.FollowRecordService;
+import cn.fw.shirasawa.service.data.FollowTaskService;
+import cn.fw.shirasawa.service.data.SecretReportHistoryService;
import cn.hutool.core.date.BetweenFormater;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -46,11 +49,10 @@ public class PoolBizService {
private final FollowTaskService followTaskService;
private final CluePoolService cluePoolService;
private final OopService oopService;
- private final UserService userService;
private final MemberRpcService memberRpcService;
private final SecretReportHistoryService secretReportHistoryService;
private final FollowRecordService followRecordService;
- private final FollowRecordLogService followRecordLogService;
+ private final EhrRpcService ehrRpcService;
/**
@@ -170,7 +172,7 @@ public class PoolBizService {
BeanUtils.copyProperties(poolDTO, vo);
vo.setFollower(poolDTO.getFollowUserName());
if (StringUtils.isEmpty(poolDTO.getFollowUserName()) && Objects.nonNull(poolDTO.getUserId())) {
- UserInfoDTO user = userService.user(poolDTO.getUserId());
+ UserInfoDTO user = ehrRpcService.user(poolDTO.getUserId());
if (Objects.nonNull(user)) {
vo.setFollower(user.getUserName());
}
diff --git a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
index 5759ce8..1ad9463 100644
--- a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
+++ b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -194,7 +194,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
for (CluePool cluePool : cluePoolList) {
cluePool.setFinishShopId(taskCompleteDTO.getShopId());
cluePool.setFinishUserId(taskCompleteDTO.getUserId());
- UserInfoDTO user = userService.user(taskCompleteDTO.getUserId());
+ UserInfoDTO user = ehrRpcService.user(taskCompleteDTO.getUserId());
if (Objects.nonNull(user)) {
cluePool.setFinishUserName(user.getUserName());
}
diff --git a/pom.xml b/pom.xml
index 563bb3b..c388d2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
cn.fw
fw-common-dependencies
- 3.3.0
+ 3.3.1
@@ -222,6 +222,26 @@
lombok
provided
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-reflect
+ ${kotlin.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ ${kotlin.version}
+
+
+ com.fasterxml.jackson.module
+ jackson-module-kotlin
+
junit
junit
@@ -232,6 +252,10 @@
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -240,38 +264,30 @@
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
org.codehaus.mojo
versions-maven-plugin
-
-
- feewee-maven-public
- feewee maven public
- http://nexus.feewee.cn/nexus/content/groups/public/
-
- true
- always
-
-
- true
- always
-
-
-
feewee-maven-releases
Nexus Release Repository
- http://nexus.feewee.cn/nexus/content/repositories/releases/
+ https://nexus.feewee.cn/nexus/content/repositories/releases/
feewee-maven-snapshots
Nexus Snapshot Repository
- http://nexus.feewee.cn/nexus/content/repositories/snapshots/
+ https://nexus.feewee.cn/nexus/content/repositories/snapshots/
true