#

luxiaotao1123

2020-06-20 fe4c15ed6045361a6eed1edef605c9c2138e277e

#

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

@@ -22,6 +22,7 @@
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;

@@ -139,6 +140,7 @@
    // 导入
    @RequestMapping(value = "/matCode/import/auth")
    @ManagerAuth(memo = "物料编码数据导入")
    @Transactional
    public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
        Thread.sleep(2000);
        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();

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

@@ -139,6 +139,9 @@
    @RequestMapping(value = "/wrkMast/add/pri/auth")
    @ManagerAuth(memo = "工作档增加优先级")
    public R addPri(@RequestBody List<WrkMast> list) {
        if (list.isEmpty()) {
            return R.error("请至少选择一行数据");
        }
        for (WrkMast entity : list){
           entity.setIoPri(entity.getIoPri() + 1);
        }
@@ -149,6 +152,9 @@
    @RequestMapping(value = "/wrkMast/red/pri/auth")
    @ManagerAuth(memo = "工作档降低优先级")
    public R redPri(@RequestBody List<WrkMast> list) {
        if (list.isEmpty()) {
            return R.error("请至少选择一行数据");
        }
        for (WrkMast entity : list){
            entity.setIoPri(entity.getIoPri() - 1);
        }

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

@@ -3,6 +3,8 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
import com.zy.asrs.service.MatCodeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -41,6 +43,7 @@
        list.add(data);
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if (list.size() >= BATCH_COUNT) {
            MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
            // 存储完成清理 list
            list.clear();
        }