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

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

@@ -7,6 +7,8 @@ import com.diagbot.entity.ServiceToken;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @Description:产品服务关联信息返回类
  * @author: zhaops
@@ -44,4 +46,8 @@ public class ProductServiceDTO {
      */
     private String serviceDescription;
 
+    /**
+     * 创建时间
+     */
+    private Date gmtCreate;
 }

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

@@ -1,9 +1,6 @@
 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;
 
 /**
@@ -12,49 +9,78 @@ import com.diagbot.entity.ServiceToken;
  * @time: 2018/9/19 16:06
  */
 public class ProductServiceWrapper extends ProductService {
-    private LantoneProduct lantoneProduct;
+    /*private LantoneProduct lantoneProduct;
     private OpenedProducts openedProducts;
-    private ServiceInfo serviceInfo;
+    private ServiceInfo serviceInfo;*/
     private ServiceToken serviceToken;
     private Long userId;
 
-    public LantoneProduct getLantoneProduct() {
-        return lantoneProduct;
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品介绍
+     */
+    private String productDescription;
+
+
+    /**
+     * 服务名称
+     */
+    private String serviceName;
+
+    /**
+     * 服务说明
+     */
+    private String serviceDescription;
+
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setLantoneProduct(LantoneProduct lantoneProduct) {
-        this.lantoneProduct = lantoneProduct;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public OpenedProducts getOpenedProducts() {
-        return openedProducts;
+    public String getProductName() {
+        return productName;
     }
 
-    public void setOpenedProducts(OpenedProducts openedProducts) {
-        this.openedProducts = openedProducts;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
-    public ServiceInfo getServiceInfo() {
-        return serviceInfo;
+    public String getProductDescription() {
+        return productDescription;
     }
 
-    public void setServiceInfo(ServiceInfo serviceInfo) {
-        this.serviceInfo = serviceInfo;
+    public void setProductDescription(String productDescription) {
+        this.productDescription = productDescription;
     }
 
-    public ServiceToken getServiceToken() {
-        return serviceToken;
+    public String getServiceName() {
+        return serviceName;
     }
 
-    public void setServiceToken(ServiceToken serviceToken) {
-        this.serviceToken = serviceToken;
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
     }
 
-    public Long getUserId() {
-        return userId;
+    public String getServiceDescription() {
+        return serviceDescription;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setServiceDescription(String serviceDescription) {
+        this.serviceDescription = serviceDescription;
+    }
+
+    public ServiceToken getServiceToken() {
+        return serviceToken;
+    }
+
+    public void setServiceToken(ServiceToken serviceToken) {
+        this.serviceToken = serviceToken;
     }
 }

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

@@ -166,36 +166,36 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         //当前登录用户服务端列表
-        QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
+        /*QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
         qwService.eq("is_deleted", IsDeleteEnum.N.getKey());
         qwService.eq("user_id", userId);
         List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwService);
-        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");
+        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");*/
         //服务令牌列表
         QueryWrapper<ServiceToken> qwToken = new QueryWrapper<>();
         qwToken.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<ServiceToken> serviceTokenList = serviceTokenFacade.list(qwToken);
         Map<Long, ServiceToken> tokenData = EntityUtil.makeEntityMap(serviceTokenList, "productServiceId");
         //产品列表
-        QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
+        /*QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
         qwProduct.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<LantoneProduct> lantoneProductList = lantoneProductFacade.list(qwProduct);
-        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");
+        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");*/
         //当前用户开通的产品列表
-        QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
+       /* QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
         qwOpenedProducts.eq("is_deleted", IsDeleteEnum.N.getKey());
         qwOpenedProducts.eq("user_id", userId);
         List<OpenedProducts> openedProductsList = openedProductsFacade.list(qwOpenedProducts);
-        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");
+        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");*/
 
         ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServicePage(page, productServiceVO);
         List<ProductServiceWrapper> psList = psPage.getRecords();
         for (ProductServiceWrapper productService : psList) {
-            productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
+            /*productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
             productService.setOpenedProducts(openedProductData.get(productService.getProductId()));
-            productService.setServiceInfo(serviceData.get(productService.getServiceId()));
+            productService.setServiceInfo(serviceData.get(productService.getServiceId()));*/
             productService.setServiceToken(tokenData.get(productService.getId()));
         }
         psPage.setRecords(psList);

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

@@ -27,11 +27,17 @@
         <result column="product_id" property="productId"/>
         <result column="service_id" property="serviceId"/>
         <result column="remark" property="remark"/>
+        <result column="product_name" property="productName"/>
+        <result column="product_description" property="productDescription"/>
+        <result column="service_name" property="serviceName"/>
+        <result column="service_description" property="serviceDescription"/>
     </resultMap>
 
+
     <!-- 查询产品与服务端的关联列表（分页） -->
     <select id="selectProductServicePage" resultMap="BaseResultWrapperMap">
-        select a.* from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
+        select a.*,d.name as product_name,d.decription as product_description,c.name as service_name,c.description as service_description
+        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