修改空板移库，任务完成后无法加入历史档问题

skyouc

1 天以前 7d27cdccf8b92f32e80499f1f06c4b8ab93936c1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
package com.vincent.rsf.server.manager.controller;
 
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
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.manager.entity.BasDevice;
import com.vincent.rsf.server.manager.service.BasDeviceService;
import com.vincent.rsf.server.system.controller.BaseController;
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.*;
 
@RestController
public class BasDeviceController extends BaseController {
 
    @Autowired
    private BasDeviceService basDeviceService;
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @PostMapping("/basDevice/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<BasDevice, BaseParam> pageParam = new PageParam<>(baseParam, BasDevice.class);
        return R.ok().add(basDeviceService.page(pageParam, pageParam.buildWrapper(true)));
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @PostMapping("/basDevice/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(basDeviceService.list());
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @PostMapping({"/basDevice/many/{ids}", "/basDevices/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(basDeviceService.listByIds(Arrays.asList(ids)));
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @GetMapping("/basDevice/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(basDeviceService.getById(id));
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:save')")
    @OperationLog("Create 基础设备表")
    @PostMapping("/basDevice/save")
    public R save(@RequestBody BasDevice basDevice) {
        basDevice.setCreateBy(getLoginUserId());
        basDevice.setCreateTime(new Date());
        basDevice.setUpdateBy(getLoginUserId());
        basDevice.setUpdateTime(new Date());
        if (!basDeviceService.save(basDevice)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(basDevice);
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:update')")
    @OperationLog("Update 基础设备表")
    @PostMapping("/basDevice/update")
    public R update(@RequestBody BasDevice basDevice) {
        basDevice.setUpdateBy(getLoginUserId());
        basDevice.setUpdateTime(new Date());
        if (!basDeviceService.updateById(basDevice)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(basDevice);
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:remove')")
    @OperationLog("Delete 基础设备表")
    @PostMapping("/basDevice/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!basDeviceService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @PostMapping("/basDevice/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<BasDevice> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(BasDevice::getId, condition);
        }
        basDeviceService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
    }
 
    @PreAuthorize("hasAuthority('manager:basDevice:list')")
    @PostMapping("/basDevice/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(basDeviceService.list(), BasDevice.class), response);
    }
 
}