工具管理-工具分类特征参数:铣削刀具参数、车削刀具参数导入

cuilei

2025-05-14 5240266838c794b868bca06129017886cbd86012

工具管理-工具分类特征参数:铣削刀具参数、车削刀具参数导入

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java

@@ -1,5 +1,8 @@
package org.jeecg.modules.tms.controller;

import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,10 +12,22 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.PmsUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import org.jeecg.modules.tms.entity.ParaMillTool;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.service.IParaMillToolService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +35,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.tms.service.IToolsClassifyService;
import org.jeecg.modules.tms.utils.ExcelUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,6 +66,10 @@
public class ParaMillToolController extends JeecgController<ParaMillTool, IParaMillToolService> {
    @Autowired
    private IParaMillToolService paraMillToolService;
    @Autowired
    private IToolsClassifyService toolsClassifyService;
    @Autowired
    private IBaseToolsService baseToolsService;
    
    /**
     * 分页列表查询
@@ -171,7 +192,258 @@
    //@RequiresPermissions("tms_para_mill_tool:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ParaMillTool.class);
    }
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 错误信息
        List<String> errorMessage = new ArrayList<>();
        int successLines = 0, errorLines = 0, dataLines = 0;
        List<ParaMillTool> paraMillToolImportList = new ArrayList<>();
        try {
            for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
                // 获取上传文件对象
                MultipartFile file = entity.getValue();
                InputStream inputStream = file.getInputStream();
                Workbook workbook = new XSSFWorkbook(inputStream);
                Sheet sheet = workbook.getSheetAt(0);
                for (Row row : sheet) {
                    ParaMillTool paraMillTool = new ParaMillTool();
                    int rowNum = row.getRowNum();
                    int currentRowNum = rowNum + 1;
                    //表头行和空行略过
                    if (rowNum == 0 || ExcelUtils.isRowEmpty(row)) {
                        continue;
                    }
                    dataLines++;
                    Cell cell1 = row.getCell(1);
                    if (cell1 == null || cell1.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,一级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell2 = row.getCell(2);
                    if (cell2 == null || cell2.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,二级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell3 = row.getCell(3);
                    if (cell3 == null || cell3.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,三级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell4 = row.getCell(4);
                    if (cell4 == null || cell4.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,四级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell9 = row.getCell(9);
                    if (cell9 == null || cell9.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! ");
                        errorLines++;
                        continue;
                    }
                    //根据四级分类名称和型号/图号查询工具信息
                    List<ToolsClassify> toolClassifyList = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                            .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell4))
                            .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                    if (CollectionUtil.isEmpty(toolClassifyList)) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该四级分类名称! ");
                        errorLines++;
                        continue;
                    } else {
                        ToolsClassify toolsClassify = toolClassifyList.get(0);
                        List<BaseTools> baseToolsList = baseToolsService.list(new LambdaQueryWrapper<BaseTools>()
                                .eq(BaseTools::getClassifyId, toolsClassify.getId())
                                .eq(BaseTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                        if (CollectionUtil.isEmpty(baseToolsList)) {
                            errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在对应的工具信息! ");
                            errorLines++;
                            continue;
                        } else {
                            BaseTools baseTools = baseToolsList.get(0);
                            List<ParaMillTool> paraMillToolList = paraMillToolService.list(new LambdaQueryWrapper<ParaMillTool>()
                                    .eq(ParaMillTool::getToolCode, baseTools.getId())
                                    .eq(ParaMillTool::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                            if (CollectionUtil.isEmpty(paraMillToolList)) {
                                paraMillTool.setClassifyId(toolsClassify.getId());
                                paraMillTool.setToolCode(baseTools.getId());
                                paraMillTool.setToolModel(ExcelUtils.getCellValueAsString(cell9));
                            } else {
                                paraMillTool = paraMillToolList.get(0);
                            }
                        }
                    }

                    Cell cell0 = row.getCell(0);
                    paraMillTool.setSignCode(cell0.getStringCellValue());
                    Cell cell5 = row.getCell(5);//物品中文名称
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setChineseName(ExcelUtils.getCellValueAsString(cell5));
                    }
                    Cell cell6 = row.getCell(6);//物品外文名称
                    paraMillTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6));
                    Cell cell7 = row.getCell(7);//标准级别
                    paraMillTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell7));
                    Cell cell8 = row.getCell(8);//标准号
                    paraMillTool.setStandardCode(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell10 = row.getCell(10);//刀具直径
                    if (cell10 == null || cell10.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具直径为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setDiameter(ExcelUtils.getCellValueAsString(cell10));
                    }
                    Cell cell11 = row.getCell(11);//刀尖角R
                    if (cell11 == null || cell11.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀尖角R为空! ");
                    } else {
                        paraMillTool.setNoseAngleR(ExcelUtils.getCellValueAsString(cell11));
                    }
                    Cell cell12 = row.getCell(12);//齿数
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,齿数为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setNumberOfTeeth(ExcelUtils.getCellValueAsString(cell12));
                    }
                    Cell cell13 = row.getCell(13);//切削刃长
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削刃长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setEdgeLength(ExcelUtils.getCellValueAsString(cell13));
                    }
                    Cell cell14 = row.getCell(14);//刀具总长
                    if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具总长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setTotalLength(ExcelUtils.getCellValueAsString(cell14));
                    }
                    Cell cell15 = row.getCell(15);//刀具材料
                    if (cell15 == null || cell15.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! ");
                    } else {
                        paraMillTool.setToolMaterial(ExcelUtils.getCellValueAsString(cell15));
                    }

                    Cell cell16 = row.getCell(16);//零件材料
                    paraMillTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell16));
                    Cell cell17 = row.getCell(17);//是否涂层
                    if (cell17 == null || cell17.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell17));
                    }
                    Cell cell18 = row.getCell(18);//刀具型式
                    if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具型式为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setToolPattern(ExcelUtils.getCellValueAsString(cell18));
                    }
                    Cell cell19 = row.getCell(19);//装夹规格
                    if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,装夹规格为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setClampingSpecifications(ExcelUtils.getCellValueAsString(cell19));
                    }
                    Cell cell20 = row.getCell(20);//冷却方式
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,冷却方式为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraMillTool.setCoolingMethod(ExcelUtils.getCellValueAsString(cell20));
                    }
                    Cell cell21 = row.getCell(21);//附加技术条件
                    if (cell21 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！");
                    } else {
                        paraMillTool.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell21));
                    }
                    Cell cell22 = row.getCell(22);//附加技术条件说明
                    paraMillTool.setConditionsInfo(ExcelUtils.getCellValueAsString(cell22));
                    Cell cell23 = row.getCell(23);//品牌
                    paraMillTool.setBrand(ExcelUtils.getCellValueAsString(cell23));
                    Cell cell24 = row.getCell(24);//颈径
                    paraMillTool.setNeckDiameter(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//柄部形式
                    paraMillTool.setHandleForm(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//刀尖角C
                    paraMillTool.setNoseAngleC(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//刀尖角内R
                    paraMillTool.setAngleInsideR(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//最小直径
                    paraMillTool.setSmallDiameter(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//刀具角度
                    paraMillTool.setToolAngle(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//柄长
                    paraMillTool.setHandleLength(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//主偏角K
                    paraMillTool.setMainAngleK(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//最大切深
                    paraMillTool.setDeepestDepth(ExcelUtils.getCellValueAsString(cell32));
                    Cell cell33 = row.getCell(33);//适配刀片
                    paraMillTool.setAdaptBlade(ExcelUtils.getCellValueAsString(cell33));
                    Cell cell34 = row.getCell(34);//柄颈形式
                    paraMillTool.setHandleNeckForm(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//柄颈长度
                    paraMillTool.setHandleNeckLength(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//接口尺寸规格
                    paraMillTool.setSizeSpecifications(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//铣刀头形式
                    paraMillTool.setMillingHeadForm(ExcelUtils.getCellValueAsString(cell37));
                    Cell cell38 = row.getCell(38);//悬伸长度
                    paraMillTool.setOverhangingLength(ExcelUtils.getCellValueAsString(cell38));
                    Cell cell39 = row.getCell(39);//切削刃形式
                    paraMillTool.setCuttingEdgeForm(ExcelUtils.getCellValueAsString(cell39));
                    Cell cell40 = row.getCell(40);//内外螺纹
                    paraMillTool.setNumberPatterns(ExcelUtils.getCellValueAsString(cell40));
                    Cell cell41 = row.getCell(41);//螺距
                    paraMillTool.setPitch(ExcelUtils.getCellValueAsString(cell41));
                    Cell cell42 = row.getCell(42);//最小加工直径
                    paraMillTool.setRecentlyDiameter(ExcelUtils.getCellValueAsString(cell42));

                    paraMillToolImportList.add(paraMillTool);
                    successLines++;
                }
            }
            paraMillToolService.saveOrUpdateBatch(paraMillToolImportList);
            if (successLines == dataLines) {
                return Result.OK("共" + dataLines + "行数据全部导入成功！");
            } else {
                JSONObject result = new JSONObject(5);
                result.put("successCount", successLines);
                result.put("msg", "总上传行数：" + dataLines + "，成功导入行数：" + successLines);
                result.put("errorMsg", errorMessage);
                String fileUrl = PmsUtil.saveErrorMsgByList(errorMessage, "userImportExcelErrorLog");
                int lastIndex = fileUrl.lastIndexOf(File.separator);
                String fileName = fileUrl.substring(lastIndex + 1);
                result.put("fileUrl", "/sys/common/static/" + fileUrl);
                result.put("fileName", fileName);
                Result res = Result.ok(result);
                res.setCode(201);
                res.setMessage("文件导入成功，但有错误。");
                return res;
            }
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java

@@ -1,5 +1,8 @@
package org.jeecg.modules.tms.controller;

import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,17 +12,27 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.ParaTurningTools;
import org.jeecg.modules.tms.service.IParaTurningToolsService;

import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.PmsUtil;
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.entity.ParaTurningTools;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.service.IParaTurningToolsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.tms.service.IToolsClassifyService;
import org.jeecg.modules.tms.utils.ExcelUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,6 +62,10 @@
public class ParaTurningToolsController extends JeecgController<ParaTurningTools, IParaTurningToolsService> {
    @Autowired
    private IParaTurningToolsService paraTurningToolsService;
    @Autowired
    private IToolsClassifyService toolsClassifyService;
    @Autowired
    private IBaseToolsService baseToolsService;
    
    /**
     * 分页列表查询
@@ -171,7 +188,265 @@
    //@RequiresPermissions("tms_para_turning_tools:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ParaTurningTools.class);
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 错误信息
        List<String> errorMessage = new ArrayList<>();
        int successLines = 0, errorLines = 0, dataLines = 0;
        List<ParaTurningTools> paraTurningToolsImportList = new ArrayList<>();
        try {
            for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
                // 获取上传文件对象
                MultipartFile file = entity.getValue();
                InputStream inputStream = file.getInputStream();
                Workbook workbook = new XSSFWorkbook(inputStream);
                Sheet sheet = workbook.getSheetAt(0);
                for (Row row : sheet) {
                    ParaTurningTools paraTurningTools = new ParaTurningTools();
                    int rowNum = row.getRowNum();
                    int currentRowNum = rowNum + 1;
                    //表头行和空行略过
                    if (rowNum == 0 || ExcelUtils.isRowEmpty(row)) {
                        continue;
                    }
                    dataLines++;
                    Cell cell1 = row.getCell(1);
                    if (cell1 == null || cell1.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,一级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell2 = row.getCell(2);
                    if (cell2 == null || cell2.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,二级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell3 = row.getCell(3);
                    if (cell3 == null || cell3.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,三级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell4 = row.getCell(4);
                    if (cell4 == null || cell4.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,四级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell9 = row.getCell(9);
                    if (cell9 == null || cell9.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! ");
                        errorLines++;
                        continue;
                    }
                    //根据四级分类名称和型号/图号查询工具信息
                    List<ToolsClassify> toolClassifyList = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                            .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell4))
                            .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                    if (CollectionUtil.isEmpty(toolClassifyList)) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该四级分类名称! ");
                        errorLines++;
                        continue;
                    } else {
                        ToolsClassify toolsClassify = toolClassifyList.get(0);
                        List<BaseTools> baseToolsList = baseToolsService.list(new LambdaQueryWrapper<BaseTools>()
                                .eq(BaseTools::getClassifyId, toolsClassify.getId())
                                .eq(BaseTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                        if (CollectionUtil.isEmpty(baseToolsList)) {
                            errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在对应的工具信息! ");
                            errorLines++;
                            continue;
                        } else {
                            BaseTools baseTools = baseToolsList.get(0);
                            List<ParaTurningTools> paraTurningToolsList = paraTurningToolsService.list(new LambdaQueryWrapper<ParaTurningTools>()
                                    .eq(ParaTurningTools::getToolCode, baseTools.getId())
                                    .eq(ParaTurningTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                            if (CollectionUtil.isEmpty(paraTurningToolsList)) {
                                paraTurningTools.setClassifyId(toolsClassify.getId());
                                paraTurningTools.setToolCode(baseTools.getId());
                                paraTurningTools.setToolModel(ExcelUtils.getCellValueAsString(cell9));
                            } else {
                                paraTurningTools = paraTurningToolsList.get(0);
                            }
                        }
                    }

                    Cell cell0 = row.getCell(0);
                    paraTurningTools.setSignCode(cell0.getStringCellValue());
                    Cell cell5 = row.getCell(5);//物品中文名称
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setChineseName(ExcelUtils.getCellValueAsString(cell5));
                    }
                    Cell cell6 = row.getCell(6);//物品外文名称
                    paraTurningTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6));
                    Cell cell7 = row.getCell(7);//标准级别
                    paraTurningTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell7));
                    Cell cell8 = row.getCell(8);//标准号
                    paraTurningTools.setStandardCode(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell10 = row.getCell(10);//刀头规格
                    if (cell10 == null || cell10.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀头规格为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setHeadSpecifications(ExcelUtils.getCellValueAsString(cell10));
                    }
                    Cell cell11 = row.getCell(11);//配套刀片号
                    if (cell11 == null || cell11.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,配套刀片号为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setMatchingNumber(ExcelUtils.getCellValueAsString(cell11));
                    }
                    Cell cell12 = row.getCell(12);//主偏角
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,主偏角为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setLeadAngle(ExcelUtils.getCellValueAsString(cell12));
                    }
                    Cell cell13 = row.getCell(13);//刀具截面尺寸
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具截面尺寸为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setCrossSectionalSize(ExcelUtils.getCellValueAsString(cell13));
                    }
                    Cell cell14 = row.getCell(14);//刀具总长
                    if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具总长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setTotalLength(ExcelUtils.getCellValueAsString(cell14));
                    }
                    Cell cell15 = row.getCell(15);//切削方向
                    if (cell15 == null || cell15.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削方向为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setCuttingDirection(ExcelUtils.getCellValueAsString(cell15));
                    }

                    Cell cell16 = row.getCell(16);//刀具材料
                    if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell16));
                    }
                    Cell cell17 = row.getCell(17);//零件材料
                    paraTurningTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell17));
                    Cell cell18 = row.getCell(18);//刀具型式
                    if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具型式为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setToolPattern(ExcelUtils.getCellValueAsString(cell18));
                    }
                    Cell cell19 = row.getCell(19);//是否涂层
                    if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell19));
                    }
                    Cell cell20 = row.getCell(20);//附加技术条件
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraTurningTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell20));
                    }
                    Cell cell21 = row.getCell(21);//附加技术条件说明
                    paraTurningTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell21));
                    Cell cell22 = row.getCell(22);//品牌
                    paraTurningTools.setBrand(ExcelUtils.getCellValueAsString(cell22));
                    Cell cell23 = row.getCell(23);//制式
                    paraTurningTools.setTypes(ExcelUtils.getCellValueAsString(cell23));
                    Cell cell24 = row.getCell(24);//刀片尺寸
                    paraTurningTools.setKnifeSize(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//冷却方式
                    paraTurningTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//刀杆类别
                    paraTurningTools.setHolderCategory(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//刀具直径
                    paraTurningTools.setToolDiameter(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//接口紧固形式
                    paraTurningTools.setFasteningForm(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//镗杆直径
                    paraTurningTools.setBoringBarDiameter(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//刀杆长度
                    paraTurningTools.setBladeLength(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//刀片形状
                    paraTurningTools.setBladeShape(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//刀片后角
                    paraTurningTools.setBladePosterior(ExcelUtils.getCellValueAsString(cell32));
                    Cell cell33 = row.getCell(33);//刀杆方向
                    paraTurningTools.setBarDirection(ExcelUtils.getCellValueAsString(cell33));
                    Cell cell34 = row.getCell(34);//刀杆高度
                    paraTurningTools.setBladeHeight(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//刀杆宽度
                    paraTurningTools.setBladeWide(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//刀杆尺寸
                    paraTurningTools.setBladeSize(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//刀夹型号
                    paraTurningTools.setKnifeClipModel(ExcelUtils.getCellValueAsString(cell37));
                    Cell cell38 = row.getCell(38);//刀片装夹方式
                    paraTurningTools.setClampingMethod(ExcelUtils.getCellValueAsString(cell38));
                    Cell cell39 = row.getCell(39);//刀片槽宽
                    paraTurningTools.setSlotWidth(ExcelUtils.getCellValueAsString(cell39));
                    Cell cell40 = row.getCell(40);//最小切入直径
                    paraTurningTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell40));
                    Cell cell41 = row.getCell(41);//最大切入直径
                    paraTurningTools.setMaxDiameter(ExcelUtils.getCellValueAsString(cell41));
                    Cell cell42 = row.getCell(42);//最大切槽深度
                    paraTurningTools.setMaxDepth(ExcelUtils.getCellValueAsString(cell42));
                    Cell cell43 = row.getCell(43);//刀杆形式
                    paraTurningTools.setKnifeBarForm(ExcelUtils.getCellValueAsString(cell43));
                    Cell cell44 = row.getCell(44);//刀板厚度
                    paraTurningTools.setBladeThickness(ExcelUtils.getCellValueAsString(cell44));
                    Cell cell45 = row.getCell(45);//最小加工直径
                    paraTurningTools.setMinDiameter(ExcelUtils.getCellValueAsString(cell45));

                    paraTurningToolsImportList.add(paraTurningTools);
                    successLines++;
                }
            }
            paraTurningToolsService.saveOrUpdateBatch(paraTurningToolsImportList);
            if (successLines == dataLines) {
                return Result.OK("共" + dataLines + "行数据全部导入成功！");
            } else {
                JSONObject result = new JSONObject(5);
                result.put("successCount", successLines);
                result.put("msg", "总上传行数：" + dataLines + "，成功导入行数：" + successLines);
                result.put("errorMsg", errorMessage);
                String fileUrl = PmsUtil.saveErrorMsgByList(errorMessage, "userImportExcelErrorLog");
                int lastIndex = fileUrl.lastIndexOf(File.separator);
                String fileName = fileUrl.substring(lastIndex + 1);
                result.put("fileUrl", "/sys/common/static/" + fileUrl);
                result.put("fileName", fileName);
                Result res = Result.ok(result);
                res.setCode(201);
                res.setMessage("文件导入成功，但有错误。");
                return res;
            }
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaHoleTools.java

@@ -215,21 +215,21 @@
    /**创建人*/
    @Excel(name = "创建人", width = 15)
    @ApiModelProperty(value = "创建人")
    private String createdBy;
    private String createBy;
    /**创建时间*/
    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "创建时间")
    private Date createdTime;
    private Date createTime;
    /**更新人*/
    @Excel(name = "更新人", width = 15)
    @ApiModelProperty(value = "更新人")
    private String updatedBy;
    private String updateBy;
    /**更新时间*/
    @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:mm")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "更新时间")
    private Date updatedTime;
    private Date updateTime;
}