#

Junjie

2024-07-09 0b86f0390c17ca06758cc436596774e56687a875

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
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.entity.MatField;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +23,7 @@
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;
import java.util.*;

@RestController
@RequestMapping("/api")
@@ -28,13 +31,40 @@

    @Autowired
    private MatService matService;
    @Autowired
    private MatFieldService matFieldService;

    @PreAuthorize("hasAuthority('asrs:mat:list')")
    @PostMapping("/mat/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class);
        return R.ok().add(matService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<Mat, BaseParam> page = matService.page(pageParam, pageParam.buildWrapper(true));

        JSONObject data = JSON.parseObject(JSON.toJSONString(page));

        ArrayList<JSONObject> list = new ArrayList<>();
        data.put("records", list);
        List<Mat> records = page.getRecords();
        for (Mat record : records) {
            JSONObject tmp = JSON.parseObject(JSON.toJSONString(record));
            String extend = record.getExtend();
            if (!Cools.isEmpty(extend)) {
                List<JSONObject> matFields = JSON.parseArray(extend, JSONObject.class);
                for (JSONObject matField : matFields) {
                    if (matField.getString("type").equals("num")) {
                        tmp.put(matField.getString("name"), matField.getDouble("value"));
                    } else if (matField.getString("type").equals("bool")) {
                        tmp.put(matField.getString("name"), matField.getBoolean("value"));
                    }else {
                        tmp.put(matField.getString("name"), matField.getString("value"));
                    }
                }
            }
            list.add(tmp);
        }

        return R.ok().add(data);
    }

    @PreAuthorize("hasAuthority('asrs:mat:list')")
@@ -52,7 +82,12 @@
    @PreAuthorize("hasAuthority('asrs:mat:save')")
    @OperationLog("添加商品档案")
    @PostMapping("/mat/save")
    public R save(@RequestBody Mat mat) {
    public R save(@RequestBody HashMap<String,Object> param) {
        Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
        //获取扩展字段
        List<JSONObject> fields = getMatFieldList(param);
        mat.setExtend(JSON.toJSONString(fields, SerializerFeature.DisableCircularReferenceDetect));

        if (!matService.save(mat)) {
            return R.error("添加失败");
        }
@@ -62,7 +97,12 @@
    @PreAuthorize("hasAuthority('asrs:mat:update')")
    @OperationLog("修改商品档案")
    @PostMapping("/mat/update")
    public R update(@RequestBody Mat mat) {
    public R update(@RequestBody HashMap<String,Object> param) {
        Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
        //获取扩展字段
        List<JSONObject> fields = getMatFieldList(param);
        mat.setExtend(JSON.toJSONString(fields, SerializerFeature.DisableCircularReferenceDetect));

        if (!matService.updateById(mat)) {
            return R.error("修改失败");
        }
@@ -99,4 +139,18 @@
        ExcelUtil.build(ExcelUtil.create(matService.list(), Mat.class), response);
    }

    private List<JSONObject> getMatFieldList(HashMap<String, Object> param) {
        //获取扩展字段
        List<MatField> matFields = matFieldService.list();
        ArrayList<JSONObject> fields = new ArrayList<>();
        for (MatField matField : matFields) {
            if(param.containsKey(matField.getName())){
                JSONObject parsed = JSON.parseObject(JSON.toJSONString(matField), Feature.DisableCircularReferenceDetect);
                parsed.put("value", param.get(matField.getName()));
                fields.add(parsed);
            }
        }
        return fields;
    }

}