修改

jinlin

2024-03-14 b09b6361f6348c22d2d02f99391ca76350b45102

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

@@ -54,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")
@@ -85,22 +83,8 @@
    @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);
    }