#getter$摘出entity

zhou zhou

2 天以前 691bee4229856f8bf81c2720092ecee1c9f21509

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java

@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@@ -39,25 +40,26 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        baseParam.setOrderBy("code asc");
        PageParam<MatnrGroup, BaseParam> pageParam = new PageParam<>(baseParam, MatnrGroup.class);
        return R.ok().add(matnrGroupService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<MatnrGroup, BaseParam> page = matnrGroupService.page(pageParam, pageParam.buildWrapper(true));
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(matnrGroupService.list());
        return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.list()));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping({"/matnrGroup/many/{ids}", "/matnrGroups/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(matnrGroupService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.listByIds(Arrays.asList(ids))));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @GetMapping("/matnrGroup/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(matnrGroupService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(matnrGroupService.getById(id)));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:save')")
@@ -65,29 +67,28 @@
    @PostMapping("/matnrGroup/save")
    public R save(@RequestBody MatnrGroup matnrGroup) {
        if (Objects.isNull(matnrGroup)) {
            throw new CoolException("参数不能为空！！");
            return R.error("参数不能为空！！");
        }

        if (Objects.isNull(matnrGroup.getName())) {
            throw new CoolException("分组名称不能为空！！");
            return R.error("分组名称不能为空！！");
        }
        if (Objects.isNull(matnrGroup.getCode())) {
            throw new CoolException("分组编码不能为空！！");
        }
        if (Objects.isNull(matnrGroup.getParCode())) {
            throw new CoolException("上级编码不能为空！!");
            return R.error("分组编码不能为空！！");
        }
        matnrGroup.setCreateBy(getLoginUserId());
        matnrGroup.setUpdateBy(getLoginUserId());

        List<MatnrGroup> list = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                .eq(MatnrGroup::getCode, matnrGroup.getCode()));
        if (!list.isEmpty()) {
            throw new CoolException("物料分组编码不能重复！！");
            return R.error("物料分组编码不能重复！！");
        }
        List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                .eq(MatnrGroup::getName, matnrGroup.getName()));
        if (!groups.isEmpty()) {
            throw new CoolException("分组已存在，请勿重复添加！！");
            return R.error("分组已存在，请勿重复添加！！");
        }
        //判断上级编码是否为空
        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
@@ -96,37 +97,38 @@
        if (!matnrGroupService.save(matnrGroup)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(matnrGroup);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(matnrGroup));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:update')")
    @OperationLog("Update 物料分类表")
    @PostMapping("/matnrGroup/update")
    public R update(@RequestBody MatnrGroup matnrGroup) {

        matnrGroup.setUpdateBy(getLoginUserId());
        MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
        if (Objects.isNull(matGroup)) {
            return R.error("物料分组不存在！！");
        }
        if (!matnrGroup.getName().equals(matGroup.getName())) {
            List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName()));
            if (!areasList.isEmpty()) {
                throw new CoolException("仓库名已存在！！");
                return R.error("仓库名已存在！！");
            }
        }
        if (!matnrGroup.getCode().equals(matGroup.getCode())) {
            List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getCode, matnrGroup.getCode()));
        if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
            List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
                            .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
                    .eq(MatnrGroup::getCode, matnrGroup.getCode()));
            if (!areasList.isEmpty()) {
                throw new CoolException("仓库编码已存在！！");
                return R.error("仓库编码已存在！！");
            }
        }

        //判断上级编码是否为空
        if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
            matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
        }

        if (!matnrGroupService.updateById(matnrGroup)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(matnrGroup);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(matnrGroup));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:remove')")
@@ -136,7 +138,7 @@
        if (!matnrGroupService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@@ -150,7 +152,7 @@
        matnrGroupService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@@ -161,14 +163,14 @@
        }
        List<MatnrGroup> matnrs = matnrGroupService.getTreeData(map);

        return R.ok().add(matnrs);
        return R.ok().add(buildPageRowsUtils.rowsMap(matnrs));
    }


    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(matnrGroupService.list(), MatnrGroup.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(matnrGroupService.list()), MatnrGroup.class), response);
    }

}