代码优化

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

@@ -8,10 +8,6 @@ import com.diagbot.entity.ProductService;
  * @time: 2018/9/19 16:06
  */
 public class ProductServiceWrapper extends ProductService {
-    /*private LantoneProduct lantoneProduct;
-    private OpenedProducts openedProducts;
-    private ServiceInfo serviceInfo;*/
-    /*private ServiceToken serviceToken;*/
     private Long userId;
 
     /**
@@ -74,12 +70,4 @@ public class ProductServiceWrapper extends ProductService {
     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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ProductServiceDTO;
 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;
@@ -18,7 +17,6 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ProductServiceServiceImpl;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
@@ -26,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:产品与用户端关联业务层
@@ -165,40 +161,9 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
      */
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        //当前登录用户服务端列表
-        /*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");*/
-        //服务令牌列表
-        /*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<>();
-        qwProduct.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<LantoneProduct> lantoneProductList = lantoneProductFacade.list(qwProduct);
-        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");*/
-        //当前用户开通的产品列表
-       /* 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");*/
-
         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.setOpenedProducts(openedProductData.get(productService.getProductId()));
-            productService.setServiceInfo(serviceData.get(productService.getServiceId()));
-            productService.setServiceToken(tokenData.get(productService.getId()));
-        }
-        psPage.setRecords(psList);*/
         return psPage;
     }
 }