#getter$摘出entity

zhou zhou

2 天以前 1dcfa3702505f0c431757312b5304531029f90f6

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

@@ -15,7 +15,9 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +29,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.*;

@RestController
@@ -37,41 +39,38 @@

    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private LocService locService;
    @Autowired
    private ConfigServiceImpl configService;


    /** 分页查询任务列表，并根据 mission_flow_step_instance 判断每条是否可点完成（canComplete），供前端展示完成按钮 */
    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
        return R.ok().add(taskService.page(pageParam, queryWrapper));
        Page<Task> pageResult = taskService.page(pageParam, queryWrapper);
        taskService.fillCanComplete(pageResult.getRecords());
        return R.ok().add(buildPageRowsUtils.rowsMap(pageResult));
    }

    /** 查询任务列表，同样根据 flowStepInstance 填充 canComplete */
    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskService.list());
        List<Task> list = taskService.list();
        taskService.fillCanComplete(list);
        return R.ok().add(buildPageRowsUtils.rowsMap(list));
    }

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

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

    @PreAuthorize("hasAuthority('manager:task:save')")
@@ -85,31 +84,30 @@
        if (!taskService.save(task)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(task);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(task));
    }

    @PreAuthorize("hasAuthority('manager:task:update')")
    @OperationLog("Update 任务工作档")
    @PostMapping("/task/update")
    public R update(@RequestBody Task task) {
        OptimisticLockUtils.requireVersion("任务", task.getVersion());
        task.setUpdateBy(getLoginUserId());
        task.setUpdateTime(new Date());
        if (!taskService.updateById(task)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(task);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(task));
    }

    @PreAuthorize("hasAuthority('manager:task:remove')")
    @OperationLog("取消/删除工作极档")
    @ApiOperation("取消/删除工作极档")
    @ApiOperation("取消/删除工作档")
    @PostMapping("/task/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("参数不能为空！！");
        }
        return taskService.removeTask(ids, getLoginUserId());
//        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -123,13 +121,13 @@
        taskService.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:task:list')")
    @PostMapping("/task/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(taskService.list()), Task.class), response);
    }

    @PreAuthorize("hasAuthority('manager:task:update')")
@@ -139,9 +137,8 @@
        if (Cools.isEmpty(id)) {
            throw new CoolException("参数不能为空！！");
        }
        return R.ok("完成任务成功").add(taskService.operateComplete(id, getLoginUserId()));
        return R.ok("完成任务成功").add(buildPageRowsUtils.rowsMap(taskService.operateComplete(id, getLoginUserId())));
    }


    /**
     * 拣料出库（用于测试拣料出库）
@@ -155,7 +152,7 @@
            throw new CoolException("能数不能为空！！");
        }
        try {
            return R.ok("出库完成").add(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK));
            return R.ok("出库完成").add(buildPageRowsUtils.rowsMap(taskService.pickOrCheckTask(id, Constants.TASK_TYPE_OUT_PICK)));
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }