问题解决

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -144,9 +145,11 @@ public class ProductOrderController {
         List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
         return RespDTO.onSuc(list);
     }
+
     @ApiOperation(value = "查询已开通的功能[by:wangfeng]", notes = "已开通信息")
     @PostMapping("/getInformationAvailableAll")
     @SysLogger("getInformationAvailableAll")
+    @ApiIgnore
     public RespDTO<List<UserAndProdutDTO>>  getInformationAvailableByUserIds(){
 		OpenedProducts openedProducts =new OpenedProducts();
     	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(openedProducts);

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

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -17,6 +18,8 @@ import lombok.Setter;
  * @Description: 用户信息类表
  * @date 2018年9月17日 下午4:35:35
  */
+@Getter
+@Setter
 public class UserInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -41,160 +44,13 @@ public class UserInfoDTO implements Serializable {
     private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
     private Integer autStatus;//认证状态
     private String autStatusStr;//认证状态String
+    List<UserAndProdutUDTO> userAndProdutUDTO;
 
-    public Long getUserId() {
-        return userId;
+    public  String getOrgTypeStr(){
+        return OrganizationTypeEnum.getName(this.orgType);
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public  String getAutStatusStr(){
+        return AuthStatusEnum.getName(this.autStatus);
     }
-
-    public Date getUserGmtCreate() {
-        return userGmtCreate;
-    }
-
-    public void setUserGmtCreate(Date userGmtCreate) {
-        this.userGmtCreate = userGmtCreate;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getLinKman() {
-        return linKman;
-    }
-
-    public void setLinKman(String linKman) {
-        this.linKman = linKman;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public Date getOrgGmtCreate() {
-        return orgGmtCreate;
-    }
-
-    public void setOrgGmtCreate(Date orgGmtCreate) {
-        this.orgGmtCreate = orgGmtCreate;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public Integer getOrgType() {
-        return orgType;
-    }
-
-    public void setOrgType(Integer orgType) {
-        if (orgType != null) {
-            setOrgTypeStr(OrganizationTypeEnum.getName(orgType));
-        }
-        this.orgType = orgType;
-    }
-
-    public String getOrgTypeStr() {
-        return orgTypeStr;
-    }
-
-    public void setOrgTypeStr(String orgTypeStr) {
-        this.orgTypeStr = orgTypeStr;
-    }
-
-    public String getOrgPrincipal() {
-        return orgPrincipal;
-    }
-
-    public void setOrgPrincipal(String orgPrincipal) {
-        this.orgPrincipal = orgPrincipal;
-    }
-
-    public String getOrgAddress() {
-        return orgAddress;
-    }
-
-    public void setOrgAddress(String orgAddress) {
-        this.orgAddress = orgAddress;
-    }
-
-    public Long getOrgParentId() {
-        return orgParentId;
-    }
-
-    public void setOrgParentId(Long orgParentId) {
-        this.orgParentId = orgParentId;
-    }
-
-    public Integer getOrgSubNum() {
-        return orgSubNum;
-    }
-
-    public void setOrgSubNum(Integer orgSubNum) {
-        this.orgSubNum = orgSubNum;
-    }
-
-    public String getAutPosition() {
-        return autPosition;
-    }
-
-    public void setAutPosition(String autPosition) {
-        this.autPosition = autPosition;
-    }
-
-    public Integer getAutIsReject() {
-        return autIsReject;
-    }
-
-    public void setAutIsReject(Integer autIsReject) {
-        this.autIsReject = autIsReject;
-    }
-
-    public Integer getAutStatus() {
-        return autStatus;
-    }
-
-    public void setAutStatus(Integer autStatus) {
-        if (autStatus != null) {
-            setAutStatusStr(AuthStatusEnum.getName(autStatus));
-        }
-        this.autStatus = autStatus;
-    }
-
-    public static long getSerialversionuid() {
-        return serialVersionUID;
-    }
-
-    public String getAutStatusStr() {
-        return autStatusStr;
-    }
-
-    public void setAutStatusStr(String autStatusStr) {
-        this.autStatusStr = autStatusStr;
-    }
-
-
 }

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

@@ -687,13 +687,25 @@ public class UserFacade extends UserServiceImpl {
          userInfo.setAutStatus(autStatus);
          IPage<UserInfoDTO> user = selectUserInfoListPage(page, userInfo);
          List<UserInfoDTO> userData = user.getRecords();
+         List<Long> userIds = new ArrayList<>();
+//         for ()
+
          RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanService.getInformationAvailableAll();
-         if(InformationData == null || !CommonErrorCode.OK.getCode().equals(InformationData.code) ) {
+
+         if(InformationData == null || !"0".equals(InformationData.code) ) {
              throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                      "获取所有开通信息失败");
          }
-         //获取所有用户开通的产品信息
-         List<UserAndProdutUDTO> dataList = InformationData.data;
+        Map<Long, List<UserAndProdutUDTO>> map = new HashMap<>();
+        //获取所有用户开通的产品信息
+        List<UserAndProdutUDTO> dataList = InformationData.data;
+        map = EntityUtil.makeEntityListMap(dataList,"userId");
+        for (UserInfoDTO userInfoDTO: userData){
+            List<UserAndProdutUDTO> userAndProdutUDTO = map.get(userInfoDTO.getUserId());
+            if(ListUtil.isNotEmpty(userAndProdutUDTO)){
+                userInfoDTO.setUserAndProdutUDTO(userAndProdutUDTO);
+            }
+        }
          
         System.out.println("===================="+GsonUtil.toJson(dataList));
         List<UserOrganProductDTO> userOrganProductList = new ArrayList<UserOrganProductDTO>();