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

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

@@ -0,0 +1,76 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description: 用户更多服务出参类
+ * @author: wangyu
+ * @time: 2018/9/29 15:10
+ */
+@Getter
+@Setter
+public class LantoneProductDTO {
+
+    /**
+     * 产品id
+     */
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 产品名称
+     */
+    private String name;
+
+    /**
+     * 产品介绍
+     */
+    private String decription;
+
+    /**
+     * 计费方式
+     */
+    private String chargeType;
+
+    /**
+     * 产品路径
+     */
+    private String url;
+
+    /**
+     * 停用状态
+     */
+    private Integer serviceStatus;
+
+    /**
+     * 试用状态
+     */
+    private Integer trialStatus;
+
+    /**
+     * 试用地址
+     */
+    private String trialUrl;
+
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String accessType;
+
+    /**
+     * 已开通数量
+     */
+    private Integer oppendedNum;
+}

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.LantoneProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -222,7 +223,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param lantoneProductSelectVO 参数
      * @return 产品信息
      */
-    public RespDTO<IPage<LantoneProduct>> index(LantoneProductSelectVO lantoneProductSelectVO) {
+    public RespDTO<IPage<LantoneProductDTO>> index(LantoneProductSelectVO lantoneProductSelectVO) {
         Page page =new Page();
         if(lantoneProductSelectVO.getSize()==0){
             page.setSize(10l);
@@ -234,7 +235,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }else {
             page.setCurrent(lantoneProductSelectVO.getCurrent());
         }
-        IPage<LantoneProduct> res = this.selectProduct(page, lantoneProductSelectVO.getName());
+        IPage<LantoneProductDTO> res = this.selectProduct(page, lantoneProductSelectVO.getName());
         return RespDTO.onSuc(res);
     }
 }

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.LantoneProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
@@ -32,7 +33,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> selectProduct(Page page, @Param("name") String name);
+    IPage<LantoneProductDTO> selectProduct(Page page, @Param("name") String name);
 
     /**
      * @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.LantoneProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
@@ -31,7 +32,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> selectProduct(Page<LantoneProduct> page, String name);
+    IPage<LantoneProductDTO> selectProduct(Page<LantoneProduct> page, String name);
 
     /**
      * @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.LantoneProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
@@ -44,7 +45,7 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      * @Date: 17:05 2018/9/18
      */
     @Override
-    public IPage<LantoneProduct> selectProduct(Page<LantoneProduct> page, String name) {
+    public IPage<LantoneProductDTO> selectProduct(Page<LantoneProduct> page, String name) {
         return baseMapper.selectProduct(page, name);
     }
 

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

@@ -3,8 +3,8 @@ 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.RespDTO;
-import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
@@ -52,10 +52,11 @@ public class DiagLantoneProductController {
 
     @ApiOperation(value = "产品线管理——查询[by:wangyu]",
             notes = "name：添加后则根据产品名称查询，选填<br>" +
-                    "根据每页显示条数，默认 10，和当前页<br>")
+                    "根据每页显示条数，默认 10，和当前页<br>" +
+                    "oppendedNum:开通机构数量")
     @PostMapping("/selectProduct")
     @SysLogger("selectProduct")
-    public RespDTO<IPage<LantoneProduct>> selectProduct(@RequestBody LantoneProductSelectVO lantoneProductSelectVO) {
+    public RespDTO<IPage<LantoneProductDTO>> selectProduct(@RequestBody LantoneProductSelectVO lantoneProductSelectVO) {
         return lantoneProductFacade.index(lantoneProductSelectVO);
     }
 

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

@@ -49,8 +49,29 @@
     </select>
 
     <!--根据产品名称分页查询-->
-    <select id="selectProduct" resultMap="BaseResultMap">
-        SELECT * from diag_lantone_product p WHERE p.is_deleted ='N' and service_status = 1
+    <select id="selectProduct" resultType="com.diagbot.dto.LantoneProductDTO">
+        SELECT
+        p.id,
+        p.gmt_create,
+        p.creator,
+        p.`name`,
+        p.decription,
+        p.charge_type,
+        p.url,
+        p.service_status,
+        p.trial_status,
+        p.trial_url,
+        p.access_type,
+        (
+        SELECT
+        COUNT(1)
+        FROM
+        diag_opened_products o
+        WHERE
+        p.id = o.product_id
+        ) oppended_num
+        FROM
+        `diag_lantone_product` p WHERE p.is_deleted ='N'
         <if test="name != null and name != ''">
             AND p.name LIKE concat ('%',#{name},'%')
         </if>