修改

jinlin

2024-09-26 7686039d6fcdf7dc4d1fdde3758bd98ff9646f2a

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

@@ -6,6 +6,7 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.utils.UUIDUtil;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
@@ -13,8 +14,10 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.core.service.ZtProductService;
import com.zt.life.dto.ImportErrDto;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.ParamDataService;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.life.util.ImportUtil;
@@ -49,6 +52,9 @@
    @Autowired
    private SysPictureBaseService sysPictureBaseService;

    @Autowired
    private ParamDataService paramDataService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -63,8 +69,8 @@
    }

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

        return Result.ok(list);
    }
@@ -100,10 +106,10 @@
    @PostMapping("importProductExcel")
    @ApiOperation("导入产品模型")
    @LogOperation("导入产品模型")
    public Result importProductExcel(MultipartFile file, String progressId,Long pid) {
    public Result importProductExcel(MultipartFile file, String progressId, Long pid) {
        Result<List<ImportErrDto>> result = Result.ok();
        try {
            List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file,progressId,pid);
            List<Map<String, Object>> importResults = xhProductModelService.importProductExcel(file, progressId, pid);
            StringBuilder str = new StringBuilder();
            ImportUtil.importResult(result, importResults, str);
            ImportUtil.ImportErrResult(result, importResults, str);
@@ -122,10 +128,22 @@
        //效验数据
        ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);

        Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
        if (xhProductModel.getSort() < no) {
        Integer no = xhProductModelService.getNo(xhProductModel.getPid(), xhProductModel.getProductType());
        if (xhProductModel.getSort() == null || xhProductModel.getSort() < no) {
            xhProductModel.setSort(no + 1);
        }
        if (xhProductModel.getProductType().equals("2")){
            Long id = UUIDUtil.generateId();
            xhProductModel.setId(id);
            xhProductModel.setShipId(id);

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

            paramDataService.insert(data);
        }

        xhProductModelService.insert(xhProductModel);

        return Result.ok();
@@ -138,6 +156,11 @@
            xhProductModel.setId(null);
            xhProductModel.setSort(xhProductModel.getSort());
            xhProductModel.setProductType(xhProductModel.getNodeType());
            if (xhProductModel.getNamePath()==null){
                xhProductModel.setNamePath(xhProductModel.getName());
            }else{
                xhProductModel.setNamePath(xhProductModel.getNamePath()+","+xhProductModel.getName());
            }
            this.insert(xhProductModel);
        }
        return Result.ok();
@@ -160,9 +183,25 @@
    public Result delete(@RequestBody Long[] ids) {
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        xhProductModelService.delete(ids);
        this.deleteByProduct(ids);

        return Result.ok();
    }

    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")){
                xhProductModelService.deleteLogic(id);
              /*  List<Long> list =xhProductModelService.getByPid(id);
                Long[] L = list.stream().toArray(Long[]::new);*/
                Long[] list =xhProductModelService.getByPid(id);
                this.deleteByProduct(list);
            }else if(data.getProductType().equals("2")){
                xhProductModelService.deleteByShipId(data.getShipId());
            }else if(data.getProductType().equals("5")){
                xhProductModelService.deleteLogic(id);
            }
        }
    }
}