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

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

@@ -138,7 +138,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         //删除关联令牌
         serviceTokenFacade.deleteByProductServiceId(productService.getId());
         //删除产品服务端
-        this.deleteById(productService.getId());
+        this.delById(productService.getId());
         productServiceRespDTO.setMsg("删除成功！");
         return productServiceRespDTO;
     }

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

@@ -27,5 +27,5 @@ public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page page, @Param("productService") ProductServiceWrapper productService);
 
-    Integer deleteById(Long id);
+    Integer delById(Long id);
 }

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

@@ -25,5 +25,5 @@ public interface ProductServiceService extends IService<ProductService> {
 
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService);
 
-    Integer deleteById(Long id);
+    Integer delById(Long id);
 }

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

@@ -35,7 +35,7 @@ public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper,
         return baseMapper.selectProductServiceByUserIdPage(page, productService);
     }
 
-    public Integer deleteById(Long id) {
-        return baseMapper.deleteById(id);
+    public Integer delById(Long id) {
+        return baseMapper.delById(id);
     }
 }

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

@@ -44,7 +44,7 @@
         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="deleteById" parameterType="java.lang.Long">
+    <update id="delById" parameterType="java.lang.Long">
         update diag_product_service set is_deleted='Y'
         where id = #{id} and is_deleted = 'N'
     </update>