no message

skyouc

2025-08-07 d52bab61f91056e75e60ddeda76a72cd1bd63615

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java

@@ -1,150 +1,154 @@
package com.zy.asrs.wms.asrs.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.service.WorkService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
import com.zy.asrs.wms.common.domain.PageParam;
import com.zy.asrs.wms.asrs.entity.Task;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@RestController
@RequestMapping("/api")
public class TaskController extends BaseController {

    @Autowired
    private TaskService taskService;
    @Autowired
    private WorkService workService;

    @PreAuthorize("hasAuthority('asrs: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);
        return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('asrs:task:list')")
    @PostMapping("/task/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskService.list());
    }

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

    @PreAuthorize("hasAuthority('asrs:task:list')")
    @GetMapping("/task/orderDetlId/{orderDetlId}")
    public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) {
        return R.ok().add(taskService.getByOrderDetlId(orderDetlId));
    }

    @PreAuthorize("hasAuthority('asrs:task:save')")
    @OperationLog("添加任务")
    @PostMapping("/task/save")
    public R save(@RequestBody Task task) {
        if (!taskService.save(task)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('asrs:task:update')")
    @OperationLog("修改任务")
    @PostMapping("/task/update")
    public R update(@RequestBody Task task) {
        if (!taskService.updateById(task)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('asrs:task:remove')")
    @OperationLog("删除任务")
    @PostMapping("/task/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!taskService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('asrs:task:list')")
    @PostMapping("/task/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Task::getId, condition);
        }
        taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
    }

    @PreAuthorize("hasAuthority('asrs: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);
    }

    @PreAuthorize("hasAuthority('asrs:task:update')")
    @OperationLog("完成任务")
    @PostMapping("/task/complete")
    public R complete(@RequestBody Task task) {
        try {
            boolean result = workService.completeTask(task.getId());
            return R.ok("完成成功");
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
        }
    }

    @PreAuthorize("hasAuthority('asrs:task:update')")
    @OperationLog("取消任务")
    @PostMapping("/task/cancel")
    public R cancel(@RequestBody Task task) {
        try {
            boolean result = workService.cancelTask(task.getId());
            return R.ok("取消成功");
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
        }
    }

    @PreAuthorize("hasAuthority('asrs:task:update')")
    @OperationLog("拣料任务")
    @PostMapping("/task/pick")
    public R pick(@RequestBody Task task) {
        try {
            boolean result = workService.pickTask(task.getId());
            return R.ok("拣料成功");
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
        }
    }

}
package com.zy.asrs.wms.asrs.controller;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.zy.asrs.framework.common.Cools;

import com.zy.asrs.framework.common.R;

import com.zy.asrs.wms.asrs.service.WorkService;

import com.zy.asrs.wms.common.annotation.OperationLog;

import com.zy.asrs.wms.common.domain.BaseParam;

import com.zy.asrs.wms.common.domain.KeyValVo;

import com.zy.asrs.wms.common.domain.PageParam;

import com.zy.asrs.wms.asrs.entity.Task;

import com.zy.asrs.wms.asrs.service.TaskService;

import com.zy.asrs.wms.system.controller.BaseController;

import com.zy.asrs.wms.utils.ExcelUtil;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.*;



import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;



@RestController

@RequestMapping("/api")

public class TaskController extends BaseController {



    @Autowired

    private TaskService taskService;

    @Autowired

    private WorkService workService;



    @PreAuthorize("hasAuthority('asrs: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);

        return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));

    }



    @PreAuthorize("hasAuthority('asrs:task:list')")

    @PostMapping("/task/list")

    public R list(@RequestBody Map<String, Object> map) {

        return R.ok().add(taskService.list());

    }



    @PreAuthorize("hasAuthority('asrs:task:list')")

    @GetMapping("/task/{id}")

    public R get(@PathVariable("id") Long id) {

        return R.ok().add(taskService.getById(id));

    }



    @PreAuthorize("hasAuthority('asrs:task:list')")

    @GetMapping("/task/orderDetlId/{orderDetlId}")

    public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) {

        return R.ok().add(taskService.getByOrderDetlId(orderDetlId));

    }



    @PreAuthorize("hasAuthority('asrs:task:save')")

    @OperationLog("添加任务")

    @PostMapping("/task/save")

    public R save(@RequestBody Task task) {

        if (!taskService.save(task)) {

            return R.error("添加失败");

        }

        return R.ok("添加成功");

    }



    @PreAuthorize("hasAuthority('asrs:task:update')")

    @OperationLog("修改任务")

    @PostMapping("/task/update")

    public R update(@RequestBody Task task) {

        if (!taskService.updateById(task)) {

            return R.error("修改失败");

        }

        return R.ok("修改成功");

    }



    @PreAuthorize("hasAuthority('asrs:task:remove')")

    @OperationLog("删除任务")

    @PostMapping("/task/remove/{ids}")

    public R remove(@PathVariable Long[] ids) {

        if (!taskService.removeByIds(Arrays.asList(ids))) {

            return R.error("删除失败");

        }

        return R.ok("删除成功");

    }



    @PreAuthorize("hasAuthority('asrs:task:list')")

    @PostMapping("/task/query")

    public R query(@RequestParam(required = false) String condition) {

        List<KeyValVo> vos = new ArrayList<>();

        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();

        if (!Cools.isEmpty(condition)) {

            wrapper.like(Task::getId, condition);

        }

        taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(

                item -> vos.add(new KeyValVo(item.getId(), item.getId()))

        );

        return R.ok().add(vos);

    }



    @PreAuthorize("hasAuthority('asrs:task:list')")

    @PostMapping("/task/export")

    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {

        BaseParam baseParam = buildParam(map, BaseParam.class);

        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);

        List<Task> data = taskService.list(pageParam.buildWrapper(true));



        ExcelUtil.build(ExcelUtil.create(data, Task.class), response);

    }



    @PreAuthorize("hasAuthority('asrs:task:update')")

    @OperationLog("完成任务")

    @PostMapping("/task/complete")

    public R complete(@RequestBody Task task) {

        try {

            boolean result = workService.completeTask(task.getId());

            return R.ok("完成成功");

        } catch (Exception e) {

            e.printStackTrace();

            return R.error(e.getMessage());

        }

    }



    @PreAuthorize("hasAuthority('asrs:task:update')")

    @OperationLog("取消任务")

    @PostMapping("/task/cancel")

    public R cancel(@RequestBody Task task) {

        try {

            boolean result = workService.cancelTask(task.getId());

            return R.ok("取消成功");

        } catch (Exception e) {

            e.printStackTrace();

            return R.error(e.getMessage());

        }

    }



    @PreAuthorize("hasAuthority('asrs:task:update')")

    @OperationLog("拣料任务")

    @PostMapping("/task/pick")

    public R pick(@RequestBody Task task) {

        try {

            boolean result = workService.pickTask(task.getId());

            return R.ok("拣料成功");

        } catch (Exception e) {

            e.printStackTrace();

            return R.error(e.getMessage());

        }

    }



}