用户更多服务出参格式优化

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

@@ -0,0 +1,32 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 用户更多服务出参类
+ * @author: wangyu
+ * @time: 2018/9/29 15:10
+ */
+@Getter
+@Setter
+public class ProductLineDTO {
+    /**
+     * 产品名称
+     */
+    private String name;
+    /**
+     * 产品介绍
+     */
+    private String decription;
+
+    /**
+     * 计费方式
+     */
+    private String chargeType;
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String accessType;
+
+}

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
@@ -118,17 +119,11 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param page 页数和每页显示的条数默认显示10条
      * @return 根据用户id查询是否有开通产品
      */
-    public RespDTO<IPage<LantoneProduct>> productLine(Page page) {
+    public RespDTO<IPage<ProductLineDTO>> productLine(Page page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        IPage<LantoneProduct> diagLantoneProducts =null;
-        String name =null;
         List<Long> list = openedProductsFacade.getOpendCountByUserId(userId);
-        if(list.size()!=0){
-            diagLantoneProducts=this.productLine(page,list);
-            return RespDTO.onSuc(diagLantoneProducts);
-        }
-        diagLantoneProducts = this.selectProduct(page,name);
-        return RespDTO.onSuc(diagLantoneProducts);
+
+        return RespDTO.onSuc(this.productLine(page,list));
     }
 
 

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

@@ -3,6 +3,7 @@ package com.diagbot.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,7 +25,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page page, @Param("productId") List<Long> productId);
+    IPage<ProductLineDTO> productLine(Page page, @Param("productId") List<Long> productId);
 
     /**
      * @Description: 根据产品名称分页查询

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

@@ -3,6 +3,7 @@ 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.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 
@@ -23,7 +24,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page<LantoneProduct> page, List<Long> productId);
+    IPage<ProductLineDTO> productLine(Page<LantoneProduct> page, List<Long> productId);
 
     /**
      * @Description: 朗通查询所有产品线

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

@@ -4,6 +4,7 @@ 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.client.UserServiceClient;
+import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.mapper.LantoneProductMapper;
@@ -33,7 +34,7 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      * @Date: 13:29 2018/9/18
      */
     @Override
-    public IPage<LantoneProduct> productLine(Page<LantoneProduct> page, List<Long> productId) {
+    public IPage<ProductLineDTO> productLine(Page<LantoneProduct> page, List<Long> productId) {
         return baseMapper.productLine(page, productId);
     }
 

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

@@ -3,8 +3,8 @@ 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.ProductLineDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.LantoneProduct;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.ProductOrderFacade;
 import com.diagbot.vo.AddOrderVO;
@@ -36,7 +36,7 @@ public class MoreServiceController {
             , notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
-    public RespDTO<IPage<LantoneProduct>> showProductInfo(@RequestBody Page page) {
+    public RespDTO<IPage<ProductLineDTO>> showProductInfo(@RequestBody Page page) {
         return lantoneProductFacade.productLine(page);
     }
 

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

@@ -42,15 +42,17 @@
     </resultMap>
 
     <!--根据用户id查询用户是否有开通产品-->
-    <select id="productLine" resultMap="BaseResultMap">
+    <select id="productLine" resultType="com.diagbot.dto.ProductLineDTO">
         <!--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 * FROM `diag_lantone_product` WHERE 1=1
-        <foreach item="productId" collection="productId" open="" separator="" close="">
-            and id != #{productId}
-        </foreach>
+        SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N'
+        <if test="productId != null and productId.size() !=0 ">
+            <foreach item="productId" collection="productId" open="" separator="" close="">
+                and id != #{productId}
+            </foreach>
+        </if>
     </select>
 
     <!--根据产品名称分页查询-->

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

@@ -240,7 +240,7 @@
         </foreach>
     </select>
 
-    <select id="getOpendCountByUserId" resultType="java.lang.String">
+    <select id="getOpendCountByUserId" resultType="java.lang.Long">
         SELECT a.product_id FROM diag_opened_products a WHERE a.is_deleted ='N' and a.user_id = #{userId}
     </select>
 </mapper>