#

luxiaotao1123

2020-06-20 4b470f270f171a269f3bc9d4e10522b0e66ed826

#

 src/main/java/com/zy/asrs/controller/MatCodeController.java

@@ -22,7 +22,6 @@
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -56,6 +55,9 @@
        EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -121,7 +123,6 @@
            excel.setBarcode(matCode.getBarcode());
            excel.setMatName(matCode.getMatName());
            excel.setStr1(matCode.getStr1());
            excel.setStr2(matCode.getStr2());
            excels.add(excel);
            if (rowCount != null && excels.size() >= rowCount){
                break;
@@ -140,7 +141,6 @@
    // 导入
    @RequestMapping(value = "/matCode/import/auth")
    @ManagerAuth(memo = "物料编码数据导入")
    @Transactional
    public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
        MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();

 src/main/java/com/zy/common/utils/excel/ExcelUtils.java

@@ -34,7 +34,6 @@
            data.setBarcode("80001854");
            data.setMatName("铝带|1100-O|0.33*475|");
            data.setStr1("701010015907");
            data.setStr2("鼎胜铝业香港_马来西亚UPT");
            list.add(data);
        }
        return list;

 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java

@@ -31,11 +31,6 @@
    @ExcelProperty(value = "物料单位", index = 3)
    private String str1;

    /**
     * 物料规格
     */
    @ExcelProperty(value = "物料规格", index = 4)
    private String str2;

    public String getMatNo() {
        return matNo;
@@ -69,11 +64,4 @@
        this.str1 = str1;
    }

    public String getStr2() {
        return str2;
    }

    public void setStr2(String str2) {
        this.str2 = str2;
    }
}

 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java

@@ -63,15 +63,16 @@
            matCode.setAppeUser(this.userId);
            list.add(matCode);
            total ++;
        }
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if (list.size() >= BATCH_COUNT) {
            if (!matCodeService.insertBatch(list)) {
                throw new CoolException("导入数据异常");
            }
            // 存储完成清理 list
            list.clear();
        }
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
//        if (list.size() >= BATCH_COUNT) {
//
//            // 存储完成清理 list
//            list.clear();
//        }
    }

    /**

 src/main/java/com/zy/common/web/FileController.java

@@ -51,7 +51,6 @@
            excel.setBarcode(matCode.getBarcode());
            excel.setMatName(matCode.getMatName());
            excel.setStr1(matCode.getStr1());
            excel.setStr2(matCode.getStr2());
            excels.add(excel);
        }
        // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman