#

Junjie

2024-06-19 13df2deb28425b6ada403469bfaae0e2a4a3c02e

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

@@ -42,6 +42,20 @@
    @Autowired
    private TreeUtils treeUtils;


    @RequestMapping(value = "/tag/list/pda/auth")
    @ManagerAuth
    public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
                     @RequestParam(defaultValue = "10")Integer limit,
                     @RequestParam(required = false)Long parentId){
        LambdaQueryWrapper<Tag> tagLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(!Cools.isEmpty(parentId)) {
            tagLambdaQueryWrapper.eq(Tag::getParentId, parentId == null ? getOriginTag().getId() : parentId);
        }
        List<Tag> tags = tagService.list(tagLambdaQueryWrapper);
        return R.ok().add(tags);
    }

    @RequestMapping(value = "/tag/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
@@ -50,26 +64,24 @@

    @RequestMapping(value = "/tag/page/auth")
    @ManagerAuth
    public R page(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false) String timeRange) {
    public R page(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param) {
        Long hostId = getHostId();
        LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Tag::getId, condition);
        }
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge(Tag::getCreateTime, DateUtils.convert(range[0]));
            wrapper.le(Tag::getCreateTime, DateUtils.convert(range[1]));
        }
        return R.ok(tagService.page(new Page<>(curr, limit), wrapper));
        wrapper.eq(Tag::getHostId, hostId);
        excludeTrash(param);
        return R.parse("0-操作成功").add(tagService.list(wrapper));
    }


    @RequestMapping(value = "/tag/add/auth")
    @ManagerAuth
    public R add(Tag tag) {
        tag.setHostId(getHostId());
        tag.setStatus(1);
        tagService.save(tag);
        return R.ok();
    }
@@ -124,7 +136,7 @@
    @PostMapping(value = "/tag/tree/auth")
    @ManagerAuth
    public R tree(@RequestParam(required = false, defaultValue = "") String condition) throws IOException, ClassNotFoundException {
        ArrayList<Map> tree = treeUtils.getTree(String.valueOf(getOriginTag().getId()));
        ArrayList<Map> tree = treeUtils.getTree(getOriginTag().getId(), getHostId());
        // 深拷贝
        List<Map> result = ListUtils.deepCopy(tree);
        if (!Cools.isEmpty(condition)) {
@@ -177,6 +189,15 @@
            print.setSpecs(mat.getSpecs());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());

            print.setMaterial(mat.getMaterial());
            print.setDecrees(mat.getDecrees());
            print.setImgNum(mat.getImgNum());
            print.setWeight(String.valueOf(mat.getWeight()));
            print.setModel(mat.getModel());
            print.setLength(String.valueOf(mat.getLength()));
            print.setWidth(mat.getWidth());
            print.setHeight(mat.getHeight());
            res.add(print);
        }
        return R.ok().add(res);
@@ -206,7 +227,7 @@
    @ManagerAuth(memo = "商品档案数据导入")
    @Transactional
    public R matExcelImport(MultipartFile file) throws IOException {
        MatExcelListener listener = new MatExcelListener(getUserId());
        MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
        EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
    }