工具管理-工具分类特征参数:孔加工工具参数、螺纹刀具参数导入

cuilei

2025-05-13 3290343e7674eab7b35913cfcb5a6872720c940e

工具管理-工具分类特征参数:孔加工工具参数、螺纹刀具参数导入

 lxzn-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java

@@ -62,4 +62,34 @@
        return saveDir + name + ".txt";
    }

    public static String saveErrorMsgByList(List<String> msg, String name) {
        Date d = new Date();
        String saveDir = "logs" + File.separator + DateUtils.yyyyMMdd.get().format(d) + File.separator;
        String saveFullDir = uploadPath + File.separator + saveDir;

        File saveFile = new File(saveFullDir);
        if (!saveFile.exists()) {
            saveFile.mkdirs();
        }
        name += DateUtils.yyyymmddhhmmss.get().format(d) + Math.round(Math.random() * 10000);
        String saveFilePath = saveFullDir + name + ".txt";

        try {
            //封装目的地
            BufferedWriter bw = new BufferedWriter(new FileWriter(saveFilePath));
            //遍历集合
            for (String s : msg) {
                //写数据
                bw.write(s);
                //bw.newLine();
                bw.write("\r\n");
            }
            //释放资源
            bw.flush();
            bw.close();
        } catch (Exception e) {
            log.info("excel导入生成错误日志文件异常:" + e.getMessage());
        }
        return saveDir + name + ".txt";
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.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,21 @@
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.ToolsClassify;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.service.IParaHoleToolsService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +34,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;
@@ -36,125 +52,129 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: tms_para_hole_tools
 * @Author: jeecg-boot
 * @Date:   2025-05-12
 * @Date: 2025-05-12
 * @Version: V1.0
 */
@Api(tags="tms_para_hole_tools")
@Api(tags = "tms_para_hole_tools")
@RestController
@RequestMapping("/tms/paraHoleTools")
@Slf4j
public class ParaHoleToolsController extends JeecgController<ParaHoleTools, IParaHoleToolsService> {
    @Autowired
    private IParaHoleToolsService paraHoleToolsService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param paraHoleTools
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_para_hole_tools-分页列表查询")
    @ApiOperation(value="tms_para_hole_tools-分页列表查询", notes="tms_para_hole_tools-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<ParaHoleTools>> queryPageList(ParaHoleTools paraHoleTools,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<ParaHoleTools> queryWrapper = QueryGenerator.initQueryWrapper(paraHoleTools, req.getParameterMap());
        Page<ParaHoleTools> page = new Page<ParaHoleTools>(pageNo, pageSize);
        IPage<ParaHoleTools> pageList = paraHoleToolsService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param paraHoleTools
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-添加")
    @ApiOperation(value="tms_para_hole_tools-添加", notes="tms_para_hole_tools-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ParaHoleTools paraHoleTools) {
        paraHoleToolsService.save(paraHoleTools);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param paraHoleTools
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-编辑")
    @ApiOperation(value="tms_para_hole_tools-编辑", notes="tms_para_hole_tools-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody ParaHoleTools paraHoleTools) {
        paraHoleToolsService.updateById(paraHoleTools);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-通过id删除")
    @ApiOperation(value="tms_para_hole_tools-通过id删除", notes="tms_para_hole_tools-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        paraHoleToolsService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-批量删除")
    @ApiOperation(value="tms_para_hole_tools-批量删除", notes="tms_para_hole_tools-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.paraHoleToolsService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_para_hole_tools-通过id查询")
    @ApiOperation(value="tms_para_hole_tools-通过id查询", notes="tms_para_hole_tools-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<ParaHoleTools> queryById(@RequestParam(name="id",required=true) String id) {
        ParaHoleTools paraHoleTools = paraHoleToolsService.getById(id);
        if(paraHoleTools==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(paraHoleTools);
    }
    @Autowired
    private IParaHoleToolsService paraHoleToolsService;
    @Autowired
    private IToolsClassifyService toolsClassifyService;
    @Autowired
    private IBaseToolsService baseToolsService;

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param paraHoleTools
    */
     * åˆ†é¡µåˆ—表查询
     *
     * @param paraHoleTools
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_para_hole_tools-分页列表查询")
    @ApiOperation(value = "tms_para_hole_tools-分页列表查询", notes = "tms_para_hole_tools-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<ParaHoleTools>> queryPageList(ParaHoleTools paraHoleTools,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
        QueryWrapper<ParaHoleTools> queryWrapper = QueryGenerator.initQueryWrapper(paraHoleTools, req.getParameterMap());
        Page<ParaHoleTools> page = new Page<ParaHoleTools>(pageNo, pageSize);
        IPage<ParaHoleTools> pageList = paraHoleToolsService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param paraHoleTools
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-添加")
    @ApiOperation(value = "tms_para_hole_tools-添加", notes = "tms_para_hole_tools-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ParaHoleTools paraHoleTools) {
        paraHoleToolsService.save(paraHoleTools);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param paraHoleTools
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-编辑")
    @ApiOperation(value = "tms_para_hole_tools-编辑", notes = "tms_para_hole_tools-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody ParaHoleTools paraHoleTools) {
        paraHoleToolsService.updateById(paraHoleTools);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-通过id删除")
    @ApiOperation(value = "tms_para_hole_tools-通过id删除", notes = "tms_para_hole_tools-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        paraHoleToolsService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_para_hole_tools-批量删除")
    @ApiOperation(value = "tms_para_hole_tools-批量删除", notes = "tms_para_hole_tools-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.paraHoleToolsService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_para_hole_tools-通过id查询")
    @ApiOperation(value = "tms_para_hole_tools-通过id查询", notes = "tms_para_hole_tools-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<ParaHoleTools> queryById(@RequestParam(name = "id", required = true) String id) {
        ParaHoleTools paraHoleTools = paraHoleToolsService.getById(id);
        if (paraHoleTools == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(paraHoleTools);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param paraHoleTools
     */
    //@RequiresPermissions("org.jeecg.modules:tms_para_hole_tools:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, ParaHoleTools paraHoleTools) {
@@ -162,16 +182,261 @@
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("tms_para_hole_tools:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ParaHoleTools.class);
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // é”™è¯¯ä¿¡æ¯
        List<String> errorMessage = new ArrayList<>();
        int successLines = 0, errorLines = 0, dataLines = 0;
        List<ParaHoleTools> paraHoleToolsImportList = 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) {
                    ParaHoleTools paraHoleTools = new ParaHoleTools();
                    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<ParaHoleTools> paraHoleToolsList = paraHoleToolsService.list(new LambdaQueryWrapper<ParaHoleTools>()
                                    .eq(ParaHoleTools::getToolCode, baseTools.getId())
                                    .eq(ParaHoleTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                            if (CollectionUtil.isEmpty(paraHoleToolsList)) {
                                paraHoleTools.setClassifyId(toolsClassify.getId());
                                paraHoleTools.setToolCode(baseTools.getId());
                                paraHoleTools.setToolModel(ExcelUtils.getCellValueAsString(cell9));
                            } else {
                                paraHoleTools = paraHoleToolsList.get(0);
                            }
                        }
                    }

                    Cell cell0 = row.getCell(0);
                    paraHoleTools.setSignCode(cell0.getStringCellValue());
                    Cell cell5 = row.getCell(5);//物品中文名称
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setChineseName(ExcelUtils.getCellValueAsString(cell5));
                    }
                    Cell cell6 = row.getCell(6);//物品外文名称
                    paraHoleTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6));
                    Cell cell7 = row.getCell(7);//标准级别
                    paraHoleTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell7));
                    Cell cell8 = row.getCell(8);//标准号
                    paraHoleTools.setStandardCode(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell10 = row.getCell(10);//刀具直径
                    if (cell10 == null || cell10.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具直径为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setDiameter(ExcelUtils.getCellValueAsString(cell10));
                    }
                    Cell cell11 = row.getCell(11);//切削刃锥角
                    paraHoleTools.setConeAngle(ExcelUtils.getCellValueAsString(cell11));
                    Cell cell12 = row.getCell(12);//切削刃长
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削刃长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setEdgeLength(ExcelUtils.getCellValueAsString(cell12));
                    }
                    Cell cell13 = row.getCell(13);//刀具总长
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具总长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setTotalLength(ExcelUtils.getCellValueAsString(cell13));
                    }
                    Cell cell14 = row.getCell(14);//刀具材料
                    if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell14));
                    }
                    Cell cell15 = row.getCell(15);//零件材料
                    paraHoleTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell15));
                    Cell cell16 = row.getCell(16);//是否涂层
                    if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell16));
                    }
                    Cell cell17 = row.getCell(17);//刀具型式
                    if (cell17 == null || cell17.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具型式为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setToolPattern(ExcelUtils.getCellValueAsString(cell17));
                    }
                    Cell cell18 = row.getCell(18);//柄部规格
                    if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,柄部规格为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setHandleSpecifications(ExcelUtils.getCellValueAsString(cell18));
                    }
                    Cell cell19 = row.getCell(19);//冷却方式
                    if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,冷却方式为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell19));
                    }
                    Cell cell20 = row.getCell(20);//附加技术条件
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell20));
                    }
                    Cell cell21 = row.getCell(21);//附加技术条件说明
                    paraHoleTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell21));
                    Cell cell22 = row.getCell(22);//品牌
                    paraHoleTools.setBrand(ExcelUtils.getCellValueAsString(cell22));
                    Cell cell23 = row.getCell(23);//制式
                    paraHoleTools.setTypes(ExcelUtils.getCellValueAsString(cell23));
                    Cell cell24 = row.getCell(24);//公差等级
                    paraHoleTools.setToleranceClass(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//排屑槽形式
                    paraHoleTools.setFluteForm(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//柄部形式
                    paraHoleTools.setHandleForm(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//刃数
                    paraHoleTools.setBladeCount(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//最小直径
                    paraHoleTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//倒角角度
                    paraHoleTools.setChamferAngle(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//适配刀片-刀头-刀杆
                    paraHoleTools.setFitterPart(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//有效加工长度
                    paraHoleTools.setEffectiveLength(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//钻头直径范围
                    paraHoleTools.setDrillDiameterRange(ExcelUtils.getCellValueAsString(cell32));
                    Cell cell33 = row.getCell(33);//刀杆直径
                    paraHoleTools.setKnifeDiameter(ExcelUtils.getCellValueAsString(cell33));
                    Cell cell34 = row.getCell(34);//孔径
                    paraHoleTools.setBoreDiameter(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//接口形式
                    paraHoleTools.setConnectorType(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//接口槽长规格
                    paraHoleTools.setSlotSpecification(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//适用范围
                    paraHoleTools.setScopeOfApplication(ExcelUtils.getCellValueAsString(cell37));
                    Cell cell38 = row.getCell(38);//最小镗孔直径
                    paraHoleTools.setLatestBoringDiameter(ExcelUtils.getCellValueAsString(cell38));
                    Cell cell39 = row.getCell(39);//最大镗孔直径
                    paraHoleTools.setMaxBoringDiameter(ExcelUtils.getCellValueAsString(cell39));
                    Cell cell40 = row.getCell(40);//加工方式
                    paraHoleTools.setProcessingmethod(ExcelUtils.getCellValueAsString(cell40));
                    Cell cell41 = row.getCell(41);//刀头数
                    paraHoleTools.setHeadsNumber(ExcelUtils.getCellValueAsString(cell41));
                    Cell cell42 = row.getCell(42);//适配刀座
                    paraHoleTools.setAdaptHolder(ExcelUtils.getCellValueAsString(cell42));

                    paraHoleToolsImportList.add(paraHoleTools);
                    successLines++;
                }
            }
            paraHoleToolsService.saveOrUpdateBatch(paraHoleToolsImportList);
            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/ParaThreadingToolController.java

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

import java.io.File;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,10 +13,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.ParaThreadingTool;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.service.IParaThreadingToolService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +36,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;
@@ -36,125 +54,129 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
/**
 * @Description: tms_para_threading_tool
 * @Author: jeecg-boot
 * @Date:   2025-05-12
 * @Date: 2025-05-12
 * @Version: V1.0
 */
@Api(tags="tms_para_threading_tool")
@Api(tags = "tms_para_threading_tool")
@RestController
@RequestMapping("/tms/paraThreadingTool")
@Slf4j
public class ParaThreadingToolController extends JeecgController<ParaThreadingTool, IParaThreadingToolService> {
    @Autowired
    private IParaThreadingToolService paraThreadingToolService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param paraThreadingTool
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_para_threading_tool-分页列表查询")
    @ApiOperation(value="tms_para_threading_tool-分页列表查询", notes="tms_para_threading_tool-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<ParaThreadingTool>> queryPageList(ParaThreadingTool paraThreadingTool,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<ParaThreadingTool> queryWrapper = QueryGenerator.initQueryWrapper(paraThreadingTool, req.getParameterMap());
        Page<ParaThreadingTool> page = new Page<ParaThreadingTool>(pageNo, pageSize);
        IPage<ParaThreadingTool> pageList = paraThreadingToolService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param paraThreadingTool
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-添加")
    @ApiOperation(value="tms_para_threading_tool-添加", notes="tms_para_threading_tool-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ParaThreadingTool paraThreadingTool) {
        paraThreadingToolService.save(paraThreadingTool);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param paraThreadingTool
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-编辑")
    @ApiOperation(value="tms_para_threading_tool-编辑", notes="tms_para_threading_tool-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody ParaThreadingTool paraThreadingTool) {
        paraThreadingToolService.updateById(paraThreadingTool);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-通过id删除")
    @ApiOperation(value="tms_para_threading_tool-通过id删除", notes="tms_para_threading_tool-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        paraThreadingToolService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-批量删除")
    @ApiOperation(value="tms_para_threading_tool-批量删除", notes="tms_para_threading_tool-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.paraThreadingToolService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_para_threading_tool-通过id查询")
    @ApiOperation(value="tms_para_threading_tool-通过id查询", notes="tms_para_threading_tool-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<ParaThreadingTool> queryById(@RequestParam(name="id",required=true) String id) {
        ParaThreadingTool paraThreadingTool = paraThreadingToolService.getById(id);
        if(paraThreadingTool==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(paraThreadingTool);
    }
    @Autowired
    private IParaThreadingToolService paraThreadingToolService;
    @Autowired
    private IToolsClassifyService toolsClassifyService;
    @Autowired
    private IBaseToolsService baseToolsService;

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param paraThreadingTool
    */
     * åˆ†é¡µåˆ—表查询
     *
     * @param paraThreadingTool
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_para_threading_tool-分页列表查询")
    @ApiOperation(value = "tms_para_threading_tool-分页列表查询", notes = "tms_para_threading_tool-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<ParaThreadingTool>> queryPageList(ParaThreadingTool paraThreadingTool,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
        QueryWrapper<ParaThreadingTool> queryWrapper = QueryGenerator.initQueryWrapper(paraThreadingTool, req.getParameterMap());
        Page<ParaThreadingTool> page = new Page<ParaThreadingTool>(pageNo, pageSize);
        IPage<ParaThreadingTool> pageList = paraThreadingToolService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     * æ·»åŠ 
     *
     * @param paraThreadingTool
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-添加")
    @ApiOperation(value = "tms_para_threading_tool-添加", notes = "tms_para_threading_tool-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ParaThreadingTool paraThreadingTool) {
        paraThreadingToolService.save(paraThreadingTool);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param paraThreadingTool
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-编辑")
    @ApiOperation(value = "tms_para_threading_tool-编辑", notes = "tms_para_threading_tool-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody ParaThreadingTool paraThreadingTool) {
        paraThreadingToolService.updateById(paraThreadingTool);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-通过id删除")
    @ApiOperation(value = "tms_para_threading_tool-通过id删除", notes = "tms_para_threading_tool-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        paraThreadingToolService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_para_threading_tool-批量删除")
    @ApiOperation(value = "tms_para_threading_tool-批量删除", notes = "tms_para_threading_tool-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.paraThreadingToolService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_para_threading_tool-通过id查询")
    @ApiOperation(value = "tms_para_threading_tool-通过id查询", notes = "tms_para_threading_tool-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<ParaThreadingTool> queryById(@RequestParam(name = "id", required = true) String id) {
        ParaThreadingTool paraThreadingTool = paraThreadingToolService.getById(id);
        if (paraThreadingTool == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(paraThreadingTool);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param paraThreadingTool
     */
    //@RequiresPermissions("org.jeecg.modules:tms_para_threading_tool:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, ParaThreadingTool paraThreadingTool) {
@@ -162,16 +184,250 @@
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("tms_para_threading_tool:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ParaThreadingTool.class);
    }
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // é”™è¯¯ä¿¡æ¯
        List<String> errorMessage = new ArrayList<>();
        int successLines = 0, errorLines = 0, dataLines = 0;
        List<ParaThreadingTool> paraThreadingToolImportList = 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) {
                    ParaThreadingTool paraThreadingTool = new ParaThreadingTool();
                    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<ParaThreadingTool> paraThreadingToolList = paraThreadingToolService.list(new LambdaQueryWrapper<ParaThreadingTool>()
                                    .eq(ParaThreadingTool::getToolCode, baseTools.getId())
                                    .eq(ParaThreadingTool::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                            if (CollectionUtil.isEmpty(paraThreadingToolList)) {
                                paraThreadingTool.setClassifyId(toolsClassify.getId());
                                paraThreadingTool.setToolCode(baseTools.getId());
                                paraThreadingTool.setToolModel(ExcelUtils.getCellValueAsString(cell9));
                            } else {
                                paraThreadingTool = paraThreadingToolList.get(0);
                            }
                        }
                    }

                    Cell cell0 = row.getCell(0);//序号(或企业内原代码)
                    paraThreadingTool.setSignCode(ExcelUtils.getCellValueAsString(cell0));
                    Cell cell5 = row.getCell(5);//物品中文名称
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setChineseName(ExcelUtils.getCellValueAsString(cell5));
                    }
                    Cell cell6 = row.getCell(6);//物品外文名称
                    paraThreadingTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6));
                    Cell cell7 = row.getCell(7);//标准级别
                    paraThreadingTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell7));
                    Cell cell8 = row.getCell(8);//标准号
                    paraThreadingTool.setStandardCode(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell10 = row.getCell(10);//螺纹代号
                    if (cell10 == null || cell10.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,螺纹代号为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setThreadCode(ExcelUtils.getCellValueAsString(cell10));
                    }
                    Cell cell11 = row.getCell(11);//螺距
                    if (cell11 == null || cell11.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,螺距为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setPitch(ExcelUtils.getCellValueAsString(cell11));
                    }

                    Cell cell12 = row.getCell(12);//螺纹旋向
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,螺纹旋向为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setRotationDirection(ExcelUtils.getCellValueAsString(cell12));
                    }
                    Cell cell13 = row.getCell(13);//螺纹公差带代号/精度等级
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,螺纹公差带代号/精度等级为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setTolerancezoneLevel(ExcelUtils.getCellValueAsString(cell13));
                    }
                    Cell cell14 = row.getCell(14);//切削刃长
                    if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削刃长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setEdgeLength(ExcelUtils.getCellValueAsString(cell14));
                    }
                    Cell cell15 = row.getCell(15);//刀具总长
                    if (cell15 == null || cell15.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具总长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setTotalLength(ExcelUtils.getCellValueAsString(cell15));
                    }

                    Cell cell16 = row.getCell(16);//刀具材料
                    if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setToolMaterial(ExcelUtils.getCellValueAsString(cell16));
                    }
                    Cell cell17 = row.getCell(17);//零件材料
                    paraThreadingTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell17));
                    Cell cell18 = row.getCell(18);//是否涂层
                    if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell18));
                    }
                    Cell cell19 = row.getCell(19);//外形尺寸
                    paraThreadingTool.setExternalDimensions(ExcelUtils.getCellValueAsString(cell19));
                    Cell cell20 = row.getCell(20);//柄部规格
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,柄部规格为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setHandleSpecifications(ExcelUtils.getCellValueAsString(cell20));
                    }
                    Cell cell21 = row.getCell(21);//附加技术条件
                    if (cell21 == null || cell21.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraThreadingTool.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell21));
                    }

                    Cell cell22 = row.getCell(22);//附加技术条件说明
                    paraThreadingTool.setConditionsInfo(ExcelUtils.getCellValueAsString(cell22));
                    Cell cell23 = row.getCell(23);//品牌
                    paraThreadingTool.setBrand(ExcelUtils.getCellValueAsString(cell23));
                    Cell cell24 = row.getCell(24);//制式
                    paraThreadingTool.setTypes(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//螺孔类型
                    paraThreadingTool.setScrewHoleType(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//冷却方式
                    paraThreadingTool.setCoolingMethod(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//螺纹标准
                    paraThreadingTool.setThreadStandard(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//排屑槽型
                    paraThreadingTool.setFluteSoltType(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//螺纹类型
                    paraThreadingTool.setThreadType(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//导向尺寸
                    paraThreadingTool.setGuidingSize(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//连接孔径
                    paraThreadingTool.setConnectionAperture(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//连接键槽
                    paraThreadingTool.setConnectingKeyway(ExcelUtils.getCellValueAsString(cell32));

                    paraThreadingToolImportList.add(paraThreadingTool);
                    successLines++;
                }
            }
            paraThreadingToolService.saveOrUpdateBatch(paraThreadingToolImportList);
            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

@@ -200,6 +200,10 @@
    @Excel(name = "刀头数", width = 15)
    @ApiModelProperty(value = "刀头数")
    private String headsNumber;
    /**适配刀座*/
    @Excel(name = "适配刀座", width = 15)
    @ApiModelProperty(value = "适配刀座")
    private String adaptHolder;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
@@ -213,9 +217,9 @@
    @ApiModelProperty(value = "创建人")
    private String createdBy;
    /**创建时间*/
    @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @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;
    /**更新人*/
@@ -223,9 +227,9 @@
    @ApiModelProperty(value = "更新人")
    private String updatedBy;
    /**更新时间*/
    @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @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;
}

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

@@ -43,7 +43,7 @@
    /**工具编号*/
    @Excel(name = "工具编号", width = 15)
    @ApiModelProperty(value = "工具编号")
    private String toolId;
    private String toolCode;
    /**序号（或企业内原代码）*/
    @Excel(name = "序号（或企业内原代码）", width = 15)
    @ApiModelProperty(value = "序号（或企业内原代码）")

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/utils/ExcelUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package org.jeecg.modules.tms.utils;

import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.ss.usermodel.Row;

import java.text.SimpleDateFormat;

public class ExcelUtils {
    // è¾…助方法：根据单元格类型安全地获取字符串值
    public static String getCellValueAsString(Cell cell) {
        if (cell == null) {
            return null;
        }
        switch (cell.getCellType()) {
            case STRING:
                return cell.getStringCellValue();
            case NUMERIC:
                if (DateUtil.isCellDateFormatted(cell)) {
                    // å¦‚果是日期格式，返回日期字符串
                    return new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue());
                } else {
                    // å¦åˆ™è¿”回数值的字符串形式
                    return String.valueOf(cell.getNumericCellValue());
                }
            case BOOLEAN:
                return String.valueOf(cell.getBooleanCellValue());
            case FORMULA:
                try {
                    return String.valueOf(cell.getNumericCellValue()); // å°è¯•è§£æžå…¬å¼ç»“æžœ
                } catch (Exception e) {
                    return String.valueOf(cell.getStringCellValue()); // å¦‚果公式结果为字符串
                }
            default:
                return "";
        }
    }

    // åˆ¤æ–­æŸä¸€è¡Œæ˜¯å¦å…¨ä¸ºç©º(有效数据行判断)
    public static boolean isRowEmpty(Row row) {
        if (row == null) return true;
        for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) {
            Cell cell = row.getCell(c);
            if (cell != null && cell.getCellType() != CellType.BLANK) {
                return false;
            }
        }
        return true;
    }
}