Merge branch 'dev/one' into dev/intelligentTriage

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

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.enums.TrialStatusEnum;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -60,6 +59,11 @@ public class LantoneProductDTO {
      */
     private Integer trialStatus;
 
+    /**
+     * 试用状态名称
+     */
+    private String trialStatusName;
+
     /**
      * 试用地址
      */
@@ -74,8 +78,4 @@ public class LantoneProductDTO {
      * 已开通数量
      */
     private Integer oppendedNum;
-
-    public String getTrialStatus() {
-        return TrialStatusEnum.getName(trialStatus);
-    }
 }

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

@@ -0,0 +1,57 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.ServiceInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/10/23 19:11
+ */
+@Getter
+@Setter
+public class LantoneProductOrgDTO extends LantoneProduct {
+    /**
+     * 开通日期
+     */
+    private Date startTime;
+
+    /**
+     * 结束日期
+     */
+    private Date endTime;
+
+    /**
+     * 订单申请时间
+     */
+    private Date time;
+
+    /**
+     * 停用状态
+     */
+    private Integer openedServiceStatus;
+
+    /**
+     * 计费方式
+     */
+    private String[] chargeTypeArray;
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String[] accessTypeArray;
+
+    /**
+     * 机构名称
+     */
+    private String organizationName;
+
+    /**
+     * 关联的service
+     */
+    private List<ServiceInfo> serviceInfos;
+}

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

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.OpendProductWrapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:33
+ */
+public class OpendProductDTO extends OpendProductWrapper {
+}

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

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:38
+ */
+public class OrderDetialsDTO extends OrderDetailsWapper {
+}

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

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.ProductOrderWrapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:51
+ */
+public class ProductOrderDTO extends ProductOrderWrapper {
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.wrapper;
 
+import com.diagbot.util.DateUtil;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,4 +63,12 @@ public class OpendProductWrapper {
     private String orgName;//机构名称
 
     private Integer subNum;//机构数量
+
+    public String getStartTime() {
+        return DateUtil.formatDate(startTime);
+    }
+
+    public String getEndTime() {
+        return DateUtil.formatDate(endTime);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.wrapper;
 
+import com.diagbot.util.DateUtil;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -64,4 +65,12 @@ public class OrderDetailsWapper {
     private Long orgId;//机构ID
 
     private String orgName;//机构名称
+
+    public String getStartTime() {
+        return DateUtil.formatDate(startTime);
+    }
+
+    public String getEndTime() {
+        return DateUtil.formatDate(endTime);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.entity.wrapper;
 
+import com.diagbot.dto.OrderDetialsDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -49,5 +50,5 @@ public class ProductOrderWrapper{
 
     private String orgName;//机构名称
 
-    private List<OrderDetailsWapper> orderDetial;//订单明细
+    private List<OrderDetialsDTO> orderDetial;//订单明细
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.LantoneProductDTO;
+import com.diagbot.dto.LantoneProductOrgDTO;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -12,7 +14,6 @@ import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.ServiceInfo;
-import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.entity.wrapper.ServiceInfoWrapper;
 import com.diagbot.enums.AccessTypeEnum;
@@ -20,6 +21,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ProductAuditEnum;
 import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.enums.TrialStatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
@@ -173,9 +175,9 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      *
      * @return 查询当前用户已开通产品
      */
-    public List<LantoneProductWrapper> opendedProductByCurrentUser() {
+    public List<LantoneProductOrgDTO> opendedProductByCurrentUser() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        List<LantoneProductWrapper> list = this.opendedProductByUserId(userId);
+        List<LantoneProductOrgDTO> list = this.opendedProductByUserId(userId);
         List<Long> userIdList = new ArrayList<>();
         userIdList.add(userId);
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(userIdList);
@@ -193,7 +195,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwServiceInfo);
 
-        for (LantoneProductWrapper product : list) {
+        for (LantoneProductOrgDTO product : list) {
             product.setOrganizationName(mapRespDTO.data.get(userId).getOrgName());
             String[] accessType = product.getAccessType().split(",|，");
             String[] chargeType = product.getChargeType().split(",|，");
@@ -240,16 +242,12 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
         List<Long> orderDetailsId = orderDetailsFacade.getOrderDetailsByUser(userId);
         for (ProductLineDTO productLineDTO:productLineDTOList) {
-            productLineDTO.setProductAudit(ProductAuditEnum.NotOpend.getKey());
-            for (int i =0; i<opendId.size();i++){
-                if(productLineDTO.getId()==opendId.get(i)){
-                    productLineDTO.setProductAudit(ProductAuditEnum.Opended.getKey());
-                }
-            }
-            for (int i =0; i<orderDetailsId.size();i++){
-                if(productLineDTO.getId()==orderDetailsId.get(i)){
-                    productLineDTO.setProductAudit(ProductAuditEnum.Audit.getKey());
-                }
+            if(opendId.contains(productLineDTO.getId())){
+                productLineDTO.setProductAudit(ProductAuditEnum.Opended.getKey());
+            }else if(orderDetailsId.contains(productLineDTO.getId())){
+                productLineDTO.setProductAudit(ProductAuditEnum.Audit.getKey());
+            }else {
+                productLineDTO.setProductAudit(ProductAuditEnum.NotOpend.getKey());
             }
         }
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(userIdList);
@@ -260,6 +258,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         Map<Long, UserOrgDTO> dataMap =mapRespDTO.data;
         UserOrgDTO uo =dataMap.get(userId);
         Map map =new HashMap();
+        if(uo.getAuStatus() == null){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "账号信息不完善");
+        }
         map.put("userAuStatus",uo.getAuStatus());
         List list =new ArrayList();
         list.add(productLineDTOList);
@@ -273,7 +275,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param oppendedProductVO 所需参数（产品id，页数，和每页条数，默认显示10条）
      * @return 当条产品线下所有订单信息
      */
-    public IPage<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
+    public IPage<OpendProductDTO> opendedProduct(OppendedProductVO oppendedProductVO) {
         Page page =new Page();
         BeanUtil.copyProperties(oppendedProductVO,page);
         OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
@@ -282,9 +284,9 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(oppendedProductVO.getOrgName());
             openedProductsIndex.setUserId(rlist.data);
         }
-        List<OpendProductWrapper> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
+        List<OpendProductDTO> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
         List<Long> list1 = new ArrayList<>();
-        for (OpendProductWrapper opendProducts : list) {
+        for (OpendProductDTO opendProducts : list) {
             Long longs = opendProducts.getUserId();
             list1.add(longs);
         }
@@ -313,6 +315,9 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         Page page =new Page();
         BeanUtil.copyProperties(lantoneProductSelectVO,page);
         IPage<LantoneProductDTO> res = this.selectProduct(page, lantoneProductSelectVO.getName());
+        for (LantoneProductDTO lantoneProductDTO:res.getRecords()) {
+            lantoneProductDTO.setTrialStatusName(TrialStatusEnum.getName(lantoneProductDTO.getTrialStatus()));
+        }
         return RespDTO.onSuc(res);
     }
 }

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

@@ -52,6 +52,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
     private LantoneProductFacade lantoneProductFacade;
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
+    @Autowired
+    private ProductOrderFacade productOrderFacade;
 
     public List<OpenedProducts> getByAppkeyAndSecretFac(Map map) {
         return this.getByAppkeyAndSecret(map);
@@ -173,6 +175,8 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         int onTrialCount = baseMapper.getConsoleOnTrialCount(userId);
 
         EnShowOptionDTO enShowOptionDTO = new EnShowOptionDTO();
+        enShowOptionDTO.setOrderCount(productOrderFacade.getUserProductOrderCount(userId));
+        enShowOptionDTO.setOrderAuthFailCount(productOrderFacade.getOrderAuthFailCount(userId));
         enShowOptionDTO.setOpenedCount(openedCount);
         enShowOptionDTO.setOnTrialCount(onTrialCount);
 
@@ -219,7 +223,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
      * @param modifyOpeningTimeVO
      * @return 根据用户id和产品id，修改开通时间
      */
-    public RespDTO<ModifyOpeningTimeVO> modifyOpeningTimes(ModifyOpeningTimeVO modifyOpeningTimeVO) {
+    public RespDTO<Boolean> modifyOpeningTimes(ModifyOpeningTimeVO modifyOpeningTimeVO) {
         OpenedProducts openedProducts = new OpenedProducts();
         openedProducts.setUserId(modifyOpeningTimeVO.getUserId());
         openedProducts.setProductId(modifyOpeningTimeVO.getProductId());

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
@@ -9,7 +10,6 @@ import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ServiceInfo;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.PaymentMethodEnum;
 import com.diagbot.enums.ServiceTypeEnum;
@@ -136,12 +136,12 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
      * @param orderDetialsVO 需要提供参数（付款状态，页数，每页条数默认显示10条）
      * @return 所有订单明细
      */
-    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+    public List<OrderDetialsDTO> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
         OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
         BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
-        List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
+        List<OrderDetialsDTO> list =this.seleAllOrderDetials(orderDetailsIndex);
         List<Long> list1 =new ArrayList<>();
-        for (OrderDetailsWapper orderDetails:list) {
+        for (OrderDetialsDTO orderDetails:list) {
             Long longs = orderDetails.getUserId();
             list1.add(longs);
         }
@@ -151,7 +151,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-        for(OrderDetailsWapper bean : list) {
+        for(OrderDetialsDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);

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

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.AuthDetailDTO;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.dto.ProductOrderExportDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -13,7 +15,6 @@ import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.AuthStatusEnum;
@@ -106,6 +107,24 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 
         return retList;
     }
+    
+    /**
+     * 根据用户id查询订单信息数量
+     * @param userId
+     * @return
+     */
+    public int getUserProductOrderCount(Long userId){
+    	return baseMapper.getUserProductOrderCount(userId);
+    }
+    
+    /**
+     * 根据用户id查询审核不通过订单信息数量
+     * @param userId
+     * @return
+     */
+    public int getOrderAuthFailCount(Long userId){
+    	return baseMapper.getOrderAuthFailCount(userId);
+    }
 
 
     /**
@@ -206,7 +225,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @param productOrderVO （订单编号，机构名称，申请状态）
 	 * @return 所有订单信息
 	 */
-	public RespDTO<IPage<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
+	public RespDTO<IPage<ProductOrderDTO>> selectAllProductOrder(ProductOrderVO productOrderVO){
 	    Page page =new Page();
 	    BeanUtil.copyProperties(productOrderVO,page);
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
@@ -216,10 +235,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
             productOrderIndex.setUserId(rlist.data);
         }
-		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
+		List<ProductOrderDTO> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
 		List<Long> list1 =new ArrayList<>();
 		List<String> orderNoList =new ArrayList<>();
-		for (ProductOrderWrapper productOrderWrapper:list) {
+		for (ProductOrderDTO productOrderWrapper:list) {
 			Long longs = productOrderWrapper.getUserId();
 			String orderNo =productOrderWrapper.getNum();
 			list1.add(longs);
@@ -227,15 +246,15 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		}
         OrderDetialsVO orderDetialsVO =new OrderDetialsVO();
 		orderDetialsVO.setOrderNum(orderNoList);
-		List<OrderDetailsWapper> orderDetilList = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+		List<OrderDetialsDTO> orderDetilList = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
 		RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
 		if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
 					"获取用户和机构信息失败");
 		}
 		Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-		Map<String,List<OrderDetailsWapper>> odMap = EntityUtil.makeEntityListMap(orderDetilList,"orderNum");
-		for(ProductOrderWrapper bean : list) {
+		Map<String,List<OrderDetialsDTO>> odMap = EntityUtil.makeEntityListMap(orderDetilList,"orderNum");
+		for(ProductOrderDTO bean : list) {
 			UserOrgDTO uo = dataMap.get(bean.getUserId());
 			if(uo != null) {
 				bean.setUsername(uo.getUsername());
@@ -264,16 +283,16 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         productOrder.setNum(orderNum);
         productOrder= this.selctOrderTimeByOrderNum(productOrder);
         int satus =0;
-        if(orderDetailStatus.getCt() == orderDetailStatus.getNotAudit()){
+        if(orderDetailStatus.getCt().intValue() == orderDetailStatus.getNotAudit().intValue()){
             satus = AuditStatusEnum.NotAudit.getKey();
             // ct == sh 待审核
-        }else if(orderDetailStatus.getCt() > orderDetailStatus.getNotAudit() &&orderDetailStatus.getNotAudit() != 0){
+        }else if(orderDetailStatus.getCt().intValue() > orderDetailStatus.getNotAudit().intValue() && orderDetailStatus.getNotAudit().intValue() != 0){
             satus = AuditStatusEnum.Audit_Part.getKey();
             // ct > sh && sh != 0 部分审核
-        }else if(orderDetailStatus.getCt() == orderDetailStatus.getPass()){
+        }else if(orderDetailStatus.getCt().intValue() == orderDetailStatus.getPass().intValue()){
             satus = AuditStatusEnum.Adopt.getKey();
             // ct == pass 通过
-        }else if(orderDetailStatus.getCt() == orderDetailStatus.getNotPass()){
+        }else if(orderDetailStatus.getCt().intValue() == orderDetailStatus.getNotPass().intValue()){
             satus = AuditStatusEnum.Veto.getKey();
             // ct == not_pass 不通过
         }else {
@@ -307,7 +326,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", productOrderExportVO.getStartTime());
         userMap.put("endTime", productOrderExportVO.getEndTime());
-        RespDTO<IPage<ProductOrderWrapper>> datas = this.selectAllProductOrder(productOrderVO);
+        RespDTO<IPage<ProductOrderDTO>> datas = this.selectAllProductOrder(productOrderVO);
         GsonUtil.toJson(datas.data.getRecords());
         List<String> listName = new ArrayList<>();
 

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

@@ -4,9 +4,9 @@ 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.LantoneProductDTO;
+import com.diagbot.dto.LantoneProductOrgDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -48,7 +48,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: zhaops
      * @Date: 10:10 2018/9/20
      */
-    List<LantoneProductWrapper> opendedProductByUserId(Long userId);
+    List<LantoneProductOrgDTO> opendedProductByUserId(Long userId);
 
     /**
      * 根据产品名称查询产品

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

@@ -5,10 +5,10 @@ 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.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -99,7 +99,7 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @Author: wangyu
      * @Date: 20:23 2018/9/20
      */
-     IPage<OpendProductWrapper> getByProductId(Page page,@Param("opend") OpenedProductsIndex openedProductsIndex);
+     IPage<OpendProductDTO> getByProductId(Page page, @Param("opend") OpenedProductsIndex openedProductsIndex);
 
     /**
      * @Description: 根据产品id查询该产品是否有用户开通

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

@@ -1,10 +1,10 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @Author: wangyu
      * @Date: 15:06 2018/9/21
      */
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 
     /**
      * 根据订单编号查询所有产品审核状态

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

@@ -4,9 +4,9 @@ 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.AuthDetailDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,6 +27,13 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      */
     List<ProductOrder> getUserProductOrder(Long userId);
     
+    /**
+     * 根据用户id查询订单信息数量
+     * @param userId
+     * @return
+     */
+    int getUserProductOrderCount(Long userId);
+    
     /**
      * 根据订单号查询详情
      *
@@ -42,6 +49,13 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @return
      */
     List<AuthDetailDTO> getOrderDetailsByNums(List<String> nums);
+    
+    /**
+     * 根据用户id查询审核不通过订单信息数量
+     * @param userId
+     * @return
+     */
+    int getOrderAuthFailCount(Long userId);
 
     /**
      * @Description: 根据订单号查询订单信息
@@ -62,6 +76,6 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, @Param("product") ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderDTO> selectAllProductOrder(Page page, @Param("product") ProductOrderIndex productOrderIndex);
 
 }

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

@@ -4,9 +4,9 @@ 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.LantoneProductDTO;
+import com.diagbot.dto.LantoneProductOrgDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.wrapper.LantoneProductWrapper;
 
 import java.util.List;
 import java.util.Map;
@@ -46,7 +46,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: zhaops
      * @Date: 10:10 2018/9/20
      */
-    List<LantoneProductWrapper> opendedProductByUserId(Long userId);
+    List<LantoneProductOrgDTO> opendedProductByUserId(Long userId);
 
     /**
      * 根据产品名称查询产品

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

@@ -3,10 +3,10 @@ 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.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 
 import java.util.List;
 import java.util.Map;
@@ -62,7 +62,7 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @param openedProductsIndex
      * @return
      */
-        IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex);
+        IPage<OpendProductDTO> getByProductId(Page page, OpenedProductsIndex openedProductsIndex);
 
     /**
      * 根据产品id查询该产品是否有用户开通

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

@@ -1,10 +1,10 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 
 import java.util.List;
 
@@ -22,7 +22,7 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      * @Author: wangyu
      * @Date: 15:06 2018/9/21
      */
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 
     /**
      * 根据订单编号查询所有订单明细审核状态

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

@@ -3,9 +3,9 @@ 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.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 
 /**
  * <p>
@@ -29,6 +29,6 @@ public interface ProductOrderService extends IService<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderDTO> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex);
 
 }

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.LantoneProductDTO;
+import com.diagbot.dto.LantoneProductOrgDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.mapper.LantoneProductMapper;
 import com.diagbot.service.LantoneProductService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
     }
 
     @Override
-    public List<LantoneProductWrapper> opendedProductByUserId(Long userId) {
+    public List<LantoneProductOrgDTO> opendedProductByUserId(Long userId) {
         return baseMapper.opendedProductByUserId(userId);
     }
 

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

@@ -3,10 +3,10 @@ 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.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
 import org.springframework.stereotype.Service;
@@ -71,7 +71,7 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     }
 
     @Override
-    public IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex) {
+    public IPage<OpendProductDTO> getByProductId(Page page, OpenedProductsIndex openedProductsIndex) {
         return baseMapper.getByProductId(page,openedProductsIndex);
     }
 

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

@@ -1,6 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
@@ -27,7 +28,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
      * @Date: 15:25 2018/9/21
      */
     @Override
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex) {
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex) {
         return baseMapper.seleAllOrderDetials(orderDetailsIndex);
     }
     /**

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

@@ -3,9 +3,9 @@ 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.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.mapper.ProductOrderMapper;
 import com.diagbot.service.ProductOrderService;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, Pro
     }
 
     @Override
-    public IPage<ProductOrderWrapper> selectAllProductOrder(Page page,ProductOrderIndex productOrderIndex) {
+    public IPage<ProductOrderDTO> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex) {
         return baseMapper.selectAllProductOrder(page,productOrderIndex);
     }
 

diagbotman-service/src/main/java/com/diagbot/vo/AddOrderVO.java

@@ -14,6 +14,6 @@ import java.util.List;
 @Getter
 @Setter
 public class AddOrderVO {
-    @NotBlank(message = "请输入产品Id!")
+    @NotBlank(message = "请输入产品Id")
     private List<Long> productId;
 }

diagbotman-service/src/main/java/com/diagbot/vo/AddProductsVO.java

@@ -13,15 +13,15 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class AddProductsVO {
-    @NotBlank(message = "请输入产品名称!")
+    @NotBlank(message = "请输入产品名称")
     private String name;
-    @NotBlank(message = "请输入产品介绍!")
+    @NotBlank(message = "请输入产品介绍")
     private String decription;
-    @NotBlank(message = "请输入产品路径!")
+    @NotBlank(message = "请输入产品路径")
     private String url;
-    @NotBlank(message = "请输入计费方式!")
+    @NotBlank(message = "请输入计费方式")
     private String chargeType;
-    @NotBlank(message = "请输入计费方式!")
+    @NotBlank(message = "请输入试用状态")
     private Integer trialStatus;
     /**
      * 试用路径
@@ -30,5 +30,6 @@ public class AddProductsVO {
     /**
      * 接入方式
       */
+    @NotBlank(message = "请输入接入方式")
     private String accessType;
 }

diagbotman-service/src/main/java/com/diagbot/vo/AddRenewalsInfoVO.java

@@ -13,6 +13,6 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class AddRenewalsInfoVO {
-    @NotBlank(message = "请输入产品Id!")
+    @NotBlank(message = "请输入产品Id")
     private Long productId;
 }

diagbotman-service/src/main/java/com/diagbot/vo/AuditStatusVO.java

@@ -13,9 +13,9 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class AuditStatusVO {
-    @NotBlank(message = "请输入订单明细Id!")
+    @NotBlank(message = "请输入订单明细Id")
     public Long id;
-    @NotBlank(message = "请输入订单审核状态!")
+    @NotBlank(message = "请输入订单审核状态")
     private Integer auditStatus;
     /**
      * 开通时间

diagbotman-service/src/main/java/com/diagbot/vo/DeleteRenewalsInfoVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Description:
  * @author: wangyu
@@ -14,5 +16,6 @@ public class DeleteRenewalsInfoVO {
     /**
      * 续费id
      */
+    @NotNull(message = "请输入续费单id")
     private Long id;
 }

diagbotman-service/src/main/java/com/diagbot/vo/ModifyOpeningTimeVO.java

@@ -1,12 +1,10 @@
 package com.diagbot.vo;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author wangfeng
  * @Description: 据用户id和产品id，修改启用时间入参
@@ -15,7 +13,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class ModifyOpeningTimeVO {
-
+    @NotNull(message = "请输入到期时间")
     private String endTime;
     @NotNull(message = "请输入用户id")
     private Long userId;

diagbotman-service/src/main/java/com/diagbot/vo/OppendedProductVO.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class OppendedProductVO extends Page{
-    @NotBlank(message = "请输入产品Id!")
+    @NotBlank(message = "请输入产品Id")
     private Long productId;
     /**
      * 机构名称

diagbotman-service/src/main/java/com/diagbot/vo/UpdateProductVO.java

@@ -3,6 +3,8 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Description:
  * @author: zhaops
@@ -14,6 +16,7 @@ public class UpdateProductVO {
     /**
      * 产品id
      */
+    @NotBlank(message = "请输入产品id")
     private Long id;
     /**
      * 产品名称

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

@@ -4,9 +4,10 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LantoneProductDTO;
+import com.diagbot.dto.LantoneProductOrgDTO;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.LantoneProductSelectVO;
@@ -40,8 +41,8 @@ public class DiagLantoneProductController {
             notes = "name：产品名，必填<br>" +
                     "decription：产品描述，必填<br> " +
                     "url：产品访问路径，必填<br>" +
-                    "charge_type：计费方式，必填<br>" +
-                    "access_type：接入模式，必填<br>" +
+                    "chargeType：计费方式，必填<br>" +
+                    "accessType：接入模式，必填<br>" +
                     "trialStatus：试用状态（是否可试用）,必填<br>")
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
@@ -102,15 +103,15 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<IPage<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
+    public RespDTO<IPage<OpendProductDTO>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }
 
     @ApiOperation(value = "查询当前用户已开通产品[by:zhaops]")
     @PostMapping("/opendedProductByCurrentUser")
     @SysLogger("opendedProductByCurrentUser")
-    public RespDTO<List<LantoneProductWrapper>> opendedProductByCurrentUser() {
-        List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();
+    public RespDTO<List<LantoneProductOrgDTO>> opendedProductByCurrentUser() {
+        List<LantoneProductOrgDTO> list = lantoneProductFacade.opendedProductByCurrentUser();
         return RespDTO.onSuc(list);
     }
 }

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

@@ -2,8 +2,8 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.OrderDetailsFacade;
 import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.OrderDetialsVO;
@@ -34,8 +34,8 @@ public class DiagOrderDetailsController {
             notes = "orderNum:订单编号<br>")
     @PostMapping("/getAllOrderDetials")
     @SysLogger("getAllOrderDetials")
-    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
-        List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+    public RespDTO<List<OrderDetialsDTO>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
+        List<OrderDetialsDTO> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
         return RespDTO.onSuc(list);
     }
 

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

@@ -7,11 +7,11 @@ import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
@@ -126,7 +126,7 @@ public class ProductOrderController {
     @PostMapping("/modifyOpeningTime")
     @SysLogger("modifyOpeningTime")
     @Transactional
-    public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
+    public RespDTO<Boolean> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
 
         return openedProductsFacade.modifyOpeningTimes(modifyOpeningTimeVO);
     }
@@ -145,7 +145,7 @@ public class ProductOrderController {
                     "orderDetial:订单审核信息<br>")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
-    public RespDTO<IPage<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
+    public RespDTO<IPage<ProductOrderDTO>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
         return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 

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

@@ -80,7 +80,9 @@ public class ProductServiceController {
      * @param page
      * @return
      */
-    @ApiOperation(value = "获取当前登录用户产品服务分页列表[by:zhaops]", notes = "获取当前登录用户产品服务分页列表")
+    @ApiOperation(value = "获取当前登录用户产品服务分页列表[by:zhaops]",
+            notes = "current:页码，必填<br>" +
+                    "size:每页显示条数，必填<br>" )
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")
     public RespDTO getProductServiceByCurrentUser(@RequestBody Page page) {

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

@@ -115,7 +115,9 @@ public class ServiceInfoController {
      * @param page
      * @return
      */
-    @ApiOperation(value = "获取当前登录用户的服务分页列表[by:zhaops]")
+    @ApiOperation(value = "获取当前登录用户的服务分页列表[by:zhaops]",
+            notes = "current:页码，必填<br>" +
+                    "size:每页显示条数，必填<br>" )
     @PostMapping("/getServiceListPageByCurrentUser")
     @SysLogger("getServiceListPageByCurrentUser")
     @Transactional

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

@@ -21,7 +21,7 @@
         <result column="access_type" property="accessType"/>
     </resultMap>
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultWrapperMap" type="com.diagbot.entity.wrapper.LantoneProductWrapper">
+    <resultMap id="BaseResultDTOMap" type="com.diagbot.dto.LantoneProductOrgDTO">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -44,7 +44,7 @@
     </resultMap>
 
     <select id="productLines" resultType="com.diagbot.dto.ProductLineDTO">
-        SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N'
+        SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N' AND  service_status = 1
     </select>
 
     <!--根据产品名称分页查询-->
@@ -90,7 +90,7 @@
     </select>
 
     <!--根据用户查询已开通产品-->
-    <select id="opendedProductByUserId" resultMap="BaseResultWrapperMap" parameterType="java.lang.Long">
+    <select id="opendedProductByUserId" resultMap="BaseResultDTOMap" 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

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

@@ -22,7 +22,7 @@
     </resultMap>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.OpendProductWrapper">
+    <resultMap id="BaseResultWrapper" type="com.diagbot.dto.OpendProductDTO">
         <id column="id" property="id"/>
         <result column="product_id" property="productId"/>
         <result column="user_id" property="userId"/>
@@ -65,8 +65,8 @@
 			b.access_type as accessType,
 			case when c.id is null then 0 else 1 end as renewalsStutas
 		from diag_opened_products a join diag_lantone_product b on a.product_id=b.id
-		left join diag_user_renewals c on a.user_id=c.user_id and a.product_id=c.product_id and c.renewals_status=0 and c.cancel_renewals=0
-		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId};
+		left join diag_user_renewals c on a.user_id=c.user_id and a.product_id=c.product_id and c.renewals_status=0 and c.cancel_renewals=0 and c.is_deleted='N'
+		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId}
     </select>
 
     <select id="getConsoleOpenedCount" parameterType="long" resultType="int">
@@ -135,7 +135,7 @@
 		FROM
 		diag_opened_products
 		WHERE
-		user_id = #{userId})
+		user_id = #{userId} and is_deleted = 'N' and service_status = 1)
     </select>
     <select id="getInformationAvailableByUserId" parameterType="com.diagbot.entity.OpenedProducts"
             resultType="com.diagbot.dto.UserAndProdutDTO">
@@ -196,7 +196,7 @@
         AND a.product_id = #{productId}
     </update>
 
-    <select id="getByProductId" resultType="com.diagbot.entity.wrapper.OpendProductWrapper">
+    <select id="getByProductId" resultType="com.diagbot.dto.OpendProductDTO">
         SELECT a.*,b.time order_time from diag_opened_products a
         LEFT JOIN diag_product_order b ON a.order_id =b.id
         WHERE product_id =#{opend.productId} AND a.is_deleted='N'

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

@@ -21,7 +21,7 @@
         <result column="reject_reason" property="rejectReason"/>
     </resultMap>
 
-    <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.OrderDetailsWapper">
+    <resultMap id="BaseResultWrapper" type="com.diagbot.dto.OrderDetialsDTO">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -61,7 +61,7 @@
         (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and is_deleted = 'N') ct,
         (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and audit_status = 0 and is_deleted = 'N') not_pass,
         (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and audit_status = 1 and is_deleted = 'N') pass,
-        (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and audit_status is null and is_deleted = 'N') not_audit
+        (SELECT count(*) FROM `diag_order_details` where order_num = #{orderNum} and audit_status = 2 and is_deleted = 'N') not_audit
         from dual
     </select>
 
@@ -75,6 +75,6 @@
     </insert>
 
     <select id="getOrderDetailsByUser" resultType="java.lang.Long">
-        SELECT a.product_id FROM diag_order_details a WHERE a.is_deleted ='N' and a.user_id = #{userId}
+        SELECT a.product_id FROM diag_order_details a WHERE a.is_deleted ='N' and a.audit_status != 0 and a.user_id = #{userId}
     </select>
 </mapper>

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

@@ -17,7 +17,7 @@
         <result column="total_prices" property="totalPrices"/>
     </resultMap>
 
-    <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.ProductOrderWrapper">
+    <resultMap id="BaseResultWrapper" type="com.diagbot.dto.ProductOrderDTO">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -36,6 +36,12 @@
     	from diag_product_order
     	where is_deleted = 'N' and user_id=#{userId}
     </select>
+    
+    <select id="getUserProductOrderCount" parameterType="Long" resultType="int">
+    	select count(distinct a.num)
+		from diag_product_order a join diag_order_details b on a.num=b.order_num
+		where a.is_deleted = 'N' and b.is_deleted='N' and a.user_id=#{userId}
+    </select>
 
     <select id="getOrderDetails" parameterType="string" resultType="com.diagbot.dto.AuthDetailDTO">
 		select
@@ -58,11 +64,19 @@
         b.reject_reason as rejectReason
         from diag_order_details b join diag_lantone_product c on b.product_id=c.id
         where b.is_deleted = 'N' and c.is_deleted = 'N'
-        and b.num in
+        and b.order_num in
         <foreach collection="list" separator="," open="(" close=")" item="num">
             #{num}
         </foreach>
     </select>
+    
+    <select id="getOrderAuthFailCount" parameterType="Long" resultType="int">
+    	select count(distinct a.num)
+		from diag_product_order a
+		join diag_order_details b on a.num=b.order_num
+		join diag_lantone_product c on b.product_id=c.id
+		where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and b.audit_status='0' and a.user_id=#{userId}
+    </select>
 
     <select id="selctOrderTimeByOrderNum" resultMap="BaseResultMap"
             parameterType="com.diagbot.entity.ProductOrder">

docs/003.20181024初始化脚本/init_diagbotcloud.sql

@@ -0,0 +1,920 @@
+
+drop database if exists `sys-diagbotman`;
+CREATE DATABASE  `sys-diagbotman` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+use `sys-diagbotman`;
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-diagbotman
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:02:02
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for diag_lantone_product
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_lantone_product`;
+CREATE TABLE `diag_lantone_product` (
+  `id` bigint(12) NOT NULL AUTO_INCREMENT COMMENT '产品id',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(50) NOT NULL DEFAULT '' COMMENT '产品名称',
+  `decription` text NOT NULL COMMENT '产品介绍',
+  `charge_type` varchar(50) NOT NULL DEFAULT '0' COMMENT '计费方式(1.流程计费2.机构计费3.用户计费)',
+  `url` varchar(255) NOT NULL COMMENT '产品地址',
+  `service_status` int(11) NOT NULL DEFAULT '1' COMMENT '停用状态',
+  `trial_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否试用(0.否1.是)',
+  `trial_url` varchar(255) NOT NULL DEFAULT '0' COMMENT '试用地址',
+  `access_type` varchar(50) NOT NULL DEFAULT '1,2,3' COMMENT '接入方式（1：online，2：接口方式，3：嵌入式）',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='朗通产品表';
+
+-- ----------------------------
+-- Table structure for diag_opened_products
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_opened_products`;
+CREATE TABLE `diag_opened_products` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '已开通产品id',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `product_id` bigint(20) NOT NULL COMMENT '产品id',
+  `user_id` bigint(20) NOT NULL COMMENT '用户id',
+  `start_time` datetime NOT NULL COMMENT '开通日期',
+  `end_time` datetime NOT NULL COMMENT '结束日期',
+  `service_status` int(11) NOT NULL DEFAULT '1' COMMENT '停用状态（0.禁用1.启用）',
+  `order_id` int(20) NOT NULL COMMENT '订单id',
+  `access_type` varchar(50) DEFAULT NULL COMMENT '接入方式（1：嵌入式，2：接口方式，3：online）',
+  `charge_type` varchar(50) DEFAULT NULL COMMENT '计费方式(1.流程计费2.机构计费3.用户计费)',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='已开通产品';
+
+-- ----------------------------
+-- Table structure for diag_order_details
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_order_details`;
+CREATE TABLE `diag_order_details` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单明细id',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `order_num` varchar(100) NOT NULL COMMENT '订单编号',
+  `product_id` bigint(20) NOT NULL COMMENT '产品id',
+  `user_id` bigint(20) NOT NULL COMMENT '用户id',
+  `audit_status` int(11) NOT NULL DEFAULT '2' COMMENT '审核状态（0.不通过1.通过2.待审核）',
+  `unit_price` decimal(10,2) DEFAULT NULL COMMENT '单个服务的价钱',
+  `status` int(11) NOT NULL DEFAULT '0' COMMENT '订单状态（0.未付款1.已付款）',
+  `reject_type` int(11) NOT NULL DEFAULT '0' COMMENT '不通过类型(1.账号信息不完善2.机构有误3.取消订单0.未选择)',
+  `reject_reason` varchar(255) DEFAULT NULL COMMENT '不通过原因',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='订单明细表';
+
+-- ----------------------------
+-- Table structure for diag_product_order
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_product_order`;
+CREATE TABLE `diag_product_order` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单id',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `num` varchar(100) NOT NULL COMMENT '订单编号',
+  `user_id` bigint(20) NOT NULL COMMENT '用户id',
+  `time` datetime NOT NULL COMMENT '下单时间（申请时间）',
+  `total_prices` decimal(10,2) DEFAULT NULL COMMENT '订单总价',
+  `audit_status` int(11) DEFAULT '2' COMMENT '审核状态（0.不通过1.通过2.待审核3.部分通过4.部分审核）',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `order_index_1` (`num`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='订单表';
+
+-- ----------------------------
+-- Table structure for diag_product_service
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_product_service`;
+CREATE TABLE `diag_product_service` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间',
+  `creator` varchar(255) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(255) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `product_id` bigint(20) DEFAULT '0' COMMENT '产品id',
+  `service_id` bigint(20) DEFAULT '0' COMMENT '客户服务id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='服务端维护表';
+
+-- ----------------------------
+-- Table structure for diag_service_info
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_service_info`;
+CREATE TABLE `diag_service_info` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间',
+  `creator` varchar(255) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(255) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) DEFAULT NULL COMMENT '服务名称',
+  `description` varchar(1024) DEFAULT NULL COMMENT '服务描述',
+  `user_id` bigint(20) NOT NULL COMMENT '用户id',
+  `type` int(11) NOT NULL DEFAULT '1' COMMENT '服务端类型（1：用户建立，2：系统生成）',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户服务表';
+
+-- ----------------------------
+-- Table structure for diag_service_token
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_service_token`;
+CREATE TABLE `diag_service_token` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间',
+  `creator` varchar(255) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(255) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `product_service_id` bigint(20) DEFAULT '0' COMMENT '产品服务关联id',
+  `app_key_id` varchar(255) DEFAULT NULL COMMENT '服务调用id',
+  `app_key_secret` varchar(255) DEFAULT NULL COMMENT '服务调用密码',
+  `type` int(11) DEFAULT '1' COMMENT '令牌类型（1：online，2：手动，3：试用）',
+  `status` int(11) DEFAULT '1' COMMENT '状态（0：禁用，1：启用）',
+  `starting_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '开通日期',
+  `expiring_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '到期时间',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='服务令牌表';
+
+-- ----------------------------
+-- Table structure for diag_user_renewals
+-- ----------------------------
+DROP TABLE IF EXISTS `diag_user_renewals`;
+CREATE TABLE `diag_user_renewals` (
+  `id` bigint(12) NOT NULL AUTO_INCREMENT COMMENT '续费id',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' ON UPDATE CURRENT_TIMESTAMP COMMENT '记录创建时间,默认(1970-01-01 12:00:00)',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' ON UPDATE CURRENT_TIMESTAMP COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `product_id` bigint(12) NOT NULL COMMENT '产品id',
+  `user_id` bigint(50) NOT NULL COMMENT '用户id',
+  `renewals_status` int(11) NOT NULL DEFAULT '0' COMMENT '续费状态（1.已续费0.未续费）',
+  `apply_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '申请时间',
+  `renewals_no` varchar(100) NOT NULL DEFAULT '' COMMENT '续费单号',
+  `cancel_renewals` int(10) NOT NULL DEFAULT '0' COMMENT '取消续费状态（0.未取消1.取消）',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户续费申请表';
+
+
+drop database if exists `sys-log`;
+CREATE DATABASE  `sys-log` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+use `sys-log`;
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-log
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:03:49
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_log`;
+CREATE TABLE `sys_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `ip` varchar(255) NOT NULL DEFAULT '' COMMENT '访问者的IP',
+  `sys_type` int(11) NOT NULL DEFAULT '0' COMMENT '访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web',
+  `method` varchar(255) NOT NULL DEFAULT '' COMMENT '方法',
+  `operation` varchar(255) NOT NULL DEFAULT '' COMMENT '操作名',
+  `params` text COMMENT '参数',
+  `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统操作日志表';
+
+drop database if exists `sys-user`;
+CREATE DATABASE  `sys-user` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+use `sys-user`;
+
+
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:06:44
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu`;
+CREATE TABLE `sys_menu` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单名称',
+  `parent_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '-1：表示顶级,其他值表示上级菜单的id',
+  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '编码，与前端对应',
+  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序，从小到大',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='系统菜单';
+
+-- ----------------------------
+-- Records of sys_menu
+-- ----------------------------
+INSERT INTO `sys_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台', '-1', 'YH-KZT', '1', '用户-控制台');
+INSERT INTO `sys_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '更多服务', '-1', 'YH-GDFW', '2', '用户-更多服务');
+INSERT INTO `sys_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '机构中心', '-1', 'YH-JGZX', '3', '用户-机构中心');
+INSERT INTO `sys_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '账号信息', '3', 'YH-JGZX-ZHXX', '1', '用户-机构中心-账号信息');
+INSERT INTO `sys_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已开通产品', '3', 'YH-JGZX-YKTCP', '2', '用户-机构中心-已开通产品');
+INSERT INTO `sys_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '安全设置', '3', 'YH-JGZX-AQSZ', '5', '用户-机构中心-安全设置');
+INSERT INTO `sys_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '管理服务端', '3', 'YH-JGZX-GLFFD', '3', '用户-机构中心-管理服务端');
+INSERT INTO `sys_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心', '-1', 'LT-KHZX', '2', '朗通-客户中心');
+INSERT INTO `sys_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '机构信息', '10', 'LT-KHZX-JGXX', '2', '朗通-客户中心-机构信息');
+INSERT INTO `sys_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台', '-1', 'LT-KZT', '1', '朗通-控制台');
+INSERT INTO `sys_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已生成令牌', '3', 'YH-JGZX-YSCLP', '4', '用户-机构中心-已生成令牌');
+INSERT INTO `sys_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '注册用户', '10', 'LT-KHZX-ZCYH', '1', '朗通-客户中心-注册用户');
+INSERT INTO `sys_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '审核超管信息', '10', 'LT-KHZX-CGXX', '3', '朗通-客户中心-超管信息');
+INSERT INTO `sys_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '订单系统', '-1', 'LT-DDXT', '3', '朗通-订单系统');
+INSERT INTO `sys_menu` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品申请列表', '17', 'LT-DDXT-CPXSQLB', '1', '朗通-订单系统-产品申请列表');
+INSERT INTO `sys_menu` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品线管理', '-1', 'LT-CPXGL', '4', '朗通-产品线管理');
+INSERT INTO `sys_menu` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '个人中心', '-1', 'LT-GRZX', '5', '朗通-个人中心');
+INSERT INTO `sys_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '已认证超管信息', '10', 'LT-YRZCGXX', '0', '朗通-客户中心-已认证超管信息');
+INSERT INTO `sys_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '产品续费列表', '17', 'LT-CPXFLB', '2', '朗通-订单系统-产品续费列表');
+
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:06:54
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_menu_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_menu_permission`;
+CREATE TABLE `sys_menu_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
+  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统资源id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8 COMMENT='菜单和系统资源的映射表';
+
+-- ----------------------------
+-- Records of sys_menu_permission
+-- ----------------------------
+INSERT INTO `sys_menu_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '8', '朗通-客户中心-获取用户信息列表');
+INSERT INTO `sys_menu_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '12', '朗通-客户中心-修改用户和机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '14', '朗通-客户中心-根据用户Id删除');
+INSERT INTO `sys_menu_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '18', '朗通-客户中心-模糊查询机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '19', '朗通-客户中心-添加机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '20', '朗通-客户中心-添加用户信息和绑定机构');
+INSERT INTO `sys_menu_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '22', '朗通-客户中心-审核用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '15', '用户-机构中心-已开通产品-关联产品与用户服务端');
+INSERT INTO `sys_menu_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '16', '用户-机构中心-已开通产品-删除产品与用户服务端的关联');
+INSERT INTO `sys_menu_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '17', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '24', '用户-机构中心-管理服务端-新增服务端');
+INSERT INTO `sys_menu_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '25', '用户-机构中心-管理服务端-修改服务端');
+INSERT INTO `sys_menu_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '26', '用户-机构中心-管理服务端-获取当前登录用户的服务列表');
+INSERT INTO `sys_menu_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '27', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表');
+INSERT INTO `sys_menu_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '31', '朗通-客户中心-根据用户id和产品id，修改开通时间');
+INSERT INTO `sys_menu_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '28', '朗通-客户中心-根据用户id查询已开通的功能');
+INSERT INTO `sys_menu_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '29', '朗通-客户中心-根据用户id和产品id，启用和停用功能');
+INSERT INTO `sys_menu_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '30', '朗通-客户中心-根据用户id和产品id，删除开通信息');
+INSERT INTO `sys_menu_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '32', '朗通-客户中心-根据时间导出用户和机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '9', '用户-机构中心-账户信息-获取当前用户信息');
+INSERT INTO `sys_menu_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '10', '用户-机构中心-账户信息-用户认证');
+INSERT INTO `sys_menu_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '11', '用户-机构中心-账户信息-获取当前用户认证状态');
+INSERT INTO `sys_menu_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '33', '用户-机构中心-已经生成令牌-生成令牌');
+INSERT INTO `sys_menu_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '34', '用户-机构中心-已经生成令牌-禁用令牌');
+INSERT INTO `sys_menu_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '35', '用户-机构中心-已经生成令牌-启用令牌');
+INSERT INTO `sys_menu_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '36', '用户-机构中心-已经生成令牌-删除令牌');
+INSERT INTO `sys_menu_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '37', '朗通-控制台-待审核订单个数');
+INSERT INTO `sys_menu_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '38', '朗通-控制台-待认证账号数量');
+INSERT INTO `sys_menu_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '39', '用户-控制台-账号认证进度');
+INSERT INTO `sys_menu_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '40', '用户-控制台-产品认证进度');
+INSERT INTO `sys_menu_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', '用户-控制台-已开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', '用户-控制台-可试用产品');
+INSERT INTO `sys_menu_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '43', '用户-控制台-产品立即试用接口');
+INSERT INTO `sys_menu_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '44', '用户-控制台-可展示的选项卡');
+INSERT INTO `sys_menu_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '用户-控制台-账户信息');
+INSERT INTO `sys_menu_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '46', '朗通-客户中心-查询所有用户已开通的功能');
+INSERT INTO `sys_menu_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '47', '朗通-客户中心-查询用户信息和机构信息开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '48', '朗通-个人中心-重置密码');
+INSERT INTO `sys_menu_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '51', '用户-更多服务-根据用户id获取产品信息');
+INSERT INTO `sys_menu_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '52', '用户-更多服务-开通产品');
+INSERT INTO `sys_menu_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '53', '朗通-产品线管理-添加产品');
+INSERT INTO `sys_menu_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '54', '用户-机构中心-管理服务端-删除服务端');
+INSERT INTO `sys_menu_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '21', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表');
+INSERT INTO `sys_menu_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '64', '朗通-客户中心-分页查询注册用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '65', '朗通-客户中心-分页查询机构信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '66', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口');
+INSERT INTO `sys_menu_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '67', '朗通-客户中心-分页查询认证中的用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '71', '客户中心-导出用户信息');
+INSERT INTO `sys_menu_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '72', '客户中心-导出机构信息');
+INSERT INTO `sys_menu_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '73', '客户中心-导出认证中用户的信息:');
+INSERT INTO `sys_menu_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '74', '客户中心-导出已认证用户的信息');
+INSERT INTO `sys_menu_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '76', '客户中心-超管修改用户信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '77', '客户中心-超管修改机构信息接口');
+INSERT INTO `sys_menu_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '79', '用户-机构中心-已经生成令牌-获取令牌');
+INSERT INTO `sys_menu_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '83', '客户中心-认证用户信息和机构信息不通过接口(新)');
+INSERT INTO `sys_menu_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '84', '客户中心-认证用户信息和机构信息通过接口(新)');
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:07:16
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_organization
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_organization`;
+CREATE TABLE `sys_organization` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '机构名称',
+  `type` int(2) DEFAULT NULL COMMENT '机构类型',
+  `principal` varchar(255) DEFAULT NULL COMMENT '负责人',
+  `address` varchar(255) DEFAULT NULL COMMENT '机构地址',
+  `parent_id` bigint(20) DEFAULT '-1' COMMENT '上级机构id',
+  `sub_num` int(11) DEFAULT '0' COMMENT '下属机构数量',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='机构表';
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:07:29
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_permission`;
+CREATE TABLE `sys_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '资源ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '资源名称',
+  `permissionUrl` varchar(255) NOT NULL DEFAULT '' COMMENT '资源Url',
+  `method` varchar(255) NOT NULL DEFAULT 'ALL' COMMENT '资源允许的请求方式',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '资源描述',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8 COMMENT='系统资源表';
+
+-- ----------------------------
+-- Records of sys_permission
+-- ----------------------------
+INSERT INTO `sys_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户信息列表', '/userInfo/getUserInfoPag', 'ALL', '朗通-客户中心-获取用户信息列表', null);
+INSERT INTO `sys_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-获取当前用户信息', '/userAuthentication/getuserAuthenticationInfo', 'ALL', '用户-机构中心-账户信息-获取当前用户信息', null);
+INSERT INTO `sys_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-用户认证', '/userAuthentication/userAuthentication', 'ALL', '用户-机构中心-账户信息-用户认证', null);
+INSERT INTO `sys_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-账户信息-获取当前用户认证状态', '/userAuthentication/getUserAuthenticationStatus', 'ALL', '用户-机构中心-账户信息-获取当前用户认证状态', null);
+INSERT INTO `sys_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改用户和机构信息', '/userInfo/updateUserInfoAll', 'ALL', '朗通-客户中心-修改用户和机构信息', null);
+INSERT INTO `sys_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户Id删除', '/userInfo/updateDeleted', 'ALL', '朗通-客户中心-根据用户Id删除', null);
+INSERT INTO `sys_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-关联产品与用户服务端', '/productService/genProductService', 'ALL', '用户-机构中心-已开通产品-关联产品与用户服务端', null);
+INSERT INTO `sys_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-删除产品与用户服务端的关联', '/productService/deleteProductService', 'ALL', '用户-机构中心-已开通产品-删除产品与用户服务端的关联', null);
+INSERT INTO `sys_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表', '/productService/getProductServiceByCurrentUser', 'ALL', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表', null);
+INSERT INTO `sys_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模糊查询机构信息', '/userInfo/findOrganization', 'ALL', '朗通-客户中心-模糊查询机构信息', null);
+INSERT INTO `sys_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '添加机构信息', '/userInfo/addOrganization', 'ALL', '朗通-客户中心-添加机构信息', null);
+INSERT INTO `sys_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '添加用户信息和绑定机构', '/userInfo/addUserInfo', 'ALL', '朗通-客户中心-添加用户信息和绑定机构', null);
+INSERT INTO `sys_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表', '/diagLantoneProduct/opendedProductByCurrentUser', 'ALL', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表', null);
+INSERT INTO `sys_permission` VALUES ('22', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '审核用户信息接口', '/userInfo/auditUserInfoAll', 'ALL', '朗通-客户中心-审核用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-新增服务端', '/serviceInfo/createService', 'ALL', '用户-机构中心-管理服务端-新增服务端', null);
+INSERT INTO `sys_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-修改服务端', '/serviceInfo/updateService', 'ALL', '用户-机构中心-管理服务端-修改服务端', null);
+INSERT INTO `sys_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-获取当前登录用户的服务列表', '/serviceInfo/getServiceListByCurrentUser', 'ALL', '用户-机构中心-管理服务端-获取当前登录用户的服务列表', null);
+INSERT INTO `sys_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表', '/serviceInfo/getServiceListPageByCurrentUser', 'ALL', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表', null);
+INSERT INTO `sys_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id查询已开通的功能', '/productOrder/getInformationAvailableByUserId', 'ALL', '朗通-客户中心-根据用户id查询已开通的功能', null);
+INSERT INTO `sys_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，启用和停用功能', '/productOrder/startAndendByuserId', 'ALL', '朗通-客户中心-根据用户id和产品id，启用和停用功能', null);
+INSERT INTO `sys_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，删除开通信息', '/productOrder/delInformationAvailable', 'ALL', '朗通-客户中心-根据用户id和产品id，删除开通信息', null);
+INSERT INTO `sys_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据用户id和产品id，修改开通时间', '/productOrder/modifyOpeningTime', 'ALL', '朗通-客户中心-根据用户id和产品id，修改开通时间', null);
+INSERT INTO `sys_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据时间导出用户和机构信息', '/report/exportUserInfoAll', 'ALL', '朗通-客户中心-根据时间导出用户和机构信息', null);
+INSERT INTO `sys_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-生成令牌', '/serviceToken/createServiceToken', 'ALL', '用户-机构中心-已经生成令牌-生成令牌', null);
+INSERT INTO `sys_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-禁用令牌', '/serviceToken/disableToken', 'ALL', '用户-机构中心-已经生成令牌-禁用令牌', null);
+INSERT INTO `sys_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-启用令牌', '/serviceToken/enableToken', 'ALL', '用户-机构中心-已经生成令牌-启用令牌', null);
+INSERT INTO `sys_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-删除令牌', '/serviceToken/deleteTokenByProductServiceId', 'ALL', '用户-机构中心-已经生成令牌-删除令牌', null);
+INSERT INTO `sys_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-控制台-待审核订单个数', '/productOrder/waitExamOrderCou', 'ALL', '朗通-控制台-待审核订单个数', null);
+INSERT INTO `sys_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-控制台-待认证账号数量', '/userAuthentication/waitAuthen', 'ALL', '朗通-控制台-待认证账号数量', null);
+INSERT INTO `sys_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-账号认证进度', '/userAuthentication/queryAuthProgress', 'ALL', '用户-控制台-账号认证进度', null);
+INSERT INTO `sys_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-产品认证进度', '/productOrder/productAuthProgress', 'ALL', '用户-控制台-产品认证进度', null);
+INSERT INTO `sys_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-已开通产品', '/productOrder/getConsoleOpened', 'ALL', '用户-控制台-已开通产品', null);
+INSERT INTO `sys_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-可试用产品', '/productOrder/getConsoleOnTrial', 'ALL', '用户-控制台-可试用产品', null);
+INSERT INTO `sys_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-产品立即试用接口', '/productOrder/openUpOnTrial', 'ALL', '用户-控制台-产品立即试用接口', null);
+INSERT INTO `sys_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-可展示的选项卡', '/productOrder/enShowOption', 'ALL', '用户-控制台-可展示的选项卡', null);
+INSERT INTO `sys_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-控制台-账户信息', '/user/getConsoleUserInfo', 'ALL', '用户-控制台-账户信息', null);
+INSERT INTO `sys_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询所有用户已开通的功能', '/productOrder/getInformationAvailableAll', 'ALL', '朗通-客户中心-查询所有用户已开通的功能', null);
+INSERT INTO `sys_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询用户信息和机构信息开通产品', '/userInfo/getUserOrganProductAll', 'ALL', '朗通-客户中心-查询用户信息和机构信息开通产品', null);
+INSERT INTO `sys_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-修改密码', '/user/midifyPassword', 'ALL', '朗通-个人中心-修改密码', null);
+INSERT INTO `sys_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-更多服务-显示产品', '/morServices/showProductInfo', 'ALL', '用户-更多服务-显示产品', null);
+INSERT INTO `sys_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-更多服务-开通产品', '/morServices/addOrder', 'ALL', '用户-更多服务-开通产品', null);
+INSERT INTO `sys_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-添加产品', '/diagLantoneProduct/addProducts', 'ALL', '朗通-产品线管理-添加产品', null);
+INSERT INTO `sys_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-管理服务端-删除服务端', '/serviceInfo/delService', 'ALL', '用户-机构中心-管理服务端-删除服务端', null);
+INSERT INTO `sys_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-查询', '/diagLantoneProduct/selectProduct', 'ALL', '朗通-产品线管理-查询', null);
+INSERT INTO `sys_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-修改', '/diagLantoneProduct/updateProduct', 'ALL', '朗通-产品线管理-修改', null);
+INSERT INTO `sys_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-(启用/禁用)', '/diagLantoneProduct/updateServiceStatus', 'ALL', '朗通-产品线管理-(启用/禁用)', null);
+INSERT INTO `sys_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-删除', '/diagLantoneProduct/deleteProduct', 'ALL', '朗通-产品线管理-删除', null);
+INSERT INTO `sys_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品线管理-详情', '/diagLantoneProduct/opendedProduct', 'ALL', '朗通-产品线管理-详情', null);
+INSERT INTO `sys_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-显示所有订单明细', '/diagOrderDetails/getAllOrderDetials', 'ALL', '朗通-产品申请-显示所有订单明细', null);
+INSERT INTO `sys_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-审核', '/diagOrderDetails/auditStatus', 'ALL', '朗通-产品申请-审核', null);
+INSERT INTO `sys_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-产品申请-显示所有订单', '/productOrder/getAllProductOrder', 'ALL', '朗通-产品申请-显示所有订单', null);
+INSERT INTO `sys_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '默认-获取用户、机构、菜单信息', '/user/getUserOrgMenu', 'ALL', '全部用户-获取用户、机构、菜单信息', null);
+INSERT INTO `sys_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询注册用户信息接口', '/userInfo/queryUserInformation', 'ALL', '朗通-客户中心-分页查询注册用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询机构信息接口', '/userInfo/queryMechanismInformation', 'ALL', '朗通-客户中心-分页查询机构信息接口', null);
+INSERT INTO `sys_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口', '/userInfo/queryVerifiedUserOrganizationProduct', 'ALL', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口', null);
+INSERT INTO `sys_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-客户中心-分页查询认证中的用户信息接口', '/userInfo/queryAuthentication', 'ALL', '朗通-客户中心-分页查询认证中的用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '\r\n导出产品申请相关信息', '/reporExcel/exportProductOrderInfo', 'ALL', '导出产品申请相关信息', null);
+INSERT INTO `sys_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-获取个人信息', '/user/getPersonInfo', 'ALL', '朗通-个人中心-获取个人信息', null);
+INSERT INTO `sys_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '朗通-个人中心-修改个人信息', '/user/updatePersonInfo', 'ALL', '朗通-个人中心-修改个人信息', null);
+INSERT INTO `sys_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出用户信息', '/report/exportUserInfo', 'ALL', '客户中心-导出用户信息', null);
+INSERT INTO `sys_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出机构信息', '/report/exportOrganization', 'ALL', '客户中心-导出机构信息', null);
+INSERT INTO `sys_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出认证中用户的信息:', '/report/exportKema', 'ALL', '客户中心-导出认证中用户的信息:', null);
+INSERT INTO `sys_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-导出已认证用户的信息', '/report/exportVerified', 'ALL', '客户中心-导出已认证用户的信息', null);
+INSERT INTO `sys_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户更多服务-产品续费', '/morServices/addRenewalsInfo', 'ALL', '用户更多服务-产品续费', null);
+INSERT INTO `sys_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-超管修改用户信息接口', '/userInfo/updateUserInfo', 'ALL', '客户中心-超管修改用户信息接口', null);
+INSERT INTO `sys_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-超管修改机构信息接口', '/userInfo/updateOrganizations', 'ALL', '客户中心-超管修改机构信息接口', null);
+INSERT INTO `sys_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-显示', '/userRenewals/renewalsInfos', 'ALL', '续费管理-显示', null);
+INSERT INTO `sys_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户-机构中心-已经生成令牌-获取令牌', '/serviceToken/getTokenByProductServiceId', 'ALL', '用户-机构中心-已经生成令牌-获取令牌', null);
+INSERT INTO `sys_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-删除', '/userRenewals/deleteRenewalsInfos', 'ALL', '续费管理-删除', null);
+INSERT INTO `sys_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-续费', '/productOrder/modifyOpeningTime', 'ALL', '续费管理-续费', null);
+INSERT INTO `sys_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '续费管理-取消续费', '/userRenewals/cancelRenewalsInfos', 'ALL', '续费管理-取消续费', null);
+INSERT INTO `sys_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-认证用户信息和机构信息不通过接口(新)', '/userInfo/auditUserInfoAllNopass', 'ALL', '客户中心-认证用户信息和机构信息不通过接口(新)', null);
+INSERT INTO `sys_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '客户中心-认证用户信息和机构信息通过接口(新)', '/userInfo/auditUserInfoAllPass', 'ALL', '客户中心-认证用户信息和机构信息通过接口(新)', null);
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:07:38
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '角色名称',
+  `roleLevel` int(11) NOT NULL DEFAULT '0' COMMENT '角色等级',
+  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述',
+  `menuItems` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单ID：对应角色ID',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='系统角色表';
+
+-- ----------------------------
+-- Records of sys_role
+-- ----------------------------
+INSERT INTO `sys_role` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '普通用户', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '管理员', '0', '', '', '');
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:07:47
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE `sys_role_menu` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '角色id',
+  `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='角色和菜单的映射表';
+
+-- ----------------------------
+-- Records of sys_role_menu
+-- ----------------------------
+INSERT INTO `sys_role_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '1', '用户-控制台');
+INSERT INTO `sys_role_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '2', '用户-更多服务');
+INSERT INTO `sys_role_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '3', '用户-机构中心');
+INSERT INTO `sys_role_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '4', '用户-机构中心-账号信息');
+INSERT INTO `sys_role_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '5', '用户-机构中心-已开通产品');
+INSERT INTO `sys_role_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '6', '用户-机构中心-安全设置');
+INSERT INTO `sys_role_menu` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '用户-机构中心-管理服务端');
+INSERT INTO `sys_role_menu` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '14', '用户-机构中心-已生成令牌');
+INSERT INTO `sys_role_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '10', '朗通-客户中心');
+INSERT INTO `sys_role_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '11', '朗通-客户中心-机构信息');
+INSERT INTO `sys_role_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '12', '朗通-控制台');
+INSERT INTO `sys_role_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '15', '朗通-客户中心-注册用户');
+INSERT INTO `sys_role_menu` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '16', '朗通-客户中心-审核超管信息');
+INSERT INTO `sys_role_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '17', '朗通-订单系统');
+INSERT INTO `sys_role_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '18', '朗通-订单系统-产品线申请列表');
+INSERT INTO `sys_role_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '19', '朗通-产品线管理');
+INSERT INTO `sys_role_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '20', '朗通-个人中心');
+INSERT INTO `sys_role_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '21', '朗通-客户中心-已认证超管信息');
+INSERT INTO `sys_role_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '22', '朗通-订单系统-产品续费列表');
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:07:59
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_permission`;
+CREATE TABLE `sys_role_permission` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '角色id',
+  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '资源id',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=103 DEFAULT CHARSET=utf8 COMMENT='角色和资源的映射表';
+
+-- ----------------------------
+-- Records of sys_role_permission
+-- ----------------------------
+INSERT INTO `sys_role_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '15', '用户-机构中心-已开通产品-关联产品与用户服务端');
+INSERT INTO `sys_role_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '16', '用户-机构中心-已开通产品-删除产品与用户服务端的关联');
+INSERT INTO `sys_role_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '17', '用户-机构中心-已开通产品-获取当前登录用户产品服务分页列表');
+INSERT INTO `sys_role_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '24', '用户-机构中心-管理服务端-新增服务端');
+INSERT INTO `sys_role_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '25', '用户-机构中心-管理服务端-修改服务端');
+INSERT INTO `sys_role_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '26', '用户-机构中心-管理服务端-获取当前登录用户的服务列表');
+INSERT INTO `sys_role_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '27', '用户-机构中心-管理服务端-获取当前登录用户的服务分页列表');
+INSERT INTO `sys_role_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '用户-机构中心-账户信息-获取当前用户信息');
+INSERT INTO `sys_role_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '10', '用户-机构中心-账户信息-用户认证');
+INSERT INTO `sys_role_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '11', '用户-机构中心-账户信息-获取当前用户认证状态');
+INSERT INTO `sys_role_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '33', '用户-机构中心-已经生成令牌-生成令牌');
+INSERT INTO `sys_role_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '34', '用户-机构中心-已经生成令牌-禁用令牌');
+INSERT INTO `sys_role_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '35', '用户-机构中心-已经生成令牌-启用令牌');
+INSERT INTO `sys_role_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '36', '用户-机构中心-已经生成令牌-删除令牌');
+INSERT INTO `sys_role_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '39', '用户-控制台-账号认证进度');
+INSERT INTO `sys_role_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '40', '用户-控制台-产品认证进度');
+INSERT INTO `sys_role_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', '用户-控制台-已开通产品');
+INSERT INTO `sys_role_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', '用户-控制台-可试用产品');
+INSERT INTO `sys_role_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '43', '用户-控制台-产品立即试用接口');
+INSERT INTO `sys_role_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '44', '用户-控制台-可展示的选项卡');
+INSERT INTO `sys_role_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '用户-控制台-账户信息');
+INSERT INTO `sys_role_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '51', '用户-更多服务-显示产品');
+INSERT INTO `sys_role_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '52', '用户-更多服务-开通产品');
+INSERT INTO `sys_role_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '8', '朗通-客户中心-获取用户信息列表');
+INSERT INTO `sys_role_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '12', '朗通-客户中心-修改用户和机构信息');
+INSERT INTO `sys_role_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '14', '朗通-客户中心-根据用户Id删除');
+INSERT INTO `sys_role_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '18', '朗通-客户中心-模糊查询机构信息');
+INSERT INTO `sys_role_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '19', '朗通-客户中心-添加机构信息');
+INSERT INTO `sys_role_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '20', '朗通-客户中心-添加用户信息和绑定机构');
+INSERT INTO `sys_role_permission` VALUES ('55', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '22', '朗通-客户中心-审核用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '31', '朗通-客户中心-根据用户id和产品id，修改开通时间');
+INSERT INTO `sys_role_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '28', '朗通-客户中心-根据用户id查询已开通的功能');
+INSERT INTO `sys_role_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '29', '朗通-客户中心-根据用户id和产品id，启用和停用功能');
+INSERT INTO `sys_role_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '30', '朗通-客户中心-根据用户id和产品id，删除开通信息');
+INSERT INTO `sys_role_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '32', '朗通-客户中心-根据时间导出用户和机构信息');
+INSERT INTO `sys_role_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '37', '朗通-控制台-待审核订单个数');
+INSERT INTO `sys_role_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '38', '朗通-控制台-待认证账号数量');
+INSERT INTO `sys_role_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '46', '朗通-客户中心-查询所有用户已开通的功能');
+INSERT INTO `sys_role_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '47', '朗通-客户中心-查询用户信息和机构信息开通产品');
+INSERT INTO `sys_role_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '48', '朗通-个人中心-修改密码');
+INSERT INTO `sys_role_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '53', '朗通-产品线管理-添加产品');
+INSERT INTO `sys_role_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '21', '用户-机构中心-已开通产品-查询当前登录用户已开通产品列表');
+INSERT INTO `sys_role_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '54', '用户-机构中心-管理服务端-删除服务端');
+INSERT INTO `sys_role_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '55', '朗通-产品线管理-查询');
+INSERT INTO `sys_role_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '56', '朗通-产品线管理-修改');
+INSERT INTO `sys_role_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '57', '朗通-产品线管理-(启用/禁用)');
+INSERT INTO `sys_role_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '58', '朗通-产品线管理-删除');
+INSERT INTO `sys_role_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '59', '朗通-产品线管理-详情');
+INSERT INTO `sys_role_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '60', '朗通-产品申请-显示所有订单明细');
+INSERT INTO `sys_role_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '61', '朗通-产品申请-审核');
+INSERT INTO `sys_role_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '62', '朗通-产品申请-显示所有订单');
+INSERT INTO `sys_role_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '63', '朗通-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '63', '用户-默认-获取用户、机构、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '64', '朗通-客户中心-分页查询注册用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '65', '朗通-客户中心-分页查询机构信息接口');
+INSERT INTO `sys_role_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '66', '朗通-客户中心-分页查询已认证用户信息和机构信息及开通产品接口');
+INSERT INTO `sys_role_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '67', '朗通-客户中心-分页查询认证中的用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '68', '导出产品申请相关信息');
+INSERT INTO `sys_role_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '69', '朗通-个人中心-获取个人信息');
+INSERT INTO `sys_role_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '70', '朗通-个人中心-修改个人信息');
+INSERT INTO `sys_role_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '71', '客户中心-导出用户信息');
+INSERT INTO `sys_role_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '72', '客户中心-导出机构信息');
+INSERT INTO `sys_role_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '73', '客户中心-导出认证中用户的信息:');
+INSERT INTO `sys_role_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '74', '客户中心-导出已认证用户的信息');
+INSERT INTO `sys_role_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '75', '用户更多服务-产品续费');
+INSERT INTO `sys_role_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '76', '客户中心-超管修改用户信息接口');
+INSERT INTO `sys_role_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '77', '客户中心-超管修改机构信息接口');
+INSERT INTO `sys_role_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '78', '续费管理-显示');
+INSERT INTO `sys_role_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '79', '用户-机构中心-已经生成令牌-获取令牌');
+INSERT INTO `sys_role_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '80', '续费管理-显示');
+INSERT INTO `sys_role_permission` VALUES ('99', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '81', '续费管理-续费');
+INSERT INTO `sys_role_permission` VALUES ('100', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '82', '续费管理-取消续费');
+INSERT INTO `sys_role_permission` VALUES ('101', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '83', '客户中心-认证用户信息和机构信息不通过接口(新)');
+INSERT INTO `sys_role_permission` VALUES ('102', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '84', '客户中心-认证用户信息和机构信息通过接口(新)');
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:08:37
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_user
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '' COMMENT '修改人,如果为0则表示纪录未修改',
+  `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
+  `password` varchar(255) NOT NULL DEFAULT '' COMMENT '用户密码',
+  `linkman` varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
+  `phone` varchar(255) NOT NULL DEFAULT '' COMMENT '手机号(如果是客户，phone与username是一样的)',
+  `position` varchar(255) NOT NULL DEFAULT '' COMMENT '所属岗位',
+  `dept` varchar(255) NOT NULL DEFAULT '' COMMENT '所属部门',
+  `email` varchar(255) NOT NULL DEFAULT '' COMMENT '邮箱',
+  `auth_status` int(11) NOT NULL DEFAULT '0' COMMENT '认证状态: 0 未认证，1 已认证，2 认证中',
+  `passauth_time` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' ON UPDATE CURRENT_TIMESTAMP COMMENT '认证通过时间',
+  `type` int(11) NOT NULL DEFAULT '0' COMMENT '1内部用户，0外部用户（默认0）',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`),
+  KEY `uk_username` (`username`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统用户表';
+
+
+INSERT INTO `sys_user` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `username`, `password`, `linkman`, `phone`, `position`, `dept`, `email`, `auth_status`, `passauth_time`, `type`, `remark`) VALUES ('1', 'N', '2018-09-14 11:18:02', '2018-10-23 20:35:19', '0', '0', 'admin', '{bcrypt}$2a$10$N3pjZskJepJGgtyPEUASeuydFPBNd75UhH.DdV1BYYk1wUOPQi4/2', '王先生a', '13858681377', '系统管理员', '研发部', 'zhoutg@163.com', '0', '1970-01-01 12:00:00', '1', '');
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:08:54
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_user_authentication
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_authentication`;
+CREATE TABLE `sys_user_authentication` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) DEFAULT 'N' COMMENT '是否删除 N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间',
+  `creator` varchar(20) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id` bigint(20) DEFAULT '0' COMMENT '用户id',
+  `order_num` varchar(100) DEFAULT NULL COMMENT '申请单号',
+  `is_reject` int(11) DEFAULT NULL COMMENT '是否通过认证 0:未通过，1:已通过 ,默认为null',
+  `reject_type` int(2) DEFAULT NULL COMMENT '未通过类型',
+  `reject_comment` varchar(512) DEFAULT NULL COMMENT '认证被拒理由',
+  `status` int(11) DEFAULT '0' COMMENT '处理状态（0：待处理，1：已处理）',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `certification_date` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '处理审核时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户认证信息表';
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:09:08
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_user_organization
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_organization`;
+CREATE TABLE `sys_user_organization` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '用户主键',
+  `organization_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '机构主键',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户-机构表映射表';
+
+
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 192.168.2.236
+Source Server Version : 50723
+Source Host           : 192.168.2.236:3306
+Source Database       : sys-user
+
+Target Server Type    : MYSQL
+Target Server Version : 50723
+File Encoding         : 65001
+
+Date: 2018-10-24 10:09:14
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for sys_user_role
+-- ----------------------------
+
+
+DROP TABLE IF EXISTS `sys_user_role`;
+CREATE TABLE `sys_user_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户和角色关联ID',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统用户表.用户ID',
+  `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统角色表.角色ID',
+  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统用户角色关联表';
+
+-- ----------------------------
+-- Records of sys_user_role
+-- ----------------------------
+INSERT INTO `sys_user_role` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '2', '');
+

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

@@ -27,7 +27,7 @@ public class AuthenticationDTO {
 	    @TableId(value = "id", type = IdType.AUTO)
 	    private Long userId;//用户ID
 	    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	    private Date userGmtCreate;//记录创建时间
+	    private Date autGmtCreate;//记录创建时间
 	    private Date certificationDate;//认证时间
 	    private String userName;// 用户名
 	    private String linkman;//联系人
@@ -54,7 +54,7 @@ public class AuthenticationDTO {
 	        return OrganizationTypeEnum.getName(this.orgType);
 	    }
 
-	    public  String getSuthStatusStr(){
+	    public  String getAuthStatusStr(){
 	        return AuthStatusEnum.getName(this.authStatus);
 	    }
 	    

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

@@ -20,6 +20,7 @@ public class CustomerDTO implements Serializable{
 	 private String userName;// 用户名
 	 private String orgName;//机构名称
 	 private Integer authStatus;//认证状态
+	 private Integer status;//处理状态（0：待处理，1：已处理）
 	 private String startTime;//开始时间
 	 private String endTime;//结束时间
 

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

@@ -14,7 +14,7 @@ import lombok.Setter;
 public class ExportKemaDTO {
 	  private static final long serialVersionUID = 1L;
 	    private String userId;//用户ID
-	    private String userGmtCreate;//记录创建时间
+	    private String autGmtCreate;//记录创建时间
 	    private String orderNum;
 	    private String linkman;//联系人
 	    private String orgName;//机构名称
@@ -23,10 +23,10 @@ public class ExportKemaDTO {
 	    private String email;// 邮箱
 	    private String authStatus;//认证状态
 	   
-	    public ExportKemaDTO(String userId, String userGmtCreate,String orderNum,String linkman, String orgName, String position,String userName,  String email, 
+	    public ExportKemaDTO(String userId, String autGmtCreate,String orderNum,String linkman, String orgName, String position,String userName,  String email, 
 	                             String authStatus) {
 	        this.userId = userId;
-	        this.userGmtCreate = userGmtCreate;
+	        this.autGmtCreate = autGmtCreate;
 	        this.orderNum = orderNum;
 	        this.linkman = linkman;
 	        this.orgName = orgName;

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

@@ -20,17 +20,17 @@ public class ExportOrganizationDTO {
 	private String orgPrincipal;// 负责人
 	private String orgType;// 机构属性
 	private String orgAddress;// 机构地址
-	private String userName;// 用户名
+	private String linkman;// 用户名
 
 	public ExportOrganizationDTO(String orgId, String orgGmtCreate,String orgName,String orgPrincipal,
-			String orgType,String orgAddress, String userName) {
+			String orgType,String orgAddress, String linkman) {
 	        this.orgId = orgId;
 	        this.orgGmtCreate = orgGmtCreate;
 	        this.orgName = orgName;
 	        this.orgPrincipal = orgPrincipal;
 	        this.orgType = orgType;
 	        this.orgAddress = orgAddress;
-	        this.userName = userName;
+	        this.linkman = linkman;
 	}
 
 	public ExportOrganizationDTO() {

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

@@ -15,17 +15,17 @@ public class ExportVerifiedDTO {
 	  private static final long serialVersionUID = 1L;
 	    private String userId;//用户ID
 	    private String userGmtCreate;//记录创建时间
-	    private String userGmtModified;
+	    private String passauthTime;
 	    private String linkman;//联系人
 	    private String orgName;//机构名称
 	    private String position;//岗位信息
 	    private String userName;// 用户名
 	    private String email;// 邮箱
 	    private String authStatus;//认证状态
-	    public ExportVerifiedDTO(String userId, String userGmtCreate,String userGmtModified,String linkman,String orgName,String position, String userName,  String email,String authStatus) {
+	    public ExportVerifiedDTO(String userId, String userGmtCreate,String passauthTime,String linkman,String orgName,String position, String userName,  String email,String authStatus) {
 	        this.userId = userId;
 	        this.userGmtCreate = userGmtCreate;
-	        this.userGmtModified = userGmtModified;
+	        this.passauthTime = passauthTime;
 	        this.linkman = linkman;
 	        this.orgName = orgName;
 	        this.position = position;

user-service/src/main/java/com/diagbot/entity/wrapper/UserWrapper.java

@@ -1,18 +0,0 @@
-package com.diagbot.entity.wrapper;
-
-import com.diagbot.entity.User;
-
-/**
- * Created by dell on 2018/8/8.
- */
-public class UserWrapper extends User {
-    private String status;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

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

@@ -131,7 +131,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
      *
      * @return
      */
-    public UserAuthenticationDTO getuserAuthenticationInfo() {
+    public UserAuthenticationDTO getUserAuthenticationInfo() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         User user = userFacade.getById(userId);
         //密码置空
@@ -195,14 +195,14 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         queryAuthProgressDTO.setUserStatus(user.getAuthStatus());
         queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(user.getAuthStatus()));
-        if(userAuthentication!=null){
-        	queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
-        	if(userAuthentication.getRejectType()!=null){
-        		queryAuthProgressDTO.setRejectType(AccdenEnum.getName(userAuthentication.getRejectType()));
-        	}
-        	queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
+        if (userAuthentication != null) {
+            queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+            if (userAuthentication.getRejectType() != null) {
+                queryAuthProgressDTO.setRejectType(AccdenEnum.getName(userAuthentication.getRejectType()));
+            }
+            queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
         }
-        
+
 
         return queryAuthProgressDTO;
     }
@@ -226,9 +226,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
                 eq("is_deleted", IsDeleteEnum.N.getKey()).
                 orderByDesc("gmt_create");
         UserAuthentication userAuthentication = this.getOne(qw);
-        if (userAuthentication == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "当前用户没有认证信息");
-        } else {
+        if (userAuthentication != null) {
             map.put("userAuthentication", userAuthentication);
         }
         return map;
@@ -241,7 +239,11 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
      */
     public WaitAuthenDTO waitAuthen() {
         WaitAuthenDTO waitAuthenDTO = new WaitAuthenDTO();
-        waitAuthenDTO.setCount(baseMapper.getAllWaitAuthCou());
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                eq("auth_status", AuthStatusEnum.Authorizing.getKey());
+        Integer count = userFacade.list(qw).size();
+        waitAuthenDTO.setCount(count);
         return waitAuthenDTO;
     }
 }

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

@@ -30,6 +30,7 @@ import com.diagbot.entity.UserAuthentication;
 import com.diagbot.entity.UserOrganization;
 import com.diagbot.entity.UserRole;
 import com.diagbot.entity.wrapper.MenuWrapper;
+import com.diagbot.enums.AuthHandleEnum;
 import com.diagbot.enums.AuthStatusEnum;
 import com.diagbot.enums.ConstantEnum;
 import com.diagbot.enums.IsDeleteEnum;
@@ -795,10 +796,15 @@ public class UserFacade extends UserServiceImpl {
         auditMap.put("modifier", UserUtils.getCurrentPrincipleID());
         auditMap.put("gmtModified", DateUtil.now());
         auditMap.put("certificationDate", DateUtil.now());
-        auditMap.put("isReject", userInfoAuditVO.getIsReject());
+        if(ByType == 1){
+           auditMap.put("isReject", RejectEnum.PASS.getKey());
+        }
+        if(ByType == 2){
+            auditMap.put("isReject", RejectEnum.NO_PASS.getKey());
+         }
         auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
         auditMap.put("rejectType", userInfoAuditVO.getRejectType());
-        auditMap.put("status",1);
+        auditMap.put("status",AuthHandleEnum.Handled.getKey());//已处理
         if(ByType == 1){
         	auditMap.put("authStatus", 1);
         }
@@ -806,8 +812,11 @@ public class UserFacade extends UserServiceImpl {
         	auditMap.put("authStatus", 0);
         }
         // TODO 审核前先验证该用户的的认证状态
-        auditUserInfoAll(auditMap);
-        return RespDTO.onSuc(true);
+        boolean res = auditUserInfoAll(auditMap);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     /**
@@ -921,8 +930,11 @@ public class UserFacade extends UserServiceImpl {
         map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
-        updateDeleted(map);
-        return RespDTO.onSuc(true);
+        boolean res = updateDeleted(map);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     /**
@@ -931,7 +943,7 @@ public class UserFacade extends UserServiceImpl {
      * @param authStatus
      * @return 分页查询用户信息和机构信息开通产品
      */
-    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer authStatus) {
+/*    public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAlls(Page page, String orgName, Integer authStatus) {
 
         UserInfoDTO userInfo = new UserInfoDTO();
         userInfo.setOrgName(orgName);
@@ -965,7 +977,7 @@ public class UserFacade extends UserServiceImpl {
         System.out.println("====================" + GsonUtil.toJson(userData));
         user.setRecords(userData);
         return RespDTO.onSuc(user);
-    }
+    }*/
     /**
      * 1.分页查询注册用户信息接口 queryUserInformation
      * @param page
@@ -1085,6 +1097,8 @@ public class UserFacade extends UserServiceImpl {
         if(endTime != null && endTime.length() != 0){
         	userInfo.setEndTime(endTime);
         }
+        userInfo.setAuthStatus(2);//认证中。。。
+        userInfo.setStatus(0);//待处理
 		return RespDTO.onSuc(queryAuthentication(page, userInfo));
 	}
 
@@ -1172,7 +1186,7 @@ public class UserFacade extends UserServiceImpl {
         listId.add("orgPrincipal");//负责人
         listId.add("orgType");//机构属性
         listId.add("orgAddress");//机构地址
-        listId.add("userName");// 用户名
+        listId.add("linkman");// 用户名
 
         List<ExportOrganizationDTO> list = new ArrayList<>();
         for (int i = 0; i < datas.size(); i++) {
@@ -1184,7 +1198,7 @@ public class UserFacade extends UserServiceImpl {
                     userInfo.getOrgPrincipal(),
                     OrganizationTypeEnum.getName(userInfo.getOrgType()),
                     userInfo.getOrgAddress(),
-                    userInfo.getUserName()));
+                    userInfo.getLinkman()));
         }
         response.setContentType("text/html;charset=UTF-8");
         ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
@@ -1197,7 +1211,8 @@ public class UserFacade extends UserServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", userExportVO.getStartTime());
         userMap.put("endTime", userExportVO.getEndTime());
-        userMap.put("authStatus", userExportVO.getAuthStatus());
+        userMap.put("authStatus", 2);//认证状态: 0 未认证，1 已认证，2 认证中
+        userMap.put("status", 0);//处理状态（0：待处理，1：已处理）
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
         List<AuthenticationDTO> datas = exportKema(userMap);
@@ -1216,7 +1231,7 @@ public class UserFacade extends UserServiceImpl {
 
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID
-        listId.add("userGmtCreate");//记录创建时间
+        listId.add("autGmtCreate");//记录创建时间
         listId.add("orderNum");
         listId.add("linkman");//联系人
         listId.add("orgName");//机构名称
@@ -1229,7 +1244,7 @@ public class UserFacade extends UserServiceImpl {
         for (int i = 0; i < datas.size(); i++) {
         	AuthenticationDTO userInfo = datas.get(i);
             list.add(new ExportKemaDTO(String.valueOf(userInfo.getUserId()),
-                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    DateUtil.formatDate(userInfo.getAutGmtCreate()),
                     userInfo.getOrderNum(),
                     userInfo.getLinkman(),
                     userInfo.getOrgName(),
@@ -1249,7 +1264,7 @@ public class UserFacade extends UserServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", userExportVO.getStartTime());
         userMap.put("endTime", userExportVO.getEndTime());
-        userMap.put("authStatus", userExportVO.getAuthStatus());
+        userMap.put("authStatus", 1);
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
         List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
@@ -1269,7 +1284,7 @@ public class UserFacade extends UserServiceImpl {
         List<String> listId = new ArrayList<>();
         listId.add("userId");//用户ID
         listId.add("userGmtCreate");//记录创建时间
-        listId.add("userGmtModified");
+        listId.add("passauthTime");
         listId.add("linkman");//联系人
         listId.add("orgName");//机构名称
         listId.add("position");//岗位信息
@@ -1305,8 +1320,11 @@ public class UserFacade extends UserServiceImpl {
         amendUserInfo.put("userId", amendUserInfoVO.getUserId());
         amendUserInfo.put("position", amendUserInfoVO.getPosition());
         amendUserInfo.put("linkman", amendUserInfoVO.getLinkman());
-        updateUserInfo(amendUserInfo);
-        return RespDTO.onSuc(true);
+        boolean res = updateUserInfo(amendUserInfo);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
     //超管修改机构信息
@@ -1318,8 +1336,11 @@ public class UserFacade extends UserServiceImpl {
         amendOrg.put("type", amendOrgVO.getOrgType());
         amendOrg.put("orgId", amendOrgVO.getOrgId());
         amendOrg.put("orgSubNum", amendOrgVO.getOrgSubNum());
-        updateOrganizations(amendOrg);
-        return RespDTO.onSuc(true);
+        boolean res = updateOrganizations(amendOrg);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
 

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

@@ -12,6 +12,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-09-17
  */
 public interface UserAuthenticationMapper extends BaseMapper<UserAuthentication> {
-
-    int getAllWaitAuthCou();
 }

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

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class UserInfoAuditVO {
 
-    private Integer isReject;//是否通过认证 0:未通过，1:已通过
+    //private Integer isReject;//是否通过认证 0:未通过，1:已通过
     private Integer rejectType;//未通过类型
     private String rejectComment;//认证被拒理由
     //private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）

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

@@ -41,7 +41,7 @@ public class ReportFormController {
          userFacade.export(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出用户信息:[by:wangfeng]", notes = "根据时间 导出用户信息")
+    @ApiOperation(value = "导出用户信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息")
     @PostMapping("/exportUserInfo")
     @SysLoggerExport("exportUserInfo")
     @ResponseBody
@@ -50,7 +50,7 @@ public class ReportFormController {
          userFacade.exportUserInfo(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出机构信息:[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
+    @ApiOperation(value = "导出机构信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
     @PostMapping("/exportOrganization")
     @SysLoggerExport("exportOrganization")
     @ResponseBody
@@ -59,7 +59,7 @@ public class ReportFormController {
          userFacade.exportOrganization(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出认证中用户的信息:[by:wangfeng]", notes = "导出认证中用户的信息")
+    @ApiOperation(value = "导出认证中用户的信息(新):[by:wangfeng]", notes = "导出认证中用户的信息")
     @PostMapping("/exportKema")
     @SysLoggerExport("exportKema")
     @ResponseBody
@@ -68,7 +68,7 @@ public class ReportFormController {
          userFacade.exportKema(userExportVO, response);
         
     }
-    @ApiOperation(value = "导出已认证用户的信息:[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
+    @ApiOperation(value = "导出已认证用户的信息(新):[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
     @PostMapping("/exportVerified")
     @SysLoggerExport("exportVerified")
     @ResponseBody

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

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * <p>
@@ -64,7 +63,7 @@ public class UserAuthenticationController {
     @PostMapping("/getuserAuthenticationInfo")
     @SysLogger("getuserAuthenticationInfo")
     public RespDTO<UserAuthenticationDTO> getuserAuthenticationInfo() {
-        UserAuthenticationDTO userAuthenticationDTO = userAuthenticationFacade.getuserAuthenticationInfo();
+        UserAuthenticationDTO userAuthenticationDTO = userAuthenticationFacade.getUserAuthenticationInfo();
         return RespDTO.onSuc(userAuthenticationDTO);
     }
 

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

@@ -66,7 +66,7 @@ public class UserInfoController {
     @Autowired
     UserAuthenticationFacade userAuthenticationFacade;
 
-    @ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
+    /*@ApiOperation(value = "分页查询获取用户信息[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/getUserInfoPag")
     @SysLogger("getUserInfoPag")
     @ApiIgnore
@@ -76,9 +76,9 @@ public class UserInfoController {
         //userInfo.setAutStatus(userInfoPagVO.getAutStatus());
         IPage<UserInfoDTO> user = userFacade.selectUserInfoListPage(userInfoPagVO, userInfo);
         return RespDTO.onSuc(user);
-    }
+    }*/
 
-    @ApiOperation(value = "修改用户信息和机构信息[by:wangfeng]", notes = "用户信息和机构信息")
+    /*@ApiOperation(value = "修改用户信息和机构信息[by:wangfeng]", notes = "用户信息和机构信息")
     @PostMapping("/updateUserInfoAll")
     @SysLogger("updateUserInfoAll")
     @Transactional
@@ -86,7 +86,7 @@ public class UserInfoController {
     public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
             @Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
         return userFacade.updateUserInfoAlls(userInfoOrganizationsVO);
-    }
+    }*/
 
     @ApiOperation(value = "认证用户信息和机构信息通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息通过")
     @PostMapping("/auditUserInfoAllPass")
@@ -105,7 +105,7 @@ public class UserInfoController {
     	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
     }
 
-    @ApiOperation(value = "删除用户信息和机构信息(新)[by:wangfeng]", notes = "用户信息和机构信息")
+    @ApiOperation(value = "删除用户信息和机构信息接口(新)[by:wangfeng]", notes = "用户信息和机构信息")
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
@@ -142,7 +142,7 @@ public class UserInfoController {
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
 
-    @ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
+    /*@ApiOperation(value = "用户信息和机构信息已开通产品[by:wangfeng]", notes = "用户信息和机构信息已开通产品")
     @PostMapping("/getUserOrganProductAll")
     @SysLogger("getUserOrganProductAll")
     @Transactional
@@ -150,7 +150,7 @@ public class UserInfoController {
     public RespDTO<IPage<UserInfoDTO>> getUserOrganProductAll(@RequestBody UserOrganProductPageVO pageVO) {
 
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
-    }
+    }*/
     
     @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
@@ -195,7 +195,7 @@ public class UserInfoController {
     	
     }
     
-    @ApiOperation(value = "机构信息修改接口[by:wangfeng]", notes = "机构id必传")
+    @ApiOperation(value = "机构信息修改接口(新)[by:wangfeng]", notes = "机构id必传")
     @PostMapping("/updateOrganizations")
     @SysLogger("updateOrganizations")
     @Transactional

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

@@ -20,12 +20,4 @@
         <result column="status" property="status"/>
         <result column="remark" property="remark"/>
     </resultMap>
-
-    <select id="getAllWaitAuthCou" resultType="int">
-    	select
-    		count(1)
-    	from sys_user_authentication
-    	where is_deleted = 'N' and status=2
-    </select>
-
 </mapper>

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

@@ -246,14 +246,14 @@
             <if test="auditMap.certificationDate != null">a.certification_date = #{auditMap.certificationDate},</if>
             <if test="auditMap.rejectType != null">a.reject_type =#{auditMap.rejectType},</if>
             <if test="auditMap.rejectComment != null">a.reject_comment= #{auditMap.rejectComment},</if>
-            <if test="auditMap.status != null">a.STATUS= #{auditMap.status}</if>
-            <if test="auditMap.authStatus != null">u.auth_status = #{auditMap.authStatus}</if>
-            <if test="auditMap.passauthTime != null">u.passauth_time = #{auditMap.passauthTime},</if>
+            <if test="auditMap.status != null">a.STATUS= #{auditMap.status},</if>
+            <if test="auditMap.authStatus != null">u.auth_status = #{auditMap.authStatus},</if>
+            <if test="auditMap.certificationDate != null">u.passauth_time = #{auditMap.certificationDate},</if>
             <if test="auditMap.gmtModified !=null">u.gmt_modified=#{auditMap.gmtModified},</if>
-            <if test="auditMap.modifier != null">u.modifier=#{auditMap.modifier},</if>
+            <if test="auditMap.modifier != null">u.modifier=#{auditMap.modifier}</if>
         </trim>
         WHERE
-        is_deleted = "N"
+        a.is_deleted = "N"
         AND a.user_id = #{auditMap.userId}
         AND a.order_num = #{auditMap.orderNum}
         AND u.id = #{auditMap.userId}
@@ -440,8 +440,13 @@
 	JOIN sys_user u ON u.id = aut.user_id
 	JOIN sys_user_organization uorg ON u.id = uorg.user_id
 	JOIN sys_organization org ON uorg.organization_id = org.id
-	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
-	aut.status = 0
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 
+	<if test="authen.status != null">
+	    AND aut.status = #{authen.status}
+	</if>     
+	<if test="authen.authStatus != null">
+	    AND u.auth_status= #{authen.authStatus}
+	</if>
 	<if test="authen.orgName != null">
 		AND org.name LIKE CONCAT('%', #{authen.orgName}, '%')
 	</if>
@@ -570,8 +575,13 @@
 	JOIN sys_user u ON u.id = aut.user_id
 	JOIN sys_user_organization uorg ON u.id = uorg.user_id
 	JOIN sys_organization org ON uorg.organization_id = org.id
-	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 AND
-	aut.status = 0
+	WHERE u.is_deleted = 'N' AND aut.is_deleted = 'N' AND u.TYPE = 0 
+	<if test="exportKema.status != null">
+	    AND aut.status = #{exportKema.status}
+	</if>     
+	<if test="exportKema.authStatus != null">
+	    AND u.auth_status= #{exportKema.authStatus}
+	</if>
 	<if test="exportKema.orgName != null">
 		AND org.name LIKE CONCAT('%', #{exportKema.orgName}, '%')
 	</if>
@@ -584,4 +594,4 @@
 
 	ORDER BY aut.gmt_create DESC
 	</select>
-</mapper>
+</mapper>