修改

jinlin

2024-03-14 c531eac7903eaf92d343f086a391fb412cf368a6

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

@@ -12,9 +12,11 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
@@ -52,16 +54,14 @@
    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
        @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
        @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
        @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = "name", value = "名称", dataType = Constant.QT.STRING, format = "NAME^LK"),
        @ApiImplicitParam(name = "nodeType", value = "节点类型", dataType = Constant.QT.STRING, format = "node_type^EQ"),
        @ApiImplicitParam(name = "pid", value = "上级ID", dataType = Constant.QT.STRING)
    })
    public PageResult<XhProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
        return PageResult.ok(xhProductModelService.page(queryFilter));
    public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
        return Result.ok(xhProductModelService.page(queryFilter));
    }

    @GetMapping("tree")
@@ -71,26 +71,20 @@
        return Result.ok(list);
    }

    @GetMapping("getProduct")
    public Result<List<ProductImg>> getProduct(Long productId) {

        List<ProductImg> list = xhProductModelService.getProduct(productId);

        return Result.ok(list);
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<XhProductModel> get(@PathVariable("id") Long id){
        XhProductModel data = xhProductModelService.get(id);
        Long busid = null;
        String fileName = "";
        if (StringUtils.isNotBlank(data.getOperationalStatus())&&sysOssService.get(Long.parseLong(data.getOperationalStatus()))!=null){
            busid =sysOssService.get(Long.parseLong(data.getOperationalStatus())).getBusiId();
            fileName =sysPictureBaseService.get(busid).getName();
            data.setOperationalStatus(fileName);
        }
        if (StringUtils.isNotBlank(data.getStandbyState())&&sysOssService.get(Long.parseLong(data.getStandbyState()))!=null){
            busid =sysOssService.get(Long.parseLong(data.getStandbyState())).getBusiId();
            fileName =sysPictureBaseService.get(busid).getName();
            data.setStandbyState(fileName);
        }
        if (StringUtils.isNotBlank(data.getFaultState())&&sysOssService.get(Long.parseLong(data.getFaultState()))!=null){
            busid =sysOssService.get(Long.parseLong(data.getFaultState())).getBusiId();
            fileName =sysPictureBaseService.get(busid).getName();
            data.setFaultState(fileName);
        if (data.getOperatImg() != null) {
            data.setOperatImgName(sysPictureBaseService.get(data.getOperatImg()).getName());
        }
        return Result.ok(data);
    }
@@ -120,6 +114,7 @@
        for(XhProductModel xhProductModel:list){
            xhProductModel.setSrcId(xhProductModel.getId());
            xhProductModel.setId(null);
            xhProductModel.setProductType(xhProductModel.getNodeType());
            this.insert(xhProductModel);
        }
        return Result.ok();