修改RBD识别算法

xyc

2024-10-12 6e5cfe44f7d621a64ced0121d8fcb499c1db5e89

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java

@@ -69,8 +69,8 @@
    }

    @GetMapping("tree")
    public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow,Long productId) {
        List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow,productId);
    public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow, Long productId) {
        List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow, productId);

        return Result.ok(list);
    }
@@ -120,6 +120,15 @@
        return result;
    }

    @GetMapping("exportData")
    @ApiOperation("导出产品模型")
    @LogOperation("导出产品模型")
    public Result exportDataExcel(Long shipId) {
        xhProductModelService.exportDataExcel(shipId);

        return null;
    }


    @PostMapping
    @ApiOperation("新增")
@@ -132,12 +141,12 @@
        if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
            xhProductModel.setSort(no + 1);
        }
        if (xhProductModel.getProductType().equals("2")){
        if (xhProductModel.getProductType().equals("2")) {
            Long id = UUIDUtil.generateId();
            xhProductModel.setId(id);
            xhProductModel.setShipId(id);

            ParamData data =new ParamData();
            ParamData data = new ParamData();
            data.setShipId(id);
            data.setProductId(id);

@@ -156,10 +165,10 @@
            xhProductModel.setId(null);
            xhProductModel.setSort(xhProductModel.getSort());
            xhProductModel.setProductType(xhProductModel.getNodeType());
            if (xhProductModel.getNamePath()==null){
            if (xhProductModel.getNamePath() == null) {
                xhProductModel.setNamePath(xhProductModel.getName());
            }else{
                xhProductModel.setNamePath(xhProductModel.getNamePath()+","+xhProductModel.getName());
            } else {
                xhProductModel.setNamePath(xhProductModel.getNamePath() + "," + xhProductModel.getName());
            }
            this.insert(xhProductModel);
        }
@@ -188,18 +197,18 @@
        return Result.ok();
    }

    private void deleteByProduct(Long[] ids){
        for(Long id : ids){
    private void deleteByProduct(Long[] ids) {
        for (Long id : ids) {
            XhProductModel data = xhProductModelService.get(id);
            if (data.getProductType().equals("1")||data.getProductType().equals("3")||data.getProductType().equals("4")){
            if (data.getProductType().equals("1") || data.getProductType().equals("3") || data.getProductType().equals("4")) {
                xhProductModelService.deleteLogic(id);
              /*  List<Long> list =xhProductModelService.getByPid(id);
                Long[] L = list.stream().toArray(Long[]::new);*/
                Long[] list =xhProductModelService.getByPid(id);
                Long[] list = xhProductModelService.getByPid(id);
                this.deleteByProduct(list);
            }else if(data.getProductType().equals("2")){
            } else if (data.getProductType().equals("2")) {
                xhProductModelService.deleteByShipId(data.getShipId());
            }else if(data.getProductType().equals("5")){
            } else if (data.getProductType().equals("5")) {
                xhProductModelService.deleteLogic(id);
            }
        }