服务端管理

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

@@ -2,7 +2,6 @@ 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;
@@ -15,16 +14,14 @@ 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.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 /**
  * @Description:产品与用户端关联业务层
@@ -42,6 +39,11 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
 
+    /**
+     * @Description:建立产品服务端关联并生成令牌
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
     public ProductServiceRespDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
@@ -123,6 +125,11 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         return productServiceRespDTO;
     }
 
+    /**
+     * @Description:删除产品服务端关联，级联删除令牌
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
     public ProductServiceRespDTO deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceRespDTO productServiceRespDTO = new ProductServiceRespDTO();
         Calendar calendar = Calendar.getInstance();
@@ -143,18 +150,28 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         return productServiceRespDTO;
     }
 
-    public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page) {
+    /**
+     * @Description:获取当前用户产品服务关联列表
+     * @author: zhaops
+     * @time: 2018/9/18 16:33
+     */
+    public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        ProductServiceWrapper productServiceVO=new ProductServiceWrapper();
+        ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServiceByUserIdPage(page, productServiceVO);
         List<ProductServiceWrapper> psList = psPage.getRecords();
         for (ProductServiceWrapper productService : psList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("userId", userId);
+            map.put("productId", productService.getProductId());
             LantoneProduct lantoneProduct = lantoneProductFacade.getById(productService.getProductId());
-            //OpenedProducts openedProducts=openedProductsFacade.
+            List<OpenedProducts> openedProductsList = openedProductsFacade.selectOpenedProducts(map);
+            OpenedProducts openedProducts = openedProductsList.size() == 0 ? null : openedProductsList.get(0);
             ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
             ServiceToken serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
             productService.setLantoneProduct(lantoneProduct);
+            productService.setOpenedProducts(openedProducts);
             productService.setServiceInfo(serviceInfo);
             productService.setServiceToken(serviceToken);
         }

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

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.OpenedProducts;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 Mapper 接口
@@ -21,4 +24,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     IPage<OpenedProducts> selectOpendInfoByUserId(Page page, @Param("userId") int userId);
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    List<OpenedProducts> selectOpenedProducts(Map<String,Object>map);
 }

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.entity.OpenedProducts;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 服务类
@@ -20,4 +23,11 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @return
      */
     IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId);
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    List<OpenedProducts> selectOpenedProducts(Map<String,Object> map);
 }

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

@@ -8,6 +8,9 @@ import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 已开通产品 服务实现类
@@ -22,4 +25,13 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     public IPage<OpenedProducts> selectOpendInfoByUserId(Page<OpenedProducts> page, int userId) {
         return baseMapper.selectOpendInfoByUserId(page,userId);
     }
+
+    /**
+     * 查询已开通产品
+     * @param map 查询条件
+     * @return
+     */
+    public List<OpenedProducts> selectOpenedProducts(Map<String,Object> map){
+        return baseMapper.selectOpenedProducts(map);
+    }
 }

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

@@ -64,7 +64,7 @@ public class ProductServiceController {
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")
     public RespDTO getProductServiceByCurrentUser(Page page) {
-        IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByUserIdPage(page);
+        IPage<ProductServiceWrapper> psPage = productServiceFacade.selectProductServiceByCurrentUserPage(page);
         return RespDTO.onSuc(psPage);
     }
 }

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

@@ -20,4 +20,14 @@
     <select id="selectOpendInfoByUserId" resultMap="BaseResultMap" parameterType="java.util.List">
         SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}
     </select>
+
+    <select id="selectOpenedProducts" resultMap="BaseResultMap" parameterMap="java.util.Map">
+        SELECT t.* FROM diag_opened_products t WHERE t.is_deleted='N'
+        <if test="userId != null and userId != ''">
+        and t.user_id = #{userId}
+        </if>
+        <if test="productId != null and productId != ''">
+        and t.product_id=#{productId}
+        </if>
+    </select>
 </mapper>