增加注解,删除单表查询方法

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

@@ -1,5 +1,7 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ProductServiceDTO;
@@ -44,9 +46,10 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     private OpenedProductsFacade openedProductsFacade;
 
     /**
-     * @Description:建立产品服务端关联并生成令牌
-     * @author: zhaops
-     * @time: 2018/9/18 16:33
+     * 建立产品服务端关联并生成令牌
+     *
+     * @param productServiceSaveVO
+     * @return
      */
     public ProductServiceDTO genProductService(ProductServiceSaveVO productServiceSaveVO) {
         ProductServiceDTO productServiceDTO = new ProductServiceDTO();
@@ -66,10 +69,11 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
                     "当前登录用户没有关联服务端【" + serviceInfo.getName() + "】");
         }
 
-        Map<String, Object> map = new HashMap<>();
-        map.put("productId", productServiceSaveVO.getProductId());
-        map.put("serviceId", productServiceSaveVO.getServiceId());
-        ProductService productService = this.findByProductIdAndServiceId(map);
+        QueryWrapper<ProductService> qwps = new QueryWrapper<>();
+        qwps.eq("product_id", productServiceSaveVO.getProductId());
+        qwps.eq("service_id", productServiceSaveVO.getServiceId());
+        qwps.eq("is_deleted", "N");
+        ProductService productService = this.getOne(qwps);
         if (productService == null) {
             productService = new ProductService();
             productService.setProductId(productServiceSaveVO.getProductId());
@@ -120,15 +124,17 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     }
 
     /**
-     * @Description:删除产品服务端关联，级联删除令牌
-     * @author: zhaops
-     * @time: 2018/9/18 16:33
+     * 删除产品服务端关联，级联删除令牌
+     *
+     * @param productServiceSaveVO
+     * @return
      */
     public Boolean deleteProductService(ProductServiceSaveVO productServiceSaveVO) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("productId", productServiceSaveVO.getProductId());
-        map.put("serviceId", productServiceSaveVO.getServiceId());
-        ProductService productService = this.findByProductIdAndServiceId(map);
+        QueryWrapper<ProductService> qwps = new QueryWrapper<>();
+        qwps.eq("product_id", productServiceSaveVO.getProductId());
+        qwps.eq("service_id", productServiceSaveVO.getServiceId());
+        qwps.eq("is_deleted", "N");
+        ProductService productService = this.getOne(qwps);
         if (productService == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "找不到产品服务端");
@@ -136,38 +142,43 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         //删除关联令牌
         serviceTokenFacade.deleteByProductServiceId(productService.getId());
         //删除产品服务端
-        this.delById(productService.getId());
+        UpdateWrapper<ProductService> uwps = new UpdateWrapper<>();
+        productService.setIsDeleted("Y");
+        this.updateById(productService);
+        //this.delById(productService.getId());
         return true;
     }
 
+
     /**
-     * @Description:获取当前用户产品服务关联列表
-     * @author: zhaops
-     * @time: 2018/9/18 16:33
+     * 获取当前用户产品服务关联列表
+     *
+     * @param page
+     * @return
      */
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         //当前登录用户服务端列表
-        Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("is_deleted", "N");
-        columnMap.put("user_id", userId);
-        List<ServiceInfo> serviceInfoList = (List) serviceInfoFacade.listByMap(columnMap);
+        QueryWrapper<ServiceInfo> qwService = new QueryWrapper<>();
+        qwService.eq("is_deleted", "N");
+        qwService.eq("user_id", userId);
+        List<ServiceInfo> serviceInfoList = serviceInfoFacade.list(qwService);
         Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");
         //服务令牌列表
-        columnMap.clear();
-        columnMap.put("is_deleted", "N");
-        List<ServiceToken> serviceTokenList = (List) serviceTokenFacade.listByMap(columnMap);
+        QueryWrapper<ServiceToken> qwToken = new QueryWrapper<>();
+        qwToken.eq("is_deleted", "N");
+        List<ServiceToken> serviceTokenList = serviceTokenFacade.list(qwToken);
         Map<Long, ServiceToken> tokenData = EntityUtil.makeEntityMap(serviceTokenList, "productServiceId");
         //产品列表
-        columnMap.clear();
-        columnMap.put("is_deleted", "N");
-        List<LantoneProduct> lantoneProductList = (List) lantoneProductFacade.listByMap(columnMap);
+        QueryWrapper<LantoneProduct> qwProduct = new QueryWrapper<>();
+        qwProduct.eq("is_deleted", "N");
+        List<LantoneProduct> lantoneProductList = lantoneProductFacade.list(qwProduct);
         Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");
         //当前用户开通的产品列表
-        columnMap.clear();
-        columnMap.put("is_deleted", "N");
-        columnMap.put("user_id", userId);
-        List<OpenedProducts> openedProductsList = (List) openedProductsFacade.listByMap(columnMap);
+        QueryWrapper<OpenedProducts> qwOpenedProducts = new QueryWrapper<>();
+        qwOpenedProducts.eq("is_deleted", "N");
+        qwOpenedProducts.eq("user_id", userId);
+        List<OpenedProducts> openedProductsList = openedProductsFacade.list(qwOpenedProducts);
         Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");
 
         ProductServiceWrapper productServiceVO = new ProductServiceWrapper();

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

@@ -4,13 +4,9 @@ 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.entity.ProductService;
-import com.diagbot.entity.User;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 服务端维护表 Mapper 接口
@@ -21,11 +17,5 @@ import java.util.Map;
  */
 public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
-    ProductService findByProductIdAndServiceId(Map<String, Object> map);
-
-    List<ProductService> findByProductId(Long productId);
-
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page page, @Param("productService") ProductServiceWrapper productService);
-
-    Integer delById(Long id);
 }

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

@@ -19,11 +19,6 @@ import java.util.Map;
  * @since 2018-09-17
  */
 public interface ProductServiceService extends IService<ProductService> {
-    ProductService findByProductIdAndServiceId(Map<String, Object> map);
-
-    List<ProductService> findByProductId(Long productId);
 
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService);
-
-    Integer delById(Long id);
 }

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

@@ -2,17 +2,13 @@ package com.diagbot.service.impl;
 
 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.entity.ProductService;
 import com.diagbot.entity.wrapper.ProductServiceWrapper;
 import com.diagbot.mapper.ProductServiceMapper;
 import com.diagbot.service.ProductServiceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 服务端维护表 服务实现类
@@ -23,19 +19,8 @@ import java.util.Map;
  */
 @Service
 public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper, ProductService> implements ProductServiceService {
-    public ProductService findByProductIdAndServiceId(Map<String, Object> map) {
-        return baseMapper.findByProductIdAndServiceId(map);
-    }
-
-    public List<ProductService> findByProductId(Long productId) {
-        return baseMapper.findByProductId(productId);
-    }
 
     public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService) {
         return baseMapper.selectProductServiceByUserIdPage(page, productService);
     }
-
-    public Integer delById(Long id) {
-        return baseMapper.delById(id);
-    }
 }

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

@@ -33,6 +33,11 @@ public class ProductServiceController {
     @Autowired
     private ProductServiceFacade productServiceFacade;
 
+    /**
+     * 服务端关联到产品接口
+     * @param productServiceSaveVO
+     * @return
+     */
     @ApiOperation(value = "服务端关联到产品接口[by:zhaops]",
             notes = "productId：产品Id，必填<br>" +
                     "serviceId：服务Id，必填<br> " +
@@ -45,6 +50,11 @@ public class ProductServiceController {
         return RespDTO.onSuc(productServiceDTO);
     }
 
+    /**
+     * 删除产品服务端
+     * @param productServiceSaveVO
+     * @return
+     */
     @ApiOperation(value = "删除产品服务端[by:zhaops]",
             notes = "productId：产品Id，必填<br>" +
                     "serviceId：服务Id，必填<br> " +
@@ -57,6 +67,11 @@ public class ProductServiceController {
         return RespDTO.onSuc(isSuccess);
     }
 
+    /**
+     * 根据用户id获取产品服务关联信息
+     * @param page
+     * @return
+     */
     @ApiOperation(value = "根据用户id获取产品服务关联信息[by:zhaops]", notes = "根据用户id获取产品服务关联信息")
     @PostMapping("/getProductServiceByCurrentUser")
     @SysLogger("getProductServiceByCurrentUser")

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

@@ -37,6 +37,11 @@ public class ServiceInfoController {
     @Autowired
     private ServiceInfoFacade serviceInfoFacade;
 
+    /**
+     * 新增服务
+     * @param serviceSaveVO
+     * @return
+     */
     @ApiOperation(value = "新增服务[by:zhaops]",
             notes = "name：产品名称，必填<br>" +
                     "description：产品简介，必填<br> ")
@@ -48,6 +53,11 @@ public class ServiceInfoController {
         return RespDTO.onSuc(serviceInfo);
     }
 
+    /**
+     * 修改服务
+     * @param serviceInfo
+     * @return
+     */
     @ApiOperation(value = "修改服务[by:zhaops]",
             notes = "id：id，必填<br>" +
                     "name：产品名称，必填<br>" +
@@ -61,6 +71,10 @@ public class ServiceInfoController {
         return RespDTO.onSuc(isSuccess);
     }
 
+    /**
+     * 获取当前登录用户的服务列表
+     * @return
+     */
     @ApiOperation(value = "获取当前登录用户的服务列表[by:zhaops]")
     @PostMapping("/getServiceListByCurrentUser")
     @SysLogger("getServiceListByCurrentUser")
@@ -70,6 +84,11 @@ public class ServiceInfoController {
         return RespDTO.onSuc(list);
     }
 
+    /**
+     * 获取当前登录用户的服务分页列表
+     * @param page
+     * @return
+     */
     @ApiOperation(value = "获取当前登录用户的服务分页列表[by:zhaops]")
     @PostMapping("/getServiceListPageByCurrentUser")
     @SysLogger("getServiceListPageByCurrentUser")

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

@@ -48,6 +48,11 @@ public class ServiceTokenController {
         return serviceTokenFacade.hasPermission(serviceTokenVo);
     }
 
+    /**
+     * 生成令牌
+     * @param productServiceSaveVO
+     * @return
+     */
     @ApiOperation(value = "生成令牌[by:zhaops]",
             notes = "productId：产品Id，必填<br>" +
                     "serviceId：服务Id，必填<br> ")
@@ -59,6 +64,11 @@ public class ServiceTokenController {
         return RespDTO.onSuc(productServiceDTO);
     }
 
+    /**
+     * 令牌禁用
+     * @param productServiceId
+     * @return
+     */
     @ApiOperation(value = "令牌禁用[by:zhaops]",
             notes = "productServiceId：产品服务id，必填<br>")
     @PostMapping("/disableToken")
@@ -69,6 +79,11 @@ public class ServiceTokenController {
         return RespDTO.onSuc(count);
     }
 
+    /**
+     * 令牌启用
+     * @param productServiceId
+     * @return
+     */
     @ApiOperation(value = "令牌启用[by:zhaops]",
             notes = "productServiceId：产品服务id，必填<br>")
     @PostMapping("/enableToken")
@@ -79,6 +94,11 @@ public class ServiceTokenController {
         return RespDTO.onSuc(count);
     }
 
+    /**
+     * 令牌删除
+     * @param productServiceId
+     * @return
+     */
     @ApiOperation(value = "令牌删除[by:zhaops]",
             notes = "productServiceId：产品服务id，必填<br>")
     @PostMapping("/deleteTokenByProductServiceId")

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

@@ -28,24 +28,10 @@
         <result column="remark" property="remark" />
     </resultMap>
 
-    <select id="findByProductIdAndServiceId" resultMap="BaseResultMap" parameterType="java.util.Map">
-        select * from diag_product_service
-        where product_id = #{productId} and service_id=#{serviceId} and is_deleted = 'N'
-    </select>
-
-    <select id="findByProductId" resultMap="BaseResultMap" parameterType="java.lang.Long">
-        select * from diag_product_service
-        where product_id = #{productId} and is_deleted = 'N'
-    </select>
-
     <select id="selectProductServiceByUserIdPage" resultMap="BaseResultWrapperMap">
         select a.* from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
         where a.product_id=b.product_id and a.product_id=d.id and a.service_id=c.id and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and b.service_status=1  and d.is_deleted='N'
         and b.user_id=#{productService.userId} and c.user_id=#{productService.userId} and (find_in_set('1',d.access_type) or FIND_IN_SET('2',d.access_type))
     </select>
 
-    <update id="delById" parameterType="java.lang.Long">
-        update diag_product_service set is_deleted='Y'
-        where id = #{id} and is_deleted = 'N'
-    </update>
 </mapper>