#

Junjie

2023-12-21 29bc0e7f8558a5c053958ad63005363ded9f4f8b

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

@@ -1,11 +1,9 @@
package com.zy.asrs.wms.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.ManMat;
import com.zy.asrs.common.wms.service.ManMatService;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -21,12 +19,12 @@
public class ManMatController extends BaseController {

    @Autowired
    private ManMatService manMatService;
    private MatService matService;

    @RequestMapping(value = "/manMat/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") Long id) {
        return R.ok(manMatService.getById(id));
        return R.ok(matService.getById(id));
    }

    @RequestMapping(value = "/manMat/page/auth")
@@ -35,33 +33,33 @@
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false) String timeRange) {
        LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(ManMat::getId, condition);
            wrapper.like(Mat::getId, condition);
        }
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge(ManMat::getCreateTime, DateUtils.convert(range[0]));
            wrapper.le(ManMat::getCreateTime, DateUtils.convert(range[1]));
            wrapper.ge(Mat::getCreateTime, DateUtils.convert(range[0]));
            wrapper.le(Mat::getCreateTime, DateUtils.convert(range[1]));
        }
        return R.ok(manMatService.page(new Page<>(curr, limit), wrapper));
        return R.ok(matService.page(new Page<>(curr, limit), wrapper));
    }


    @RequestMapping(value = "/manMat/add/auth")
    @ManagerAuth
    public R add(ManMat manMat) {
        manMatService.save(manMat);
    public R add(Mat mat) {
        matService.save(mat);
        return R.ok();
    }

   @RequestMapping(value = "/manMat/update/auth")
   @ManagerAuth
    public R update(ManMat manMat){
        if (Cools.isEmpty(manMat) || null==manMat.getId()){
    public R update(Mat mat){
        if (Cools.isEmpty(mat) || null== mat.getId()){
            return R.error();
        }
        manMatService.updateById(manMat);
        matService.updateById(mat);
        return R.ok();
    }

@@ -69,7 +67,7 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            manMatService.removeById(id);
            matService.removeById(id);
        }
        return R.ok();
    }
@@ -77,14 +75,14 @@
    @RequestMapping(value = "/manMatQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
        wrapper.like(ManMat::getId, condition);
        Page<ManMat> page = manMatService.page(new Page<>(0, 10), wrapper);
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
        wrapper.like(Mat::getId, condition);
        Page<Mat> page = matService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (ManMat manMat : page.getRecords()){
        for (Mat mat : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", manMat.getId());
            map.put("value", manMat.getId());
            map.put("id", mat.getId());
            map.put("value", mat.getId());
            result.add(map);
        }
        return R.ok(result);
@@ -94,11 +92,11 @@
    @ManagerAuth
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();
        LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(ManMat::getId, condition);
            wrapper.like(Mat::getId, condition);
        }
        manMatService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
        matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
        return R.ok().add(vos);
    }