用户更多服务产品显示修改

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

@@ -116,14 +116,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     /**
      * 根据用户id查询是否有开通产品
      *
-     * @param page 页数和每页显示的条数默认显示10条
      * @return 根据用户id查询是否有开通产品
      */
-    public RespDTO<IPage<ProductLineDTO>> productLine(Page page) {
+    public RespDTO<List<ProductLineDTO>> productLine() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         List<Long> list = openedProductsFacade.getOpendCountByUserId(userId);
 
-        return RespDTO.onSuc(this.productLine(page,list));
+        return RespDTO.onSuc(this.productLine(list));
     }
 
 

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

@@ -25,7 +25,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<ProductLineDTO> productLine(Page page, @Param("productId") List<Long> productId);
+    List<ProductLineDTO> productLine(@Param("productId") List<Long> productId);
 
     /**
      * @Description: 根据产品名称分页查询

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

@@ -24,7 +24,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<ProductLineDTO> productLine(Page<LantoneProduct> page, List<Long> productId);
+    List<ProductLineDTO> productLine(List<Long> productId);
 
     /**
      * @Description: 朗通查询所有产品线

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

@@ -34,8 +34,8 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      * @Date: 13:29 2018/9/18
      */
     @Override
-    public IPage<ProductLineDTO> productLine(Page<LantoneProduct> page, List<Long> productId) {
-        return baseMapper.productLine(page, productId);
+    public List<ProductLineDTO> productLine(List<Long> productId) {
+        return baseMapper.productLine(productId);
     }
 
     /**

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

@@ -1,7 +1,5 @@
 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;
@@ -17,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: diagbot更多服务 前端控制器
  * @author: wangyu
@@ -36,8 +36,8 @@ public class MoreServiceController {
             , notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
-    public RespDTO<IPage<ProductLineDTO>> showProductInfo(@RequestBody Page page) {
-        return lantoneProductFacade.productLine(page);
+    public RespDTO<List<ProductLineDTO>> showProductInfo() {
+        return lantoneProductFacade.productLine();
     }
 
     @ApiOperation(value = "用户更多服务——生成订单[by:wangyu]",