shiyunteng
2026-06-15 6e492d4d16efff769c2928109fb6a085fcad948d
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -1,11 +1,15 @@
package com.by4cloud.platformx.business.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.Product;
@@ -21,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -77,26 +82,28 @@
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/list" )
    @PreAuthorize("@pms.hasPermission('business_product_view')" )
    @Inner(value = false)
    public R getProductList(@ParameterObject Product product) {
        return R.ok(productService.getProductList(product));
    }
    /**
     * 分页查询
     * @param product 产品信息
     * @param queryDTO 产品信息
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/listByParentId" )
    @PreAuthorize("@pms.hasPermission('business_product_view')" )
    //@Inner(value = false)
    public R getProductListByParentId(@ParameterObject Product product) {
        LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
        wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
        wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
        wrapper.last("limit 30");
        return R.ok(productService.listByScope(wrapper));
    public R getProductListByParentId(@ParameterObject ProductQueryDTO queryDTO) {
//        LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
//        wrapper.like(StrUtil.isNotEmpty(queryDTO.getProductName()),Product::getProductName,queryDTO.getProductName());
//        wrapper.eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId());
//      if (StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house")){
//         String[] erpCodes = new String[]{"房租租赁","dianli","water"};
//         wrapper.in(Product::getErpCode,erpCodes);
//         return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
//      }
//        return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
      return productService.getProductListByParentId(queryDTO);
    }
    /**
@@ -106,10 +113,9 @@
     */
    @Operation(summary = "层级查询" , description = "层级查询" )
    @GetMapping("/treeList" )
    //@PreAuthorize("@pms.hasPermission('business_product_view')" )
    @Inner(value = false)
    public R getNewsCategoryTree(@ParameterObject Product product) {
        return R.ok(productService.treeList(product.getParentId(), product.getProductName()));
        return R.ok(productService.treeList());
    }
@@ -135,6 +141,9 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_product_add')" )
    public R save(@RequestBody Product product) {
      if (ArrayUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())).toArray())){
         return R.failed("产品Erp编码已存在");
      }
        return R.ok(productService.save(product));
    }