Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -144,4 +144,12 @@ public class ProductOrderController {
         List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
         return RespDTO.onSuc(list);
     }
+    @ApiOperation(value = "查询已开通的功能[by:wangfeng]", notes = "已开通信息")
+    @PostMapping("/getInformationAvailableAll")
+    @SysLogger("getInformationAvailableAll")
+    public RespDTO<List<UserAndProdutDTO>>  getInformationAvailableByUserIds(){
+		OpenedProducts openedProducts =new OpenedProducts();
+    	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(openedProducts);
+    	return RespDTO.onSuc(UserAndProdutData);
+    }
 }

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

@@ -0,0 +1,24 @@
+package com.diagbot.client;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.diagbot.client.hystrix.DiagbotmanServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
+
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:05:45
+ */
+@FeignClient(value = "diagbotman-service",fallback = DiagbotmanServiceHystrix.class )
+public interface DiagbotmanService {
+	
+	@PostMapping(value = "/productOrder/getInformationAvailableAll")
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll();
+
+}

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

@@ -0,0 +1,29 @@
+package com.diagbot.client.hystrix;
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.DiagbotmanService;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
+
+import lombok.extern.slf4j.Slf4j;
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:12:36
+ */
+@Component
+@Slf4j
+public class DiagbotmanServiceHystrix implements DiagbotmanService {
+	
+	@Override
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(){
+		 log.error("【hystrix】调用{}异常","getInformationAvailableByUserId");
+	        return null;
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+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 Integer accessType;//接入方式
+	private Integer chargeType;//结算方式
+	private String  productName;//产品名称
+
+}

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

@@ -0,0 +1,167 @@
+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;
+import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
+
+/**
+ * 
+ * @Description: 用户信息机构信息开通产品
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:17:57
+ */
+public class UserOrganProductDTO implements Serializable{
+	
+	 private static final long serialVersionUID = 1L;
+
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long userId;//用户ID
+	    private Date userGmtCreate;//记录创建时间
+	    private String userName;// 用户名
+	    private String linKman;//联系人
+	    private String email;// 邮箱
+	    @TableId(value = "id", type = IdType.AUTO)
+	    private Long orgId;//机构ID
+	    private Date orgGmtCreate;//记录创建时间
+	    private String orgName;//机构名称
+	    private Integer orgType;//机构属性
+	    private String  orgTypeStr;//机构属性String
+	    private String orgPrincipal;//负责人
+	    private String orgAddress;//机构地址
+	    private Long orgParentId;//上级机构id
+	    private Integer orgSubNum;//下属机构数量
+	    private String autPosition;//岗位信息
+	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
+	    private Integer autStatus;//认证状态
+	    private String autStatusStr;//认证状态String
+	    private List<UserAndProdutUDTO> userAndProdutUDTO;
+		public Long getUserId() {
+			return userId;
+		}
+		public void setUserId(Long userId) {
+			this.userId = userId;
+		}
+		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;
+		}
+		public List<UserAndProdutUDTO> getUserAndProdutUDTO() {
+			return userAndProdutUDTO;
+		}
+		public void setUserAndProdutUDTO(List<UserAndProdutUDTO> userAndProdutUDTO) {
+			this.userAndProdutUDTO = userAndProdutUDTO;
+		}
+
+}

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.AuthServiceClient;
+import com.diagbot.client.DiagbotmanService;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutUDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
@@ -84,6 +87,8 @@ public class UserFacade extends UserServiceImpl {
     UserAuthenticationFacade userAuthenticationFacade;
     @Autowired
     PermissionFacade permissionFacade;
+    @Autowired
+    DiagbotmanService diagbotmanService;
 
     /**
      * 注册
@@ -668,4 +673,76 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+    /**
+     * 
+     * @param page
+     * @param orgName
+     * @param autStatus
+     * @return 分页查询用户信息和机构信息开通产品
+     */
+    public RespDTO<UserOrganProductDTO> getUserOrganProductAlls(Page page, String orgName, Integer autStatus){
+    	
+    	 UserInfoDTO userInfo = new UserInfoDTO();
+         userInfo.setOrgName(orgName);
+         userInfo.setAutStatus(autStatus);
+         IPage<UserInfoDTO> user = selectUserInfoListPage(page, userInfo);
+         List<UserInfoDTO> userData = user.getRecords();
+         RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanService.getInformationAvailableAll();
+         if(InformationData == null || !CommonErrorCode.OK.getCode().equals(InformationData.code) ) {
+             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                     "获取所有开通信息失败");
+         }
+         //获取所有用户开通的产品信息
+         List<UserAndProdutUDTO> dataList = InformationData.data;
+         
+        System.out.println("===================="+GsonUtil.toJson(dataList));
+        
+        
+/*        for(int i =0;i<dataList.size();i++ ){
+        	UserAndProdutUDTO  userAndProdutData = dataList.get(i);
+        	Long userprodutId = userAndProdutData.getUserId();
+        	for(int j =0;j<userData.size();i++){
+        		UserInfoDTO userInfoDate = userData.get(j);
+        		Long userInfoId = userInfoDate.getUserId();
+        		if(userprodutId==userInfoId){
+        			UserOrganProductDTO userOrgan=new UserOrganProductDTO();
+        			userOrgan.setUserId(userInfoId);
+        			userOrgan.setUserGmtCreate(userInfoDate.getUserGmtCreate());
+        			userOrgan.setUserName(userInfoDate.getUserName());
+        			userOrgan.setLinKman(userInfoDate.getLinKman());
+        			userOrgan.setEmail(userInfoDate.getEmail());
+        			userOrgan.setOrgId(userInfoDate.getOrgId());
+        			userOrgan.setOrgGmtCreate(userInfoDate.getOrgGmtCreate());
+        			userOrgan.setOrgName(userInfoDate.getOrgName());
+        			userOrgan.setOrgType(userInfoDate.getOrgType());
+        			userOrgan.setOrgTypeStr(userInfoDate.getOrgTypeStr());
+        			userOrgan.setOrgPrincipal(userInfoDate.getOrgPrincipal());
+        			userOrgan.setOrgAddress(userInfoDate.getOrgAddress());
+        			userOrgan.setOrgParentId(userInfoDate.getOrgParentId());
+        			userOrgan.setOrgSubNum(userInfoDate.getOrgSubNum());
+        			userOrgan.setAutPosition(userInfoDate.getAutPosition());
+        			userOrgan.setAutIsReject(userInfoDate.getAutIsReject());
+        			userOrgan.setAutStatus(userInfoDate.getAutStatus());
+        			userOrgan.setAutStatusStr(userInfoDate.getAutStatusStr());
+        			UserAndProdutUDTO produData = new UserAndProdutUDTO();
+        			produData.setId(userAndProdutData.getId());
+        			produData.setProductId(userAndProdutData.getProductId());
+        			produData.setUserId(userAndProdutData.getUserId());
+        			produData.setStartTime(userAndProdutData.getStartTime());
+        			produData.setEndTime(userAndProdutData.getEndTime());
+        			produData.setServiceStatus(userAndProdutData.getServiceStatus());
+        			produData.setAccessType(userAndProdutData.getAccessType());
+        			produData.setChargeType(userAndProdutData.getChargeType());
+        			produData.setProductName(userAndProdutData.getProductName());
+        			userOrgan.setUserAndProdutDTO(produData);
+        			
+        		}
+        		
+        	}
+        	
+        }*/
+       
+         
+    	return null;
+    }
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserOrganProductDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
@@ -122,5 +123,12 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
-
+    @ApiOperation(value = "用户信息和机构信息开通产品[by:wangfeng]", notes = "用户信息和机构信息的绑定")
+    @PostMapping("/addUserInfo")
+    @SysLogger("addUserInfo")
+    @Transactional
+    public RespDTO<UserOrganProductDTO> getUserOrganProductAll(Page page, String orgName, Integer autStatus) {
+       
+        return userFacade.getUserOrganProductAlls(page,orgName,autStatus);
+    }
 }