diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java index 645f76402..6353db6e2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java @@ -1,6 +1,10 @@ package com.elink.esua.epdc.feign; +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.UserRelationClientFallback; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -12,6 +16,7 @@ import java.util.List; * @Author: wk * @Date: 2020/5/26 */ +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = UserRelationClientFallback.class) public interface UserRelationFeignClient { /** * @Description: 调用数据分析 - 书记在线的用户名单 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 4eb918e7c..26638e702 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -43,9 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 用户管理 @@ -323,6 +321,14 @@ public class SysUserServiceImpl extends BaseServiceImpl userIds = new ArrayList<>(); +// userIds.add("1"); +// userIds.add("1191537649498046465"); +// userIds.add("1191991750497230850"); +// userIds.add("1202853184647028738"); +// userIds.add("1202861918488190977"); +// userIds.add("1202868487573561345"); +// userIds.add("1202886792501878786"); //2.获得两项openId List workOpenIds = baseDao.selectListOpenIds(userIds,"1"); openIdDto.setWorkOpenIds(workOpenIds); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 1d9b6a314..762fcf4ed 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -161,10 +161,10 @@