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

common/pom.xml

@@ -88,14 +88,12 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
             <version>4.0.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
             <version>4.0.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <!--<dependency>-->

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -9,7 +9,7 @@ package com.diagbot.exception;
  */
 public enum CommonErrorCode implements ErrorCode {
 
-    OK("00000000", "操作成功"),
+    OK("0", "操作成功"),
     FAIL("00000001", "操作失败"),
     RPC_ERROR("00000002", "远程调度失败"),
     PARAM_ERROR("00029999", "%s"), //参数错误

diagbotman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -31,6 +31,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/diagLantoneProduct/selectProduct").permitAll()
                 .antMatchers("/morServices/addOrder").permitAll()
                 .antMatchers("/diagLantoneProduct/opendedProduct").permitAll()
+                .antMatchers("/productOrder/getInformationAvailableAll").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

diagbotman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -37,6 +37,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/getDiagbotManEnumsData", request)
                     || matchers("/service_filter/getAll", request)
                     || matchers("/serviceToken/hasPermission", request)
+                    || matchers("/productOrder/getInformationAvailableAll", request)
                     || matchers("/diagLantoneProduct/selectProduct", request)
                     || matchers("/morServices/addOrder", request)
                     || matchers("/diagLantoneProduct/opendedProduct", request)

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -17,6 +17,7 @@ import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;

diagbotman-service/src/main/java/com/diagbot/mapper/OpenedProductsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
@@ -107,4 +108,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @Date: 20:23 2018/9/20
      */
     public List<OpenedProducts> getOpendById(OpenedProducts openedProducts);
+    
+    /**
+     * 
+     * @param List<long> userIds
+     * @return 
+     */
+    public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds);
 }

diagbotman-service/src/main/java/com/diagbot/service/OpenedProductsService.java

@@ -69,5 +69,11 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @Date: 20:23 2018/9/20
      */
     public List<OpenedProducts> getOpendById(OpenedProducts openedProducts);
+    /**
+     * 
+     * @param List<long> userIds
+     * @return 
+     */
+    public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds);
 
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java

@@ -3,6 +3,7 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
@@ -82,4 +83,8 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     public List<OpenedProducts> getOpendById(OpenedProducts openedProducts) {
         return baseMapper.getOpendById(openedProducts);
     }
+    @Override
+    public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds){
+    	return openedProductsMapper.getInformationAvailableByUserIds(userIds);
+    }
 }

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;
@@ -95,7 +96,7 @@ public class ProductOrderController {
         return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
     }
 
-    @ApiOperation(value = "根据用户id查询已开通的功能[by:wangfeng]", notes = "已开通信息")
+    @ApiOperation(value = "客户中心-传入用户id查询已开通的功能[by:wangfeng]", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")
     @SysLogger("getInformationAvailableByUserId")
     public RespDTO getInformationAvailableByUserId(Long userId) {
@@ -105,7 +106,7 @@ public class ProductOrderController {
         return RespDTO.onSuc(UserAndProdutData);
     }
 
-    @ApiOperation(value = "根据用户id和产品id，启用和停用功能[by:wangfeng]", notes = "开通信息")
+    @ApiOperation(value = "客户中心-传入用户id和产品id，启用和停用功能[by:wangfeng]", notes = "拥护开通的产品")
     @PostMapping("/startAndendByuserId")
     @SysLogger("startAndendByuserId")
     @Transactional
@@ -115,7 +116,7 @@ public class ProductOrderController {
 
     }
 
-    @ApiOperation(value = "根据用户id和产品id，删除开通信息[by:wangfeng]", notes = "删除开通信息")
+    @ApiOperation(value = "客户中心-传入用户id和产品id，删除开通信息[by:wangfeng]", notes = "删除开通信息")
     @PostMapping("/delInformationAvailable")
     @SysLogger("delInformationAvailable")
     @Transactional
@@ -124,7 +125,7 @@ public class ProductOrderController {
         return openedProductsFacade.delInformationAvailables(userId, productId);
     }
 
-    @ApiOperation(value = "根据用户id和产品id，修改开通时间[by:wangfeng]", notes = "修改开通时间")
+    @ApiOperation(value = "客户中心-传入用户id和产品id，修改开通时间[by:wangfeng]", notes = "修改开通时间")
     @PostMapping("/modifyOpeningTime")
     @SysLogger("modifyOpeningTime")
     @Transactional
@@ -144,4 +145,13 @@ 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(@RequestBody List<Long> userIds){
+    	List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserIds(userIds);
+    	return RespDTO.onSuc(UserAndProdutData);
+    }
 }

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -189,4 +189,24 @@
             and a.product_id =#{productId}
         </if>
     </select>
+    <select id="getInformationAvailableByUserIds" parameterType="java.util.List" resultType="com.diagbot.dto.UserAndProdutDTO">
+        SELECT
+        a.id as Id,
+        a.product_id as productId,
+        a.user_id as userId,
+        a.start_time as startTime,
+        a.end_time as endTime,
+        a.service_status as serviceStatus,
+        a.access_type as accessType,
+        a.charge_type as chargeType,
+        b.name as productName
+        FROM diag_opened_products a JOIN diag_lantone_product b
+        ON a.product_id=b.id
+        WHERE
+        a.is_deleted = "N"
+        AND a.user_id in
+        <foreach collection="list" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </select>
 </mapper>

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

@@ -0,0 +1,25 @@
+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;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 
+ * @Description: 调用产品服务
+ * @author wangfeng
+ * @date 2018年9月26日 下午2:05:45
+ */
+@FeignClient(value = "diagbotman-service",fallback = DiagbotmanServiceHystrix.class )
+public interface DiagbotmanClient {
+	
+	@PostMapping(value = "/productOrder/getInformationAvailableAll")
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(@RequestBody List<Long> userIds);
+
+}

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.DiagbotmanClient;
+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 DiagbotmanClient {
+	
+	@Override
+	public RespDTO<List<UserAndProdutUDTO>> getInformationAvailableAll(List<Long> userIds){
+		 log.error("【hystrix】调用{}异常","getInformationAvailableAll");
+	        return null;
+	}
+
+}

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -31,7 +31,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/userver/getSmsWithRegister").permitAll()
                 .antMatchers("/userver/getSmsWithResetPassword").permitAll()
                 .antMatchers("/userver/verifySmsVerification").permitAll()
-                .antMatchers("/user/resetPassword").permitAll()
                 .antMatchers("/getUserEnumsData").permitAll()
                 .antMatchers("/userInfo/getUserInfoPag").permitAll()
                 .antMatchers("/user/getPermission").permitAll()

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -33,9 +33,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/webjars/**", request)
                     || matchers("/user/login/**", request)
                     || matchers("/user/registry/**", request)
-                    || matchers("/user/resetPassword", request)
                     || matchers("/user/test/**", request)
-                    || matchers("/user/resetPassword", request)
                     || matchers("/druid/**", request)
                     || matchers("/actuator/**", request)
                     || matchers("/hystrix/**", request)

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/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;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,18 +19,22 @@ import lombok.Setter;
  * @Description: 用户信息类表
  * @date 2018年9月17日 下午4:35:35
  */
+@Getter
+@Setter
 public class UserInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long userId;//用户ID
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date userGmtCreate;//记录创建时间
     private String userName;// 用户名
     private String linKman;//联系人
     private String email;// 邮箱
     @TableId(value = "id", type = IdType.AUTO)
     private Long orgId;//机构ID
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date orgGmtCreate;//记录创建时间
     private String orgName;//机构名称
     private Integer orgType;//机构属性
@@ -41,160 +47,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/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,9 +4,11 @@ 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.DiagbotmanClient;
 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;
@@ -40,14 +42,9 @@ import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 import com.diagbot.vo.UserSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -56,8 +53,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-
 /**
  * @Description: 用户业务层
  * @author: gaodm
@@ -84,6 +79,8 @@ public class UserFacade extends UserServiceImpl {
     UserAuthenticationFacade userAuthenticationFacade;
     @Autowired
     PermissionFacade permissionFacade;
+    @Autowired
+    DiagbotmanClient diagbotmanService;
 
     /**
      * 注册
@@ -351,7 +348,7 @@ public class UserFacade extends UserServiceImpl {
      * @param user 新建用户信息输入参数
      * @return 用户信息
      */
-    @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
+    //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User saveUser(User user) {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -368,7 +365,7 @@ public class UserFacade extends UserServiceImpl {
      * @param user 更新用户信息输入参数
      * @return 用户信息
      */
-    @CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
+    //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User updateUser(User user) {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -386,7 +383,7 @@ public class UserFacade extends UserServiceImpl {
      * @return 用户信息
      */
     @Override
-    @Cacheable(value = CACHE_NAME, key = "'user:'+#p0")
+    //@Cacheable(value = CACHE_NAME, key = "'user:'+#p0")
     public User getById(Serializable id) {
         return super.getById(id);
     }
@@ -398,7 +395,7 @@ public class UserFacade extends UserServiceImpl {
      * @return 是否成功
      */
     @Override
-    @CacheEvict(value = CACHE_NAME, key = "'user:'+#p0")
+    //@CacheEvict(value = CACHE_NAME, key = "'user:'+#p0")
     public boolean removeById(Serializable id) {
         return super.removeById(id);
     }
@@ -554,6 +551,7 @@ public class UserFacade extends UserServiceImpl {
         auditMap.put("isReject", userInfoAuditVO.getIsReject());
         auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
         auditMap.put("rejectType", userInfoAuditVO.getRejectType());
+        auditMap.put("status", userInfoAuditVO.getStatus());
         // TODO 审核前先验证该用户的的认证状态
         boolean res = auditUserInfoAll(auditMap);
 
@@ -668,4 +666,46 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+    /**
+     * 
+     * @param page
+     * @param orgName
+     * @param autStatus
+     * @return 分页查询用户信息和机构信息开通产品
+     */
+    public RespDTO<UserInfoDTO> 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();
+         List<Long> userIds = new ArrayList<>();
+         for (UserInfoDTO userInfoDTO: userData){
+        	 Long userInfoId = userInfoDTO.getUserId();
+        	 userIds.add(userInfoId);
+         }
+         RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanService.getInformationAvailableAll(userIds);
+         
+         if(InformationData == null || !"0".equals(InformationData.code) ) {
+             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                     "获取所有开通信息失败");
+         }
+        Map<Long, List<UserAndProdutUDTO>> map = new HashMap<>();
+        //获取所有用户开通的产品信息
+        List<UserAndProdutUDTO> dataList = InformationData.data;
+        map = EntityUtil.makeEntityListMap(dataList,"userId");
+        if(map.size()>0){
+            for (UserInfoDTO userInfoDTO: userData){
+                List<UserAndProdutUDTO> userAndProdutUDTO = map.get(userInfoDTO.getUserId());
+                if(ListUtil.isNotEmpty(userAndProdutUDTO)){
+                    userInfoDTO.setUserAndProdutUDTO(userAndProdutUDTO);
+                }
+            }
+        }
+       
+        System.out.println("===================="+GsonUtil.toJson(userData));
+        user.setRecords(userData);
+    	return RespDTO.onSuc(user);
+    }
 }

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

@@ -27,7 +27,7 @@ public class TestController {
     @ApiOperation(value = "测试发送短信[by:gaodm]",
             notes = "测试发送短信")
     @PostMapping("/sms_send")
-    RespDTO testSmsSend() {
+    RespDTO<String> testSmsSend() {
         System.out.println("The time is now " + DateUtil.nowString());
         log.info("短信验证发送开始！");
         //String code="1234";

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

@@ -29,7 +29,7 @@ import java.util.Map;
  * @since 2018-09-13
  */
 @RestController
-@Api(value = "用户认证API", tags = { "用户认证API" })
+@Api(value = "用户账号认证API", tags = { "用户账号认证API" })
 @RequestMapping("/userAuthentication")
 @SuppressWarnings("unchecked")
 public class UserAuthenticationController {

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

@@ -34,7 +34,7 @@ import java.util.Map;
  * @time: 2018/8/2 13:56
  */
 @RestController
-@Api(value = "用户操作API", tags = { "用户操作API" })
+@Api(value = "用户账号注册等API", tags = { "用户账号注册等API" })
 @RequestMapping("/user")
 @SuppressWarnings("unchecked")
 public class UserController {

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;
@@ -44,7 +45,7 @@ import java.util.Map;
  * @time: 2018年9月17日 下午1:53:53
  */
 @RestController
-@Api(value = "用户信息和机构信息API[by:wangfeng]", tags = { "用户信息和机构信息API" })
+@Api(value = "客户中心API[by:wangfeng]", tags = { "注册用户信息和机构信息API" })
 @RequestMapping("/userInfo")
 @SuppressWarnings("unchecked")
 public class UserInfoController {
@@ -58,7 +59,7 @@ public class UserInfoController {
     @Autowired
     UserAuthenticationFacade userAuthenticationFacade;
 
-    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示条数，默认 10，和当前页")
+    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态autStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     // @ApiIgnore
@@ -122,5 +123,12 @@ public class UserInfoController {
 
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
-
+    @ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
+    @PostMapping("/getUserOrganProductAll")
+    @SysLogger("getUserOrganProductAll")
+    @Transactional
+    public RespDTO<UserInfoDTO> getUserOrganProductAll(Page page, String orgName, Integer autStatus) {
+       
+        return userFacade.getUserOrganProductAlls(page,orgName,autStatus);
+    }
 }