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

diagbotman-service/src/main/java/com/diagbot/dto/ProductServiceDTO.java

@@ -15,8 +15,33 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ProductServiceDTO {
-    private ProductService productService;
-    private ServiceToken serviceToken;
+    /*private ProductService productService;
     private LantoneProduct lantoneProduct;
-    private ServiceInfo serviceInfo;
+    private ServiceInfo serviceInfo;*/
+    private ServiceToken serviceToken;
+
+    private Long productId;
+    private Long serviceId;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品介绍
+     */
+    private String productDecription;
+
+
+    /**
+     * 服务名称
+     */
+    private String serviceName;
+
+    /**
+     * 服务说明
+     */
+    private String serviceDescription;
+
 }

diagbotman-service/src/main/java/com/diagbot/entity/ServiceInfo.java

@@ -48,8 +48,14 @@ public class ServiceInfo implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 服务名称
+     */
     private String name;
 
+    /**
+     * 服务说明
+     */
     private String description;
 
     /**

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -20,10 +20,15 @@ public class LantoneProductWrapper extends LantoneProduct {
      */
     private Date endTime;
 
+    /**
+     * 订单申请时间
+     */
+    private Date time;
+
     /**
      * 停用状态
      */
-    private Integer serviceStatus;
+    private Integer openedServiceStatus;
 
     public Date getStartTime() {
         return startTime;
@@ -41,13 +46,19 @@ public class LantoneProductWrapper extends LantoneProduct {
         this.endTime = endTime;
     }
 
-    @Override
-    public Integer getServiceStatus() {
-        return serviceStatus;
+    public Integer getOpenedServiceStatus() {
+        return openedServiceStatus;
+    }
+
+    public void setOpenedServiceStatus(Integer openedServiceStatus) {
+        this.openedServiceStatus = openedServiceStatus;
+    }
+
+    public Date getTime() {
+        return time;
     }
 
-    @Override
-    public void setServiceStatus(Integer serviceStatus) {
-        this.serviceStatus = serviceStatus;
+    public void setTime(Date time) {
+        this.time = time;
     }
 }

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

@@ -120,7 +120,15 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         serviceTokenFacade.save(serviceToken);
         productServiceDTO.setServiceToken(serviceToken);
 
-        productServiceDTO.setProductService(productService);
+        //productServiceDTO.setProductService(productService);
+        productServiceDTO.setProductId(productService.getProductId());
+        productServiceDTO.setServiceId(productService.getServiceId());
+
+        productServiceDTO.setServiceName(serviceInfo.getName());
+        productServiceDTO.setServiceDescription(serviceInfo.getDescription());
+
+        productServiceDTO.setProductName(lantoneProduct.getName());
+        productServiceDTO.setProductDecription(lantoneProduct.getDecription());
         return productServiceDTO;
     }
 

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

@@ -1,7 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.enums.AccessTypeEnum;
+import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.ChargeTypeEnum;
+import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.enums.TokenTypeEnum;
+import com.diagbot.enums.TrialStatusEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
 import org.springframework.stereotype.Service;
@@ -24,8 +29,13 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
+                .addEnums("accessTypeEnum", AccessTypeEnum.values())
+                .addEnums("auditStatusEnum", AuditStatusEnum.values())
+                .addEnums("chargeTypeEnum", ChargeTypeEnum.values())
+                .addEnums("notPassEnum", NotPassEnum.values())
                 .addEnums("statusEnum", StatusEnum.values())
                 .addEnums("tokenTypeEnum", TokenTypeEnum.values())
+                .addEnums("trialStatusEnum", TrialStatusEnum.values())
                 .build();
         return enumMap;
     }

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

@@ -38,7 +38,8 @@
         <result column="access_type" property="accessType"/>
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
-        <result column="service_status" property="serviceStatus"/>
+        <result column="opened_service_status" property="openedServiceStatus"/>
+        <result column="time" property="time"/>
     </resultMap>
 
     <!--根据用户id查询用户是否有开通产品-->
@@ -75,10 +76,11 @@
     </select>
 
     <!--根据用户查询已开通产品-->
-    <select id="opendedProductByUserId" resultMap="BaseResultWrapperMap"
-            parameterType="java.lang.Long">
-        select a.*,b.start_time,b.end_time,b.service_status from diag_lantone_product a,diag_opened_products b
-        where a.id=b.product_id and a.is_deleted='N' and b.is_deleted='N'
-        and b.user_id=#{userId}
+    <select id="opendedProductByUserId" resultMap="BaseResultWrapperMap" parameterType="java.lang.Long">
+        select a.*,b.start_time,b.end_time,b.service_status as opened_service_status,c.time from diag_lantone_product a,diag_opened_products b,diag_product_order c,diag_order_details d
+        where a.id=b.product_id and a.id=d.product_id and c.num=d.order_num
+        and d.audit_status=1
+        and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and d.is_deleted='N'
+        and b.user_id=#{userId}  and c.user_id=#{userId}  and d.user_id=#{userId}
     </select>
 </mapper>

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

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.OrganizationTypeEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * 
+ * @Description: 认证中返回参数
+ * @author wangfeng
+ * @date 2018年9月29日 下午3:20:15
+ */
+@Getter
+@Setter
+public class AuthenticationDTO {
+	
+    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 Date certificationDate;//认证时间
+	    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;//机构属性
+	    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
+	    
+	    public  String getOrgTypeStr(){
+	        return OrganizationTypeEnum.getName(this.orgType);
+	    }
+
+	    public  String getAutStatusStr(){
+	        return AuthStatusEnum.getName(this.autStatus);
+	    }
+	    
+
+}

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

@@ -13,5 +13,6 @@ import lombok.Setter;
 public class JwtDTO {
     private String accessToken;
     private String refreshToken;
-    private Integer type;
+    private Integer type; //用户类型
+    private String typeCn; //用户类型中文
 }

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

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 机构信息
+ * @author wangfeng
+ * @date 2018年9月29日 下午2:48:13
+ */
+@Getter
+@Setter
+public class OrganizationDTO {
+	
+	 private Long userId;//用户ID
+	 private String linkman;//联系人
+	 private Long orgId;//机构ID
+	 private Date orgGmtCreate;//记录创建时间
+	 private String orgName;//机构名称
+	 private Integer orgType;//机构属性
+	 private String orgPrincipal;//负责人
+	 private String orgAddress;//机构地址
+	 private Long orgParentId;//上级机构id
+	 private Integer orgSubNum;//下属机构数量
+
+}

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

@@ -0,0 +1,36 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.diagbot.enums.AuthStatusEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * 
+ * @Description: 注册用户信息
+ * @author wangfeng
+ * @date 2018年9月29日 下午2:34:56
+ */
+@Getter
+@Setter
+public class UserAllDTO {
+	
+	private Long userId;//用户Id
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	private Date userGmtCreate;//记录创建时间
+	private String userName;// 用户名
+    private String linKman;//联系人
+    private String email;// 邮箱
+    private Long orgId;//机构ID
+    private String orgName;//机构名称
+    private Integer autStatus;//认证状态
+    private String autStatusStr;//认证状态String
+
+    public  String getAutStatusStr(){
+        return AuthStatusEnum.getName(this.autStatus);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.enums.ConstantEnum;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -32,4 +33,14 @@ public class UserLoginDTO {
      * 用户类型
      */
     private Integer type;
+
+    /**
+     * 用户类型中文
+     */
+    private String typeCn;
+
+
+    public String getTypeCn() {
+        return ConstantEnum.getName(this.type);
+    }
 }

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

@@ -0,0 +1,58 @@
+package com.diagbot.dto;
+
+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;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * 
+ * @Description: 已认证返回参数
+ * @author wangfeng
+ * @date 2018年9月29日 下午3:20:57
+ */
+@Getter
+@Setter
+public class UserOrgizationProductDTO {
+     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 Date certificationDate;//认证时间
+	    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;//机构属性
+	    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
+	    List<UserAndProdutUDTO> userAndProdutUDTO;
+
+	    public  String getOrgTypeStr(){
+	        return OrganizationTypeEnum.getName(this.orgType);
+	    }
+
+	    public  String getAutStatusStr(){
+	        return AuthStatusEnum.getName(this.autStatus);
+	    }
+
+}

user-service/src/main/java/com/diagbot/entity/UserAuthentication.java

@@ -37,6 +37,10 @@ public class UserAuthentication implements Serializable {
      * 记录修改时间
      */
     private Date gmtModified;
+    /**
+     * 认证时间
+     */
+    private Date certificationDate;
 
     /**
      * 创建人，0表示无创建人值

user-service/src/main/java/com/diagbot/enums/ConstantEnum.java

@@ -13,7 +13,11 @@ public enum ConstantEnum implements KeyedNamed {
     //TODO 短信过期时间，上线后设为3，测试阶段设大
     SMS_EXPIRED_INTERVAL(99999, "短信失效时间(分钟)"),
 
-    IMG_EXPIRED_INTERVAL(20, "图片验证码失效时间(分钟)");
+    IMG_EXPIRED_INTERVAL(20, "图片验证码失效时间(分钟)"),
+
+    INNER_USER(1, "用户-朗通"),
+    OUTER_USER(0, "用户-客户");
+
 
     @Setter
     private Integer key;

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

@@ -5,15 +5,19 @@ 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.AuthenticationDTO;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.JwtDTO;
 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.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserLoginDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
@@ -22,6 +26,7 @@ import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
 import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -40,16 +45,21 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.OrganizationVO;
+import com.diagbot.vo.UserAndOrgPageVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserExportVO;
 import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
+import com.diagbot.vo.UserInfoPagVO;
 import com.diagbot.vo.UserSaveVO;
+import com.diagbot.vo.UsernameVO;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -284,6 +294,7 @@ public class UserFacade extends UserServiceImpl {
         data.setAccessToken(jwt.getAccess_token());
         data.setRefreshToken(jwt.getRefresh_token());
         data.setType(user.getType());
+        data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
         return data;
     }
 
@@ -643,6 +654,7 @@ public class UserFacade extends UserServiceImpl {
         auditMap.put("userId", userInfoAuditVO.getUserId());
         auditMap.put("modifier", UserUtils.getCurrentPrincipleID());
         auditMap.put("gmtModified", DateUtil.now());
+        auditMap.put("certificationDate", DateUtil.now());
         auditMap.put("isReject", userInfoAuditVO.getIsReject());
         auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
         auditMap.put("rejectType", userInfoAuditVO.getRejectType());
@@ -806,4 +818,85 @@ public class UserFacade extends UserServiceImpl {
         user.setRecords(userData);
         return RespDTO.onSuc(user);
     }
+    /**
+     * 1.分页查询注册用户信息接口 queryUserInformation
+     * @param page
+     * @param orgName
+     * @param autStatus
+     * @return
+     */
+    public RespDTO<IPage<UserAllDTO>> queryUserInformations(Page page, String orgName, Integer autStatus){
+        UserInfoDTO userInfo = new UserInfoDTO();
+        userInfo.setOrgName(orgName);
+        userInfo.setAutStatus(autStatus);
+    	return RespDTO.onSuc(queryUserInformation(page, userInfo));
+    }
+    /**
+     * 2.分页查询机构信息接口 queryMechanismInformation
+     * @param page
+     * @param orgName
+     * @return
+     */
+    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformations(Page page, String orgName){
+        UserInfoDTO userInfo = new UserInfoDTO();
+        userInfo.setOrgName(orgName);
+    	return RespDTO.onSuc(queryMechanismInformation(page, userInfo));
+    }
+    /**
+     * 3.分页查询已认证用户信息和机构信息及开通产品接口 queryVerifiedUserOrganizationProduct
+     * @param page
+     * @param orgName
+     * @param userName
+     * @return
+     */
+    public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProducts(Page page,String orgName,String userName) {
+    	UserInfoDTO userInfo = new UserInfoDTO();
+        userInfo.setOrgName(orgName);
+        userInfo.setUserName(userName);
+        
+        IPage<UserOrgizationProductDTO> user = queryVerifiedUserOrganizationProduct(page, userInfo);
+        List<UserOrgizationProductDTO> userData = user.getRecords();
+        List<Long> userIds = new ArrayList<>();
+        for (UserOrgizationProductDTO 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 (UserOrgizationProductDTO 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);
+  	}
+    /**
+     *  4.分页查询认证中的用户信息接口 queryAuthentication
+     * @param page
+     * @param orgName
+     * @param userName
+     * @return
+     */
+    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page,String orgName,String userName) {
+    	UserInfoDTO userInfo = new UserInfoDTO();
+        userInfo.setOrgName(orgName);
+        userInfo.setUserName(userName);
+		return RespDTO.onSuc(queryAuthentication(page, userInfo));
+	}
+    
+    
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -3,9 +3,13 @@ package com.diagbot.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
 import com.diagbot.vo.UserExportVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
@@ -60,5 +64,13 @@ public interface UserMapper extends BaseMapper<User> {
     public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
 
     public List<User> getUserByOrgName(String orgName);
+    
+    public IPage<UserAllDTO> queryUserInformation(Page page, @Param("userInformation") UserInfoDTO userInfo);
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, @Param("mechanism")  UserInfoDTO userInfo);
+    
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, @Param("userOrg")  UserInfoDTO userInfo);
+    
+    public IPage<AuthenticationDTO> queryAuthentication(Page page, @Param("authen")  UserInfoDTO userInfo);
 
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -3,13 +3,19 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
 
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 /**
  * <p>
  * 服务类
@@ -54,4 +60,13 @@ public interface UserService extends IService<User> {
     public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map);
 
     public List<User> getUserByOrgName(String orgName);
+    
+    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo);
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page,  UserInfoDTO userInfo);
+    
+    public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo);
+    
+    public IPage<AuthenticationDTO> queryAuthentication(Page page,  UserInfoDTO userInfo);
+
 }

user-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,6 +1,8 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.enums.AccessTypeEnum;
 import com.diagbot.enums.AuthStatusEnum;
+import com.diagbot.enums.ChargeTypeEnum;
 import com.diagbot.enums.OrganizationTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
@@ -25,7 +27,9 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
+                .addEnums("accessTypeEnum", AccessTypeEnum.values())
                 .addEnums("authStatusEnum", AuthStatusEnum.values())
+                .addEnums("chargeTypeEnum", ChargeTypeEnum.values())
                 .addEnums("organizationTypeEnum", OrganizationTypeEnum.values())
                 .build();
         return enumMap;

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -3,9 +3,13 @@ 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.AuthenticationDTO;
+import com.diagbot.dto.OrganizationDTO;
+import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
@@ -107,5 +111,26 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public List<User> getUserByOrgName(String orgName) {
         return baseMapper.getUserByOrgName(orgName);
     }
+    
+    @Override
+    public IPage<UserAllDTO> queryUserInformation(Page page, UserInfoDTO userInfo){
+    	 return baseMapper.queryUserInformation(page, userInfo);
+    }
+    
+    public IPage<OrganizationDTO> queryMechanismInformation(Page page, UserInfoDTO userInfo){
+    	return baseMapper.queryMechanismInformation(page, userInfo);
+    }
+
+	@Override
+	public IPage<UserOrgizationProductDTO> queryVerifiedUserOrganizationProduct(Page page, UserInfoDTO userInfo) {
+		
+		return baseMapper.queryVerifiedUserOrganizationProduct(page, userInfo);
+	}
+
+	@Override
+	public IPage<AuthenticationDTO> queryAuthentication(Page page, UserInfoDTO userInfo) {
+		
+		return baseMapper.queryAuthentication(page, userInfo);
+	}
 
 }

user-service/src/main/java/com/diagbot/vo/CategoryDTO.java

@@ -0,0 +1,7 @@
+package com.diagbot.vo;
+
+public class CategoryDTO {
+	
+	
+
+}

user-service/src/main/java/com/diagbot/vo/UserAndOrgPageVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 用户和机构搜索入参
+ * @author wangfeng
+ * @date 2018年9月29日 下午4:02:19
+ */
+@Getter
+@Setter
+public class UserAndOrgPageVO extends Page{
+	
+	String userName;
+	String orgName;
+
+}

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

@@ -6,6 +6,8 @@ import javax.validation.Valid;
 
 import com.diagbot.vo.UserInfoPagVO;
 import com.diagbot.vo.UserOrganProductPageVO;
+import com.diagbot.vo.UsernameVO;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,8 +19,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.AuthenticationDTO;
+import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
@@ -27,12 +33,14 @@ import com.diagbot.facade.UserOrganizationFacade;
 import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.OrganizationNameVO;
 import com.diagbot.vo.OrganizationVO;
+import com.diagbot.vo.UserAndOrgPageVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @Description: 外部用户信息
@@ -57,7 +65,7 @@ public class UserInfoController {
     @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态autStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
-    // @ApiIgnore
+    @ApiIgnore
     public RespDTO<UserInfoDTO> getUserInfoPag(@RequestBody UserInfoPagVO userInfoPagVO) {
         UserInfoDTO userInfo = new UserInfoDTO();
         userInfo.setOrgName(userInfoPagVO.getOrgName());
@@ -124,8 +132,45 @@ public class UserInfoController {
     @PostMapping("/getUserOrganProductAll")
     @SysLogger("getUserOrganProductAll")
     @Transactional
+    @ApiIgnore
     public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
 
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAutStatus());
     }
+    
+    @ApiOperation(value = "分页查询注册用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态autStatus")
+    @PostMapping("/queryUserInformation")
+    @SysLogger("queryUserInformation")
+    public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
+    	
+    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getOrgName(), userInfoPagVO.getAutStatus());
+    }
+    
+    
+    @ApiOperation(value = "分页查询机构信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @PostMapping("/queryMechanismInformation")
+    @SysLogger("queryMechanismInformation")
+    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
+    	
+    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName());
+    }
+    
+    
+    @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @PostMapping("/queryVerifiedUserOrganizationProduct")
+    @SysLogger("queryVerifiedUserOrganizationProduct")
+    public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
+		
+		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+	}
+   
+    @ApiOperation(value = "分页查询认证中的用户信息接口[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
+    @PostMapping("/queryAuthentication")
+    @SysLogger("queryAuthentication")
+	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
+		
+		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName());
+	} 
+    
+    
 }

user-service/src/main/resources/mapper/UserAuthenticationMapper.xml

@@ -9,6 +9,7 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
+        <result column="certification_date" property="certificationDate"/>
         <result column="creator" property="creator"/>
         <result column="modifier" property="modifier"/>
         <result column="user_id" property="userId"/>

user-service/src/main/resources/mapper/UserMapper.xml

@@ -232,6 +232,7 @@
             <if test="auditMap.gmtModified !=null">gmt_modified=#{auditMap.gmtModified},</if>
             <if test="auditMap.modifier != null">modifier=#{auditMap.modifier},</if>
             <if test="auditMap.isReject != null">is_reject = #{auditMap.isReject} ,</if>
+            <if test="auditMap.certificationDate != null">certification_date = #{auditMap.certificationDate},</if>
             <if test="auditMap.rejectType != null">reject_type =#{auditMap.rejectType},</if>
             <if test="auditMap.rejectComment != null">reject_comment= #{auditMap.rejectComment},
             </if>
@@ -281,4 +282,117 @@
         </if>
         ORDER BY u.gmt_create DESC
     </select>
+    <select id="queryUserInformation"  resultType="com.diagbot.dto.UserAllDTO">
+     SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.name AS orgName,
+        aut.status AS autStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE u.is_deleted = 'N' AND u.TYPE = 0
+        <if test="userInformation.userName != null">
+            AND u.username LIKE CONCAT('%', #{userInformation.userName}, '%')
+        </if>
+        <if test="userInformation.autStatus != null">
+            AND aut.status = #{userInformation.autStatus}
+        </if>
+        ORDER BY u.gmt_create DESC  
+    </select>
+    
+   <select id="queryMechanismInformation" resultType="com.diagbot.dto.OrganizationDTO">
+    SELECT
+        u.id AS userId,
+        u.linkman AS linKman,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type AS orgType,
+        org.principal AS orgPrincipal,
+        org.address AS orgAddress,
+        org.parent_id AS orgParent_id,
+        org.sub_num AS orgSub_num
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE u.is_deleted = 'N' AND u.TYPE = 0
+        <if test="mechanism.orgName != null">
+            AND org.name LIKE CONCAT('%', #{mechanism.orgName}, '%')
+        </if>
+        <if test="mechanism.autStatus != null">
+            AND aut.status = #{mechanism.autStatus}
+        </if>
+        ORDER BY u.gmt_create DESC 
+   </select>
+    
+    <select id="queryVerifiedUserOrganizationProduct" resultType="com.diagbot.dto.UserOrgizationProductDTO">
+     SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type AS orgType,
+        org.principal AS orgPrincipal,
+        org.address AS orgAddress,
+        org.parent_id AS orgParent_id,
+        org.sub_num AS orgSub_num,
+        aut.certification_date AS certificationDate,
+        aut.position AS autPosition,
+        aut.status AS autStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE u.is_deleted = 'N' AND u.TYPE = 0
+        <if test="userOrg.orgName != null">
+            AND org.name LIKE CONCAT('%', #{userOrg.orgName}, '%')
+        </if>
+        <if test="userOrg.userName != null">
+            AND u.username LIKE CONCAT('%', #{userOrg.userName}, '%')
+        </if>
+        AND aut.status = 1
+        ORDER BY u.gmt_create DESC
+    </select>
+    <select id="queryAuthentication" resultType="com.diagbot.dto.AuthenticationDTO">
+    SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type AS orgType,
+        org.principal AS orgPrincipal,
+        org.address AS orgAddress,
+        org.parent_id AS orgParent_id,
+        org.sub_num AS orgSub_num,
+        aut.position AS autPosition,
+        aut.status AS autStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE u.is_deleted = 'N' AND u.TYPE = 0
+        <if test="authen.orgName != null">
+            AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
+        </if>
+        <if test="authen.userName != null">
+            AND u.username LIKE CONCAT('%', #{authen.userName}, '%')
+        </if>
+        AND aut.status = 2
+        ORDER BY u.gmt_create DESC
+    </select>
 </mapper>