修改获取操作人

cdssman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -0,0 +1,30 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.UserServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 调用用户服务
+ * @author: gaodm
+ * @time: 2018/8/6 9:52
+ */
+@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
+public interface UserServiceClient {
+
+    @PostMapping(value = "/user/getUserInfoByIds")
+    RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids);
+
+    @PostMapping("/user/verifyToken")
+    RespDTO<Boolean> verifyToken(@RequestBody Token token);
+}
+
+
+

cdssman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -0,0 +1,35 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 调用用户服务
+ * @author: gaodm
+ * @time: 2018/8/6 9:52
+ */
+@Component
+@Slf4j
+public class UserServiceHystrix implements UserServiceClient {
+
+    @Override
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids) {
+        log.error("【hystrix】调用{}异常", "getUserInfoByIds");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> verifyToken(Token token) {
+        log.error("【hystrix】调用{}异常", "verifyToken");
+        return null;
+    }
+
+}

cdssman-service/src/main/java/com/diagbot/facade/DisclaimerInfoFacade.java

@@ -3,7 +3,9 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.DisclaimerInfoDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DisclaimerInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
@@ -35,7 +37,7 @@ import java.util.stream.Collectors;
 @Component
 public class DisclaimerInfoFacade extends DisclaimerInfoServiceImpl {
     @Autowired
-    UserFacade userFacade;
+    UserServiceClient userServiceClient;
 
     public IPage<DisclaimerInfoDTO> getDisclaimerInformation(DisclaimerInfoTitleVO disclaimerInfoTitleVO) {
         IPage<DisclaimerInfoDTO> querDisclaimerInformation = getDisclaimerInformationAll(disclaimerInfoTitleVO);
@@ -46,11 +48,12 @@ public class DisclaimerInfoFacade extends DisclaimerInfoServiceImpl {
 
         Map<String, String> userNames = new HashMap<>();
         if (ListUtil.isNotEmpty(modifierid)) {
-            userNames = userFacade.getUserInfoByIds(modifierid);
-            if (userNames == null) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "获取所有用户信息失败");
             }
+            userNames = userNamesDTO.data;
         }
         List<DisclaimerInfoDTO> dataNew = new ArrayList<DisclaimerInfoDTO>();
         for (DisclaimerInfoDTO disclaimerInformationDTO : data) {

cdssman-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -2,6 +2,8 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserHospital;
@@ -45,6 +47,8 @@ public class UserRoleFacade extends UserRoleServiceImpl {
     UserRoleService userRoleService;
     @Autowired
     HospitalInfoFacade hospitalInfoFacade;
+    @Autowired
+    UserServiceClient userServiceClient;
 
     public boolean addUserRoles(UserRoleInfoVO userRoleInfoVO) {
         boolean res = false;
@@ -87,13 +91,14 @@ public class UserRoleFacade extends UserRoleServiceImpl {
             hospitalInfoData = hospitalInfoFacade.getHospitalInfoData(hospitalId);
         }
         if (ListUtil.isNotEmpty(modifierid)) {
-            userInfoByIds = userFacade.getUserInfoByIds(modifierid);
-            if (userInfoByIds == null) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取所有用户信息失败");
             }
+            userInfoByIds = userNamesDTO.data;
         }
-        for (
-                UserRoleInfoFindDTO userData : dataAll) {
+        for (UserRoleInfoFindDTO userData : dataAll) {
             userData.setHospitalName(hospitalInfoData.get(userData.getHospitalId()));
             userData.setModifier(userInfoByIds.get(userData.getModifier()));
         }

cdssman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -2,6 +2,8 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.dto.VersionDetailSpecDTO;
 import com.diagbot.entity.VersionDetail;
@@ -40,7 +42,7 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     @Autowired
     VersionDetailServiceImpl versionDetailServiceImpl;
     @Autowired
-    UserFacade userFacade;
+    UserServiceClient userServiceClient;
     @Autowired
     VersionInfoServiceImpl versionInfoServiceImpl;
 
@@ -128,11 +130,12 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
             modifierid = datas.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
             Map<String, String> userNames = new HashMap<>();
             if (modifierid.size() > 0) {
-                userNames = userFacade.getUserInfoByIds(modifierid);
-                if (userNames == null) {
+                RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+                if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
                     throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                             "获取所有用户信息失败");
                 }
+                userNames = userNamesDTO.data;
             }
 
             // 过滤字段

cdssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -3,6 +3,8 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionDetail;
@@ -47,7 +49,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
     @Autowired
     VersionDetailServiceImpl versionDetailServiceImpl;
     @Autowired
-    UserFacade userFacade;
+    UserServiceClient userServiceClient;
 
     /**
      * 查询版本信息
@@ -65,10 +67,11 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         // 根据操作人的id获取操作人信息
         Map<String, String> userNames = new HashMap<>();
         if (ListUtil.isNotEmpty(modifierid)) {
-            userNames = userFacade.getUserInfoByIds(modifierid);
-            if (userNames == null) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
             }
+            userNames = userNamesDTO.data;
         }
         // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
         for (VersionWrapperDTO versionInfo : versionInfos) {