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

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

@@ -1,6 +1,9 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
+import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,12 +11,14 @@ import lombok.Setter;
 /**
  * @Description:
  * @author: zhaops
- * @time: 2018/9/18 19:58
+ * @time: 2018/9/19 15:11
  */
 @Getter
 @Setter
 public class ProductServiceDTO {
     private ProductService productService;
+    private LantoneProduct lantoneProduct;
+    private OpenedProducts openedProducts;
+    private ServiceInfo serviceInfo;
     private ServiceToken serviceToken;
-    private String msg;
 }

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

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.ProductService;
+import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.ServiceToken;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: zhaops
+ * @time: 2018/9/18 19:58
+ */
+@Getter
+@Setter
+public class ProductServiceRespDTO {
+    private ProductService productService;
+    private ServiceToken serviceToken;
+    private LantoneProduct lantoneProduct;
+    private ServiceInfo serviceInfo;
+    private String msg;
+}

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

@@ -1,240 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 朗通产品表
- * </p>
- *
- * @author wangyu
- * @since 2018-09-18
- */
-@TableName("diag_lantone_product")
-public class DiagLantoneProduct implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 产品id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 是否删除 N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 产品名称
-     */
-    private String name;
-
-    /**
-     * 产品介绍
-     */
-    private String decription;
-
-    /**
-     * 计费方式
-     */
-    private String chargeType;
-
-    /**
-     * 产品路径
-     */
-    private String url;
-
-    /**
-     * 机构开通数量
-     */
-    private Integer openNum;
-
-    /**
-     * 停用状态
-     */
-    private Integer serviceStatus;
-
-    /**
-     * 试用状态
-     */
-    private Integer trialStatus;
-
-    /**
-     * 试用地址
-     */
-    private String trialUrl;
-
-    /**
-     * 接入方式（1：嵌入式，2：接口方式，3：online）
-     */
-    private String accessType;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDecription() {
-        return decription;
-    }
-
-    public void setDecription(String decription) {
-        this.decription = decription;
-    }
-
-    public String getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(String chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public Integer getOpenNum() {
-        return openNum;
-    }
-
-    public void setOpenNum(Integer openNum) {
-        this.openNum = openNum;
-    }
-
-    public Integer getServiceStatus() {
-        return serviceStatus;
-    }
-
-    public void setServiceStatus(Integer serviceStatus) {
-        this.serviceStatus = serviceStatus;
-    }
-
-    public Integer getTrialStatus() {
-        return trialStatus;
-    }
-
-    public void setTrialStatus(Integer trialStatus) {
-        this.trialStatus = trialStatus;
-    }
-
-    public String getTrialUrl() {
-        return trialUrl;
-    }
-
-    public void setTrialUrl(String trialUrl) {
-        this.trialUrl = trialUrl;
-    }
-
-    public String getAccessType() {
-        return accessType;
-    }
-
-    public void setAccessType(String accessType) {
-        this.accessType = accessType;
-    }
-
-    @Override
-    public String toString() {
-        return "LantoneProduct{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", name=" + name +
-                ", decription=" + decription +
-                ", chargeType=" + chargeType +
-                ", url=" + url +
-                ", openNum=" + openNum +
-                ", serviceStatus=" + serviceStatus +
-                ", trialStatus=" + trialStatus +
-                ", trialUrl=" + trialUrl +
-                ", accessType=" + accessType +
-                "}";
-    }
-}

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

@@ -2,23 +2,22 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @Description: 已开通产品实体类
+ * @Description: 订单明细实体类
  * @Author: wangyu
- * @Date: 15:39 2018/9/17
+ * @Date: 15:40 2018/9/17
  */
-@TableName("diag_opened_products")
-public class DiagOpenedProducts implements Serializable {
+public class DiagOrderDetails implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 已开通产品id
+     * 订单明细id
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -48,6 +47,11 @@ public class DiagOpenedProducts implements Serializable {
      */
     private String modifier;
 
+    /**
+     * 订单编号
+     */
+    private String orderNum;
+
     /**
      * 产品id
      */
@@ -59,24 +63,19 @@ public class DiagOpenedProducts implements Serializable {
     private Integer userId;
 
     /**
-     * 开通日期
+     * 是否通过审核,N:未通过，Y:已通过
      */
-    private Date startTime;
+    private String auditStatus;
 
     /**
-     * 结束日期
+     * 单个服务的价钱
      */
-    private Date endTime;
+    private BigDecimal unitPrice;
 
     /**
-     * 停用状态
+     * 订单状态 Y：已付款，N未付款
      */
-    private Integer serviceStatus;
-
-    /**
-     * 订单id
-     */
-    private Integer orderId;
+    private String status;
 
 
     public Long getId() {
@@ -127,6 +126,14 @@ public class DiagOpenedProducts implements Serializable {
         this.modifier = modifier;
     }
 
+    public String getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+
     public Integer getProductId() {
         return productId;
     }
@@ -143,53 +150,45 @@ public class DiagOpenedProducts implements Serializable {
         this.userId = userId;
     }
 
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
+    public String getAuditStatus() {
+        return auditStatus;
     }
 
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
     }
 
-    public Integer getServiceStatus() {
-        return serviceStatus;
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
     }
 
-    public void setServiceStatus(Integer serviceStatus) {
-        this.serviceStatus = serviceStatus;
+    public void setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
     }
 
-    public Integer getOrderId() {
-        return orderId;
+    public String getStatus() {
+        return status;
     }
 
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
+    public void setStatus(String status) {
+        this.status = status;
     }
 
     @Override
     public String toString() {
-        return "OpenedProducts{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", productId=" + productId +
-                ", userId=" + userId +
-                ", startTime=" + startTime +
-                ", endTime=" + endTime +
-                ", serviceStatus=" + serviceStatus +
-                ", orderId=" + orderId +
-                "}";
+        return "DiagOrderDetails{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", orderNum=" + orderNum +
+        ", productId=" + productId +
+        ", userId=" + userId +
+        ", auditStatus=" + auditStatus +
+        ", unitPrice=" + unitPrice +
+                ", status=" + status +
+        "}";
     }
 }

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

@@ -0,0 +1,166 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 订单实体类
+ * @Author: wangyu
+ * @Date: 15:41 2018/9/17
+ */
+public class DiagProductOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 订单编号
+     */
+    private String num;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 下单时间（申请时间）
+     */
+    private Date time;
+
+    /**
+     * 订单总价
+     */
+    private BigDecimal totalPrices;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public BigDecimal getTotalPrices() {
+        return totalPrices;
+    }
+
+    public void setTotalPrices(BigDecimal totalPrices) {
+        this.totalPrices = totalPrices;
+    }
+
+    @Override
+    public String toString() {
+        return "DiagProductOrder{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", num=" + num +
+        ", userId=" + userId +
+        ", time=" + time +
+        ", totalPrices=" + totalPrices +
+        "}";
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.entity.LantoneProduct;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/19 17:09
+ */
+public class LantoneProductWrapper extends LantoneProduct {
+}

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

@@ -0,0 +1,69 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OpenedProducts;
+import com.diagbot.entity.ProductService;
+import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.ServiceToken;
+
+/**
+ * @Description:
+ * @author: zhaops
+ * @time: 2018/9/19 16:06
+ */
+public class ProductServiceWrapper extends ProductService {
+    private ProductService productService;
+    private LantoneProduct lantoneProduct;
+    private OpenedProducts openedProducts;
+    private ServiceInfo serviceInfo;
+    private ServiceToken serviceToken;
+    private Long userId;
+
+    public ProductService getProductService() {
+        return productService;
+    }
+
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
+    }
+
+    public LantoneProduct getLantoneProduct() {
+        return lantoneProduct;
+    }
+
+    public void setLantoneProduct(LantoneProduct lantoneProduct) {
+        this.lantoneProduct = lantoneProduct;
+    }
+
+    public OpenedProducts getOpenedProducts() {
+        return openedProducts;
+    }
+
+    public void setOpenedProducts(OpenedProducts openedProducts) {
+        this.openedProducts = openedProducts;
+    }
+
+    public ServiceInfo getServiceInfo() {
+        return serviceInfo;
+    }
+
+    public void setServiceInfo(ServiceInfo serviceInfo) {
+        this.serviceInfo = serviceInfo;
+    }
+
+    public ServiceToken getServiceToken() {
+        return serviceToken;
+    }
+
+    public void setServiceToken(ServiceToken serviceToken) {
+        this.serviceToken = serviceToken;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.diagbot.facade;
+
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.service.impl.LantoneProductServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:产品业务层
+ * @author: wangyu
+ * @time: 2018/9/19 15:52
+ */
+@Component
+public class LantoneProductFacade extends LantoneProductServiceImpl {
+    /**
+     * @Description: 添加产品业务逻辑
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public CommonErrorCode addProducts(LantoneProduct lantoneProduct) {
+        LantoneProduct diagLantoneProduct1 = new LantoneProduct();
+
+        if (!save(lantoneProduct)) {
+            return CommonErrorCode.FAIL;
+        }
+        return CommonErrorCode.OK;
+    }
+
+    /**
+     * @Description: 修改产品业务逻辑
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public CommonErrorCode updateProduct(LantoneProduct lantoneProduct) {
+        if (!updateById(lantoneProduct)) {
+            return CommonErrorCode.FAIL;
+        }
+        return CommonErrorCode.OK;
+    }
+
+    /**
+     * @Description: 删除产品业务逻辑
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public CommonErrorCode deleteProduct(LantoneProduct lantoneProduct) {
+        lantoneProduct.setIsDeleted("Y");
+        if (!updateById(lantoneProduct)) {
+            return CommonErrorCode.FAIL;
+        }
+        return CommonErrorCode.OK;
+    }
+
+    /**
+     * @Description: 更改产品状态业务逻辑
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public CommonErrorCode productStatus(LantoneProduct lantoneProduct) {
+        if (!updateById(lantoneProduct)) {
+            return CommonErrorCode.FAIL;
+        }
+        return CommonErrorCode.OK;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.OpenedProductsServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:已开通产品业务层
+ * @author: zhaops
+ * @time: 2018/9/19 16:55
+ */
+@Component
+public class OpenedProductsFacade extends OpenedProductsServiceImpl {
+}

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

@@ -1,18 +1,28 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ProductServiceDTO;
+import com.diagbot.dto.ProductServiceRespDTO;
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
+import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.ServiceToken;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.service.impl.ProductServiceServiceImpl;
 import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Date;
 
@@ -25,11 +35,31 @@ import java.util.Date;
 public class ProductServiceFacade extends ProductServiceServiceImpl {
     @Autowired
     private ServiceTokenFacade serviceTokenFacade;
+    @Autowired
+    private ServiceInfoFacade serviceInfoFacade;
+    @Autowired
+    private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private OpenedProductsFacade openedProductsFacade;
 
-    public ProductServiceDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
-        ProductServiceDTO productServiceDTO=new ProductServiceDTO();
+    public ProductServiceRespDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
+        ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        LantoneProduct lantoneProduct = lantoneProductFacade.getById(productServiceSaveVO.getProductId());
+        if (lantoneProduct == null) {
+            productServiceRespDTO.setMsg("找不到产品【" + lantoneProduct.getName() + "】");
+            return productServiceRespDTO;
+        }
+        ServiceInfo serviceInfo = serviceInfoFacade.getById(productServiceSaveVO.getServiceId());
+        if (serviceInfo == null) {
+            productServiceRespDTO.setMsg("找不到服务端【" + serviceInfo.getName() + "】");
+            return productServiceRespDTO;
+        } else if (serviceInfo.getUserId() != userId) {
+            productServiceRespDTO.setMsg("当前登录用户没有关联服务端【" + serviceInfo.getName() + "】");
+            return productServiceRespDTO;
+        }
+
         Map<String, Object> map = new HashMap<>();
         map.put("productId", productServiceSaveVO.getProductId());
         map.put("serviceId", productServiceSaveVO.getServiceId());
@@ -41,8 +71,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
             productService.setCreator(userId.toString());
             productService.setGmtCreate(new Date());
             this.save(productService);
-        }
-        else {
+        } else {
             productService.setModifier(userId.toString());
             productService.setGmtModified(new Date());
             this.updateById(productService);
@@ -51,57 +80,85 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         // 生成令牌
         // 如果已有令牌，先删除原令牌，再重新生成
         // 试用产品 type=3 需生成7天有效期，重新生成令牌，有效期继承，超出有效期不允许再生成令牌
+        // 接入方式 accessType=3 online模式不需要生成令牌
         ServiceToken old_serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
         //删除原有token
         if (old_serviceToken != null) {
             serviceTokenFacade.deleteByProductServiceId(old_serviceToken.getProductSeviceId());
         }
-        ServiceToken serviceToken = new ServiceToken();
-        serviceToken.setCreator(userId.toString());
-        serviceToken.setGmtCreate(new Date());
-        serviceToken.setType(productServiceSaveVO.getType());
-        serviceToken.setAppKeyId(GuidUtil.App_key());
-        serviceToken.setAppKeySecret(GuidUtil.App_screct());
-        serviceToken.setStatus(1);
-        if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
-            //如果试用已过期，不允许再生成
-            if(calendar.after(old_serviceToken.getExpiringDate())) {
-                productServiceDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
-                return productServiceDTO;
+
+        String[] accessType = lantoneProduct.getAccessType().split(",");
+        if (accessType.length == 1 && accessType[0].equals("3")) {
+            productServiceRespDTO.setMsg("online模式不需要生成令牌！");
+        } else {
+            ServiceToken serviceToken = new ServiceToken();
+            serviceToken.setCreator(userId.toString());
+            serviceToken.setGmtCreate(new Date());
+            serviceToken.setProductSeviceId(productService.getId());
+            serviceToken.setType(productServiceSaveVO.getType());
+            serviceToken.setAppKeyId(GuidUtil.App_key());
+            serviceToken.setAppKeySecret(GuidUtil.App_screct());
+            serviceToken.setStatus(1);
+            if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
+                //如果试用已过期，不允许再生成
+                if (calendar.after(old_serviceToken.getExpiringDate())) {
+                    productServiceRespDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
+                    return productServiceRespDTO;
+                }
+                serviceToken.setStartingDate(old_serviceToken.getStartingDate());
+                serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
+            } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
+                serviceToken.setStartingDate(new Date());
+                calendar.clear();
+                calendar.setTime(new Date());
+                calendar.add(Calendar.DAY_OF_MONTH, 7);
+                serviceToken.setExpiringDate(calendar.getTime());
             }
-            serviceToken.setStartingDate(old_serviceToken.getStartingDate());
-            serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
-        } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
-            serviceToken.setStartingDate(new Date());
-            calendar.clear();
-            calendar.setTime(new Date());
-            calendar.add(Calendar.DAY_OF_MONTH, 7);
-            serviceToken.setExpiringDate(calendar.getTime());
+            serviceTokenFacade.save(serviceToken);
+            productServiceRespDTO.setServiceToken(serviceToken);
+            productServiceRespDTO.setMsg("令牌生成成功！");
         }
-        serviceTokenFacade.save(serviceToken);
 
-        productServiceDTO.setProductService(productService);
-        productServiceDTO.setServiceToken(serviceToken);
-        productServiceDTO.setMsg("令牌生成成功！");
-        return productServiceDTO;
+        productServiceRespDTO.setProductService(productService);
+        return productServiceRespDTO;
     }
 
-    public ProductServiceDTO deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
-        ProductServiceDTO productServiceDTO=new ProductServiceDTO();
+    public ProductServiceRespDTO deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
+        ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         Map<String, Object> map = new HashMap<>();
         map.put("productId", productServiceSaveVO.getProductId());
         map.put("serviceId", productServiceSaveVO.getServiceId());
         ProductService productService = this.findByProductIdAndServiceId(map);
-        if(productService==null){
-            productServiceDTO.setMsg("产品服务端不存在！");
-            return productServiceDTO;
+        if (productService == null) {
+            productServiceRespDTO.setMsg("产品服务端不存在！");
+            return productServiceRespDTO;
         }
         //删除关联令牌
         serviceTokenFacade.deleteByProductServiceId(productService.getId());
         //删除产品服务端
-        productServiceDTO.setMsg("删除成功！");
-        return productServiceDTO;
+        this.deleteById(productService.getId());
+        productServiceRespDTO.setMsg("删除成功！");
+        return productServiceRespDTO;
+    }
+
+    public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page) {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        ProductServiceWrapper productServiceVO=new ProductServiceWrapper();
+        productServiceVO.setUserId(userId);
+        IPage<ProductServiceWrapper> psPage = this.selectProductServiceByUserIdPage(page, productServiceVO);
+        List<ProductServiceWrapper> psList = psPage.getRecords();
+        for (ProductServiceWrapper productService : psList) {
+            LantoneProduct lantoneProduct = lantoneProductFacade.getById(productService.getProductId());
+            //OpenedProducts openedProducts=openedProductsFacade.
+            ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
+            ServiceToken serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
+            productService.setLantoneProduct(lantoneProduct);
+            productService.setServiceInfo(serviceInfo);
+            productService.setServiceToken(serviceToken);
+        }
+        psPage.setRecords(psList);
+        return psPage;
     }
 }

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

@@ -1,6 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.ServiceToken;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.service.impl.ServiceInfoServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ServiceSaveVO;
@@ -42,4 +47,11 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         return list;
     }
 
+    public IPage<ServiceInfo> getServiceListPageByCurrentUser(Page<ServiceInfo> page) {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        ServiceInfo serviceInfoVO = new ServiceInfo();
+        serviceInfoVO.setUserId(userId);
+        IPage<ServiceInfo> pagelist = this.selectServiceListPage(page, serviceInfoVO);
+        return pagelist;
+    }
 }

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

@@ -1,7 +1,12 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.LantoneProduct;
 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.entity.LantoneProduct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +17,25 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-09-18
  */
 public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
+    /**
+     * @Description: 用户查询所有未开通产品
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    IPage<LantoneProduct> productLine(Page page, @Param("userId") int userId);
+
+    /**
+     * @Description: 用户查询所有未开通产品
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    IPage<LantoneProduct> selectProduct(Page page, @Param("name") String name );
+
+    /**
+     * @Description: 查询开通当前产品的所有用户
+     * @Author: wangyu
+     * @Date: 13:32 2018/9/18
+     */
+    IPage<LantoneProduct> opendedProduct(Page page, @Param("map") Map map);
 
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.OpenedProducts;
 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.entity.OpenedProducts;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -12,5 +15,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-09-18
  */
 public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
-
+    /**
+     * 根据用户id查询已开通的产品
+     * @param userId 用户id
+     * @return
+     */
+    IPage<OpenedProducts> selectOpendInfoByUserId(Page page, @Param("userId") int userId);
 }

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

@@ -1,7 +1,12 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.ProductService;
 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.entity.ProductService;
+import com.diagbot.entity.User;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +25,7 @@ public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
     List<ProductService> findByProductId(Long productId);
 
+    IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page page, @Param("productService") ProductServiceWrapper productService);
+
+    Integer deleteById(Long id);
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +20,6 @@ public interface ServiceInfoMapper extends BaseMapper<ServiceInfo> {
     ServiceInfo findByName(String name);
 
     List<ServiceInfo> getListByUserId(Long userId);
+
+    IPage<ServiceInfo> selectServiceListPage(Page page, @Param("serviceInfo") ServiceInfo serviceInfo);
 }

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

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.LantoneProduct;
+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.entity.LantoneProduct;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +16,24 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-09-18
  */
 public interface LantoneProductService extends IService<LantoneProduct> {
+    /**
+     * @Description: 用户查询所有可开通产品
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    IPage<LantoneProduct> productLine(Page<LantoneProduct> page, int userId);
+
+    /**
+     * @Description: 朗通查询所有产品线
+     * @Author: wangyu
+     * @Date: 9:49 2018/9/18
+     */
+    IPage<LantoneProduct> selectProduct(Page<LantoneProduct> page, String name);
 
+    /**
+     * @Description: 查询开通当前产品的所有用户
+     * @Author: wangyu
+     * @Date: 13:32 2018/9/18
+     */
+    IPage<LantoneProduct> opendedProduct(Page page, Map map);
 }

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

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.OpenedProducts;
+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.entity.OpenedProducts;
 
 /**
  * <p>
@@ -12,5 +14,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-09-18
  */
 public interface OpenedProductsService extends IService<OpenedProducts> {
-
+    /**
+     * 根据用户id查询已开通的产品
+     * @param userId 用户id
+     * @return
+     */
+    IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId);
 }

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

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ProductService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -18,4 +22,8 @@ public interface ProductServiceService extends IService<ProductService> {
     ProductService findByProductIdAndServiceId(Map<String, Object> map);
 
     List<ProductService> findByProductId(Long productId);
+
+    IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService);
+
+    Integer deleteById(Long id);
 }

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

@@ -1,5 +1,7 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,5 +17,8 @@ import java.util.List;
  */
 public interface ServiceInfoService extends IService<ServiceInfo> {
     ServiceInfo findByName(String name);
+
     List<ServiceInfo> getListByUserId(Long userId);
+
+    IPage<ServiceInfo> selectServiceListPage(Page<ServiceInfo> page, ServiceInfo serviceInfo);
 }

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

@@ -1,11 +1,15 @@
 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.entity.LantoneProduct;
 import com.diagbot.mapper.LantoneProductMapper;
 import com.diagbot.service.LantoneProductService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  * 朗通产品表 服务实现类
@@ -16,5 +20,29 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper, LantoneProduct> implements LantoneProductService {
+    /**
+     * @Description: 显示朗通产品线
+     * @Author: wangyu
+     * @Date: 13:29 2018/9/18
+     */
+    @Override
+    public IPage<LantoneProduct> productLine(Page<LantoneProduct> page,int userId) {
+        return baseMapper.productLine(page,userId);
+    }
+
+    /**
+     * @Description: 查询朗通所有产品线
+     * @Author: wangyu
+     * @Date: 17:05 2018/9/18
+     */
+    @Override
+    public IPage<LantoneProduct> selectProduct(Page<LantoneProduct> page, String name) {
+
+        return baseMapper.selectProduct(page,name);
+    }
 
+    @Override
+    public IPage<LantoneProduct> opendedProduct(Page page, Map map) {
+        return baseMapper.opendedProduct(page,map);
+    }
 }

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

@@ -1,9 +1,11 @@
 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.entity.OpenedProducts;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +18,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper, OpenedProducts> implements OpenedProductsService {
-
+    @Override
+    public IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId) {
+        return baseMapper.selectOpendInfoByUserId(page,userId);
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ProductService;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.mapper.ProductServiceMapper;
 import com.diagbot.service.ProductServiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,4 +30,12 @@ public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper,
     public List<ProductService> findByProductId(Long productId) {
         return baseMapper.findByProductId(productId);
     }
-}
+
+    public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService) {
+        return baseMapper.selectProductServiceByUserIdPage(page, productService);
+    }
+
+    public Integer deleteById(Long id) {
+        return baseMapper.deleteById(id);
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.mapper.ServiceInfoMapper;
 import com.diagbot.service.ServiceInfoService;
@@ -18,12 +20,15 @@ import java.util.List;
  */
 @Service
 public class ServiceInfoServiceImpl extends ServiceImpl<ServiceInfoMapper, ServiceInfo> implements ServiceInfoService {
-    public ServiceInfo findByName(String name){
+    public ServiceInfo findByName(String name) {
         return baseMapper.findByName(name);
     }
 
-    public List<ServiceInfo> getListByUserId(Long userId){
+    public List<ServiceInfo> getListByUserId(Long userId) {
         return baseMapper.getListByUserId(userId);
     }
 
+    public IPage<ServiceInfo> selectServiceListPage(Page<ServiceInfo> page, ServiceInfo serviceInfo) {
+        return baseMapper.selectServiceListPage(page, serviceInfo);
+    }
 }

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

@@ -17,5 +17,6 @@ public class ProductServiceSaveVO {
     private Long productId;
     @NotBlank(message = "请输入服务Id!")
     private Long serviceId;
+    @NotBlank(message = "请输入令牌类型!")
     private Integer type;
 }

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

@@ -0,0 +1,90 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.facade.LantoneProductFacade;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description: 朗通产品 前端控制器
+ * @Author: wangyu
+ * @Date: 15:46 2018/9/17
+ */
+@RestController
+@RequestMapping("/diagLantoneProduct")
+public class DiagLantoneProductController {
+    @Autowired
+    private LantoneProductFacade lantoneProductFacade;
+
+    @ApiOperation(value = "添加产品线",
+            notes = "name：产品名，必填<br>" +
+                    "decription：产品描述，必填<br> " +
+                    "url：产品访问路径，必填<br>" +
+                    "charge_type：支付方式，必填<br>")
+    @PostMapping("/addProducts")
+    @SysLogger("addProducts")
+    @Transactional
+    public RespDTO<LantoneProduct> addProducts(LantoneProduct lantoneProduct){
+        return RespDTO.onSuc(lantoneProductFacade.addProducts(lantoneProduct));
+    }
+
+    @ApiOperation(value = "分页查询查询产品线",
+            notes = "name：添加后则根据产品名称查询，选填<br>"+
+                    "根据每页显示条数，默认 10，和当前页<br>")
+    @GetMapping("/selectProduct")
+    @SysLogger("selectProduct")
+    public RespDTO<LantoneProduct> selectProduct(Page page , String name){
+        IPage<LantoneProduct> pages = lantoneProductFacade.selectProduct(page,name);
+        return RespDTO.onSuc(pages);
+    }
+
+    @ApiOperation(value = "修改产品",
+            notes = "id：根据产品id修改产品内容，必填<br>")
+    @PostMapping("/updateProduct")
+    @SysLogger("updateProduct")
+    public RespDTO<LantoneProduct> updateProduct(LantoneProduct lantoneProduct){
+        return RespDTO.onSuc(lantoneProductFacade.updateProduct(lantoneProduct));
+    }
+
+    @ApiOperation(value = "删除产品",
+            notes = "id：根据产品id删除产品，必填<br>")
+    @PostMapping("/deleteProduct")
+    @SysLogger("deleteProduct")
+    public RespDTO<LantoneProduct> deleteProduct(LantoneProduct lantoneProduct){
+        return RespDTO.onSuc(lantoneProductFacade.deleteProduct(lantoneProduct));
+    }
+
+    @ApiOperation(value = "更改产品状态（启用/停用）",
+            notes = "id：根据产品id更改产品状态，必填<br>")
+    @PostMapping("/productStatus")
+    @SysLogger("productStatus")
+    public RespDTO<LantoneProduct> productStatus(LantoneProduct lantoneProduct){
+        return RespDTO.onSuc(lantoneProductFacade.productStatus(lantoneProduct));
+    }
+
+    @ApiOperation(value = "查询当条产品线所有已开通用户",
+            notes = "id：根据产品id查询所有已开通本产品用户，必填<br>")
+    @GetMapping("/opendedProduct")
+    @SysLogger("opendedProduct")
+    public RespDTO<LantoneProduct> opendedProduct(Page page,LantoneProduct lantoneProduct){
+        Map map =new HashMap();
+        map.put("lantoneProduct",lantoneProduct);
+        System.out.println(map);
+        System.out.println(lantoneProductFacade.opendedProduct(page,map));
+        return RespDTO.onSuc(lantoneProductFacade.opendedProduct(page,map));
+    }
+}
+

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

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.facade.LantoneProductFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: diagbot更多服务 前端控制器
+ * @author: wangyu
+ * @time: 2018/9/17 18:28
+ */
+@RestController
+@Api(value="diagbot更多服务 前端控制器", tags={"diagbot更多服务 前端控制器"})
+@RequestMapping("/morServices")
+public class MoreServiceController {
+    @Autowired
+    private LantoneProductFacade lantoneProductFacade;
+
+    @ApiOperation(value = "根据用户id查询已开通信息", notes = "根据用户id查询已开通信息")
+    @GetMapping("/showProductInfo")
+    @SysLogger("showProductInfo")
+    public RespDTO<LantoneProduct> showProductInfo(Page page){
+
+        /*int userId = Integer.parseInt(UserUtils.getCurrentPrincipleID());//获取用户id*/
+        IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page,1);
+        return RespDTO.onSuc(diagLantoneProducts);
+    }
+}
+
+

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

@@ -1,10 +1,14 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ProductServiceDTO;
+import com.diagbot.dto.ProductServiceRespDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.User;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.vo.ProductServiceSaveVO;
 import io.swagger.annotations.Api;
@@ -15,6 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -33,13 +38,34 @@ public class ProductServiceController {
 
     @ApiOperation(value = "服务端关联到产品接口",
             notes = "productId：产品Id，必填<br>" +
-                    "serviceId：服务Id，必填<br> ")
+                    "serviceId：服务Id，必填<br> " +
+                    "type：令牌类型，必填<br> ")
     @PostMapping("/genProductService")
     @SysLogger("genProductService")
     @Transactional
-    public RespDTO<ProductServiceDTO> genProductService(ProductServiceSaveVO productServiceSaveVO) {
-        ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
-        return RespDTO.onSuc(productServiceDTO);
+    public RespDTO<ProductServiceRespDTO> genProductService(ProductServiceSaveVO productServiceSaveVO) {
+        ProductServiceRespDTO productServiceRespDTO = productServiceFacade.genProductService(productServiceSaveVO);
+        return RespDTO.onSuc(productServiceRespDTO);
+    }
+
+    @ApiOperation(value = "删除产品服务端",
+            notes = "productId：产品Id，必填<br>" +
+                    "serviceId：服务Id，必填<br> " +
+                    "type：令牌类型，必填<br> ")
+    @PostMapping("/deleteProductService")
+    @SysLogger("deleteProductService")
+    @Transactional
+    public RespDTO<ProductServiceRespDTO> deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
+        ProductServiceRespDTO productServiceRespDTO = productServiceFacade.deleteProductService(productServiceSaveVO);
+        return RespDTO.onSuc(productServiceRespDTO);
+    }
+
+    @ApiOperation(value = "根据用户id获取产品服务关联信息", notes = "根据用户id获取产品服务关联信息")
+    @PostMapping("/getProductServiceByCurrentUser")
+    @SysLogger("getProductServiceByCurrentUser")
+    public RespDTO getProductServiceByCurrentUser(Page page) {
+        IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByUserIdPage(page);
+        return RespDTO.onSuc(psPage);
     }
 }
 

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

@@ -1,9 +1,12 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.facade.ServiceInfoFacade;
 import com.diagbot.vo.ServiceSaveVO;
 import io.swagger.annotations.Api;
@@ -13,8 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -66,5 +67,14 @@ public class ServiceInfoController {
         List<ServiceInfo> list = serviceInfoFacade.getServiceListByCurrentUser();
         return RespDTO.onSuc(list);
     }
+
+    @ApiOperation(value = "获取当前登录用户的服务分页列表")
+    @PostMapping("/getServiceListPageByCurrentUser")
+    @SysLogger("getServiceListPageByCurrentUser")
+    @Transactional
+    public RespDTO getServiceListPageByCurrentUser(Page<ServiceInfo> page) {
+        IPage<ServiceInfo> list = serviceInfoFacade.getServiceListPageByCurrentUser(page);
+        return RespDTO.onSuc(list);
+    }
 }
 

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

@@ -2,7 +2,7 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.ProductServiceDTO;
+import com.diagbot.dto.ProductServiceRespDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ProductServiceFacade;
 import com.diagbot.facade.ServiceTokenFacade;
@@ -50,9 +50,9 @@ public class ServiceTokenController {
     @PostMapping("/createServiceToken")
     @SysLogger("createServiceToken")
     @Transactional
-    public RespDTO<ProductServiceDTO> createServiceToken(@RequestBody @Valid ProductServiceSaveVO productServiceSaveVO) {
-        ProductServiceDTO productServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
-        return RespDTO.onSuc(productServiceDTO);
+    public RespDTO<ProductServiceRespDTO> createServiceToken(@RequestBody @Valid ProductServiceSaveVO productServiceSaveVO) {
+        ProductServiceRespDTO productServiceRespDTO = productServiceFacade.genProductService(productServiceSaveVO);
+        return RespDTO.onSuc(productServiceRespDTO);
     }
 
     @ApiOperation(value = "令牌禁用",

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

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DiagLantoneProductMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DiagLantoneProduct">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="decription" property="decription" />
-        <result column="charge_type" property="chargeType" />
-        <result column="url" property="url" />
-        <result column="open_num" property="openNum" />
-        <result column="service_status" property="serviceStatus" />
-        <result column="trial_status" property="trialStatus" />
-        <result column="trial_url" property="trialUrl" />
-        <result column="access_type" property="accessType" />
-    </resultMap>
-    <!--根据用户id查询用户是否有开通产品-->
-    <select id="productLine" resultMap="BaseResultMap">
-        SELECT * from diag_lantone_product p WHERE p.is_deleted ='N'
-        <if test="userId != null">
-            and id NOT IN (SELECT product_id FROM diag_opened_products WHERE user_id =#{userId})
-        </if>
-    </select>
-
-    <!--根据产品名称分页查询-->
-    <select id="selectProduct" resultMap="BaseResultMap">
-        SELECT * from diag_lantone_product p WHERE p.is_deleted ='N' and service_status NOT IN('0')
-        <if test="name != null and name != ''">
-            AND p.name LIKE concat ('%',#{name},'%')
-        </if>
-    </select>
-
-    <update id="updateProduct" parameterType="com.diagbot.entity.DiagLantoneProduct">
-        UPDATE `diag_lantone_product` SET `name`=#{name}, `gmtModified`=#{gmtModified}, `decription`=#{decription}, `url`=#{url},chargeType=#{chargeType} WHERE (`id`=#{id})
-    </update>
-</mapper>

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

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.DiagOpenedProductsMapper">
+<mapper namespace="com.diagbot.mapper.DiagOrderDetailsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.DiagOpenedProducts">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DiagOrderDetails">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
+        <result column="order_num" property="orderNum" />
         <result column="product_id" property="productId" />
         <result column="user_id" property="userId" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="service_status" property="serviceStatus" />
-        <result column="order_id" property="orderId" />
+        <result column="audit_status" property="auditStatus" />
+        <result column="unit_price" property="unitPrice" />
+        <result column="status" property="status" />
     </resultMap>
-    <select id="selectOpendInfoByUserId" resultMap="BaseResultMap" parameterType="java.util.List">
-        SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}
-    </select>
+
 </mapper>

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

@@ -21,4 +21,29 @@
         <result column="access_type" property="accessType" />
     </resultMap>
 
+    <!--根据用户id查询用户是否有开通产品-->
+    <select id="productLine" resultMap="BaseResultMap">
+        SELECT * from diag_lantone_product p WHERE p.is_deleted ='N'
+        <if test="userId != null">
+            and id NOT IN (SELECT product_id FROM diag_opened_products WHERE user_id =#{userId})
+        </if>
+    </select>
+
+    <!--根据产品名称分页查询-->
+    <select id="selectProduct" resultMap="BaseResultMap">
+        SELECT * from diag_lantone_product p WHERE p.is_deleted ='N' and service_status NOT IN('0')
+        <if test="name != null and name != ''">
+            AND p.name LIKE concat ('%',#{name},'%')
+        </if>
+    </select>
+
+    <select id="opendedProduct" resultMap="BaseResultMap" parameterType="java.util.Map">
+        SELECT op.id,op.start_time,op.end_time,op.service_status,pod.time,orn.`name`
+        from `sys-diagbotman`.diag_opened_products op,`sys-diagbotman`.diag_product_order pod,`sys-user`.sys_user_organization uor,`sys-user`.sys_organization orn
+        where pod.num = op.order_id AND uor.user_id =op.user_id AND orn.id =uor.organization_id AND op.product_id =#{map.id}
+        <if test="map.servicdStatus !=null and map.servicdStatus !=''">
+            op.service_status =#{map.serviceStatus}
+        </if>
+    </select>
+
 </mapper>

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

@@ -17,5 +17,7 @@
         <result column="service_status" property="serviceStatus" />
         <result column="order_id" property="orderId" />
     </resultMap>
-
+    <select id="selectOpendInfoByUserId" resultMap="BaseResultMap" parameterType="java.util.List">
+        SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}
+    </select>
 </mapper>

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

@@ -15,14 +15,33 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultWrapperMap" type="com.diagbot.entity.wrapper.ProductServiceWrapper">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="product_id" property="productId" />
+        <result column="service_id" property="serviceId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
     <select id="findByProductIdAndServiceId" resultMap="BaseResultMap" parameterType="java.util.Map">
         select * from diag_product_service
-        where product_id = #{procuctId} and service_id=#{serviceId} and is_deleted = 'N'
+        where product_id = #{productId} and service_id=#{serviceId} and is_deleted = 'N'
     </select>
 
     <select id="findByProductId" resultMap="BaseResultMap" parameterType="java.lang.Long">
         select * from diag_product_service
-        where product_id = #{procuctId} and is_deleted = 'N'
+        where product_id = #{productId} and is_deleted = 'N'
+    </select>
+
+    <select id="selectProductServiceByUserIdPage" resultMap="BaseResultWrapperMap">
+        select a.* from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
+        where a.product_id=b.product_id and a.product_id=d.id and a.service_id=c.id and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and b.service_status=1  and d.is_deleted='N'
+        and b.user_id=#{productService.userId} and c.user_id=#{productService.userId} and (find_in_set('1',d.access_type) or FIND_IN_SET('2',d.access_type))
     </select>
 
     <update id="deleteById" parameterType="java.lang.Long">

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

@@ -24,4 +24,8 @@
         select * from diag_service_info
         where user_id = #{userId} and is_deleted = 'N'
     </select>
+
+    <select id="selectServiceListPage" resultMap="BaseResultMap">
+        select * from diag_service_info where user_id=#{serviceInfo.userId} and is_deleted='N';
+    </select>
 </mapper>

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

@@ -1,5 +1,10 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.entity.Organization;
 
@@ -24,4 +29,10 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
      */
     public Organization getByName(String name);
 
+    /**
+     * @Description: 模糊查询机构名称
+     * @Author: wangfeng
+     * @Date: 2018/9/19 15:24
+     */
+    public List<Organization> findOrganization(String organizationName);
 }

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

@@ -6,6 +6,8 @@ import com.diagbot.entity.Organization;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
 /**
  * @Description: 机构service
  * @Author: ztg
@@ -34,5 +36,11 @@ public interface OrganizationService extends IService<Organization> {
      * @Date: 2018/9/13 19:24
      */
     public Organization getByName(String name);
-
+    
+    /**
+     * @Description: 模糊查询机构名称
+     * @Author: wangfeng
+     * @Date: 2018/9/19 15:24
+     */
+    public List<Organization> findOrganization(String organizationName);
 }

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

@@ -42,6 +42,13 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
         return baseMapper.getByName(name);
     }
 
-
+    /**
+     * @Description: 模糊查询机构名称
+     * @Author: wangfeng
+     * @Date: 2018/9/19 15:24
+     */
+    public List<Organization> findOrganization(String organizationName){
+    	 return baseMapper.findOrganization(organizationName);
+    }
 
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserInfoDTO;
+import com.diagbot.entity.Organization;
+import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.UserInfoOrganizationsVO;
@@ -35,6 +38,8 @@ public class UserInfoController {
 	
 	@Autowired
     private UserFacade userFacade;
+	@Autowired
+	OrganizationFacade organizationFacade;
 	
 	    @ApiOperation(value = "分页查询获取用户信息", notes = "根据每页显示条数，默认 10，和当前页")
 	    @PostMapping("/getUserInfoPag")
@@ -52,7 +57,7 @@ public class UserInfoController {
 	    @PostMapping("/updateUserInfoAll")
 	    @SysLogger("updateUserInfoAll")
 	    public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll( UserInfoOrganizationsVO userInfo){
-	         int res= userFacade.updateUserInfoAll(userInfo);
+	         int res = userFacade.updateUserInfoAll(userInfo);
 	         
 	        return RespDTO.onSuc("修改成功"+res);
 	    }
@@ -63,11 +68,41 @@ public class UserInfoController {
 	    public RespDTO updateDeleted(@RequestParam String  userId){
 	    	Map<String,String> map = new HashMap<String, String>();
 	    	map.put("userId", userId);
-	    	map.put("modifier",UserUtils.getCurrentPrincipleID());
+	    	//map.put("modifier",UserUtils.getCurrentPrincipleID());
+	    	map.put("modifier","5");
 	    	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	    	map.put("gmtModified",df.format(new Date()));
 	    	 int res= userFacade.updateDeleted(map);
 	    	 return RespDTO.onSuc("刪除成功"+res);
 	    }
-	
+	    
+	    @ApiOperation(value = "模糊查询机构信息", notes = "机构信息")
+	    @PostMapping("/findOrganization")
+	    @SysLogger("findOrganization")
+	    public RespDTO findOrganization(@RequestParam String  organizationName){
+	    	//TODO 返回机构Id和机构
+	    	List<Organization> organization = organizationFacade.findOrganization(organizationName);
+	    	
+	    	 return RespDTO.onSuc("查询成功");
+	    }
+	    
+	    @ApiOperation(value = "添加构信息", notes = "机构信息")
+	    @PostMapping("/addOrganization")
+	    @SysLogger("addOrganization")
+	    public RespDTO addOrganization(Organization  organization){
+	    	//TODO
+	    	
+	    	 return RespDTO.onSuc("成功");
+	    }
+	    
+	    @ApiOperation(value = "添加用户信息和机构信息管理员", notes = "用户信息和机构信息的绑定")
+	    @PostMapping("/addUserInfo")
+	    @SysLogger("addUserInfo")
+	    public RespDTO addUserInfo(@RequestParam String  userId){
+	    	//TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
+	    	
+	    	 return RespDTO.onSuc("成功");
+	    } 
+	    
+	    
 }

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

@@ -28,4 +28,9 @@
         SELECT a.* FROM `sys_organization` a
         where a.name = #{name} and a.is_deleted = 'N'
     </select>
+
+	<select id="findOrganization" parameterType="java.lang.String" >
+		SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
+		CONCAT('%',  #{organizationName}, '%')
+	</select>
 </mapper>