#getter$摘出entity

zhou zhou

2 天以前 691bee4229856f8bf81c2720092ecee1c9f21509

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

@@ -12,13 +12,12 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,7 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

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

@@ -43,6 +42,9 @@
    private WaitPakinItemService waitPakinItemService;

    @Autowired
    private BasStationService basStationService;

    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;
@@ -52,25 +54,26 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
        return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<WaitPakin, BaseParam> page = waitPakinService.page(pageParam, pageParam.buildWrapper(true));
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }

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

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

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

    @PreAuthorize("hasAuthority('manager:waitPakin:save')")
@@ -89,7 +92,7 @@
        if (!waitPakinService.save(waitPakin)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(waitPakin);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waitPakin));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -101,7 +104,7 @@
        if (!waitPakinService.updateById(waitPakin)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(waitPakin);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waitPakin));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:remove')")
@@ -112,6 +115,17 @@
        if (Arrays.asList(ids).isEmpty()) {
            return R.error("参数不能为空！！");
        }
        for (Long id : ids) {
            WaitPakin waitPakin = waitPakinService.getById(id);
            BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                            .eq(BasStation::getBarcode, waitPakin.getBarcode())
                    .last("LIMIT 1")
            );
            if (!Cools.isEmpty(isBarcodeSta)){
                throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定");
            }
        }

        return waitPakinService.removePakin(Arrays.asList(ids));
    }

@@ -126,13 +140,13 @@
        waitPakinService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }

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