远程调用

user-service/src/main/java/com/diagbot/client/DiagbotmanClient.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.diagbot.client.hystrix.DiagbotmanServiceHystrix;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserAndProdutUDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
@@ -20,6 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface DiagbotmanClient {
 	
 	@PostMapping(value = "/productOrder/getInformationAvailableAll")
-	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(@RequestBody List<Long> userIds);
+	RespDTO<List<UserAndProdutDTO>> getInformationAvailableAll(@RequestBody List<Long> userIds);
 
 }

user-service/src/main/java/com/diagbot/client/hystrix/DiagbotmanServiceHystrix.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 import com.diagbot.client.DiagbotmanClient;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserAndProdutUDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 
 import lombok.extern.slf4j.Slf4j;
 /**
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 public class DiagbotmanServiceHystrix implements DiagbotmanClient {
 	
 	@Override
-	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(List<Long> userIds){
+	public RespDTO<List<UserAndProdutDTO>> getInformationAvailableAll(List<Long> userIds){
 		 log.error("【hystrix】调用{}异常","getInformationAvailableAll");
 	        return null;
 	}

user-service/src/main/java/com/diagbot/dto/UserAndProdutDTO.java

@@ -0,0 +1,33 @@
+package com.diagbot.dto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.diagbot.enums.AccessTypeEnum;
+import com.diagbot.enums.ChargeTypeEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description:  用户已开通产品出参
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:21:45
+ */
+@Getter
+@Setter
+public class UserAndProdutDTO {
+
+	private Long Id;//开通的id
+	private Long productId;//产品Id
+	private Long userId;//用户Id
+	private Date startTime;//开通时间
+	private Date endTime;//结束时间
+	private Integer serviceStatus;//启用状态
+	private String[] accessType;//接入方式
+	private String[] chargeType;//结算方式
+	private String productName;//产品名称
+}

user-service/src/main/java/com/diagbot/dto/UserAndProdutUDTO.java

@@ -1,41 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import com.diagbot.enums.AccessTypeEnum;
-import com.diagbot.enums.ChargeTypeEnum;
-import com.diagbot.enums.OrganizationTypeEnum;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @Description:  用户已开通产品出参
- * @author wangfeng
- * @date 2018年9月26日 下午2:21:45
- */
-@Getter
-@Setter
-public class UserAndProdutUDTO {
-	
-	private Long  Id;//开通的id
-	private Long  productId;//产品Id
-	private Long userId;//用户Id
-	private Date startTime;//开通时间
-	private Date endTime;//结束时间
-	private Integer serviceStatus;//启用状态
-	private String accessType;//接入方式
-	//private String accessTypeStr;
-	private String chargeType;//结算方式
-	//private String chargeTypeStr;
-	private String  productName;//产品名称
-	
-	/*public  String getAccessTypeStr(){
-        return AccessTypeEnum.getName(this.accessType);
-    }
-	public  String getChargeTypeStr(){
-		return ChargeTypeEnum.getName(this.accessType);
-	}*/
-
-}

user-service/src/main/java/com/diagbot/dto/UserInfoDTO.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 
@@ -48,7 +47,7 @@ public class UserInfoDTO implements Serializable {
     private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
     private Integer authStatus;//认证状态
     private String authStatusStr;//认证状态String
-    List<UserAndProdutUDTO> userAndProdutUDTO;
+    List<UserAndProdutDTO> userAndProdutUDTO;
 
     public  String getOrgTypeStr(){
         return OrganizationTypeEnum.getName(this.orgType);

user-service/src/main/java/com/diagbot/dto/UserOrgizationProductDTO.java

@@ -45,7 +45,7 @@ public class UserOrgizationProductDTO {
 	    //private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
 	    private Integer authStatus;//认证状态
 	    private String authStatusStr;//认证状态String
-	    List<UserAndProdutUDTO> userAndProdutUDTO;
+	    List<UserAndProdutDTO> userAndProdutUDTO;
 
 	    public  String getOrgTypeStr(){
 	        return OrganizationTypeEnum.getName(this.orgType);

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -17,7 +17,7 @@ import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserAndProdutUDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserLoginDTO;
@@ -1053,19 +1053,19 @@ public class UserFacade extends UserServiceImpl {
         if(userIds.size()>0){
 
 
-        RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
+        RespDTO<List<UserAndProdutDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
 
         if (InformationData == null || !"0".equals(InformationData.code)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "获取所有开通信息失败");
         }
-        Map<Long, List<UserAndProdutUDTO>> map = new HashMap<>();
+        Map<Long, List<UserAndProdutDTO>> map = new HashMap<>();
         //获取所有用户开通的产品信息
-        List<UserAndProdutUDTO> dataList = InformationData.data;
+        List<UserAndProdutDTO> dataList = InformationData.data;
         map = EntityUtil.makeEntityListMap(dataList, "userId");
         if (map.size() > 0) {
             for (UserOrgizationProductDTO userInfoDTO : userData) {
-                List<UserAndProdutUDTO> userAndProdutUDTO = map.get(userInfoDTO.getUserId());
+                List<UserAndProdutDTO> userAndProdutUDTO = map.get(userInfoDTO.getUserId());
                 if (ListUtil.isNotEmpty(userAndProdutUDTO)) {
                     userInfoDTO.setUserAndProdutUDTO(userAndProdutUDTO);
                 }