lxzn-boot-base-core/src/main/java/org/jeecg/common/util/WordParseUtils.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,42 @@ package org.jeecg.common.util; import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFRun; import org.apache.poi.xwpf.usermodel.XWPFTableCell; public class WordParseUtils { /** * å ¼å®¹çåå æ ¼ææ¬æå */ public static String getCellText(XWPFTableCell cell) { if (cell == null) { return ""; } String text = cell.getText(); return text.toString(); } /** * å å®¹æ¸ ç */ private String cleanContent(String text) { if (text == null) { return ""; } // æ¿æ¢ç¹æ®ç©ºæ ¼ååå¹¶è¿ç»ç©ºæ ¼ text = text.replace('\u00A0', ' ') .replace('\u2007', ' ') .replace('\u202F', ' ') .replaceAll("\\s+", " "); // è§èæ ç¹ç¬¦å· return text.replace(',', 'ã') .replace('ï¼', 'ã') .replace(';', 'ï¼') .replace('ï¼', 'ï¼') .replace(':', 'ï¼') .replace('ï¼', 'ï¼') .trim(); } } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -167,9 +167,11 @@ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); if(!CollectionUtils.isEmpty(baseFactoryUserList)){ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCode); }else { return page; } } //æ¥è¯¢æ¡ä»¶è¿æ»¤ @@ -255,9 +257,11 @@ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); if(!CollectionUtils.isEmpty(baseFactoryUserList)){ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCode); } else { return Collections.emptyList(); } } @@ -298,7 +302,7 @@ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())); if (!CollectionUtils.isEmpty(baseFactoryUserList)) { Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toSet()); Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("factory_org_code", factoryCodeList); } else { return null; @@ -334,9 +338,11 @@ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); if(!CollectionUtils.isEmpty(baseFactoryUserList)){ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCode); }else { return Collections.emptyList(); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
@@ -8,20 +8,23 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum; import org.jeecg.modules.eam.entity.EamMaintenanceStandard; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; /** * @Description: ææ¯ç¶æé´å®è§è @@ -162,15 +165,71 @@ } /** * éè¿excelå¯¼å ¥æ°æ® * å®å ¨è£ ç½®æ£æ¥æç»å¯¼å ¥ * * @param request * @return */ @PostMapping(value = "/importSafetyEquipmentCheck") public Result<?> importSafetyEquipmentCheck(HttpServletRequest request) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map<String, String> results = new LinkedHashMap<>(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); // ç»è®¡å¯¼å ¥ç»æ int successCount = 0; int failureCount = 0; for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { MultipartFile file = entity.getValue(); String fileName = file.getOriginalFilename(); Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importSafetyEquipmentCheck(file); if (importResult.isSuccess()) { results.put(fileName, "æå: " + importResult.getMessage()); successCount++; } else { results.put(fileName, "失败: " + importResult.getMessage()); failureCount++; } } // æå»ºæç»ååº Map<String, Object> response = new HashMap<>(); response.put("results", results); response.put("totalFiles", fileMap.size()); response.put("successCount", successCount); response.put("failureCount", failureCount); if (failureCount > 0) { return Result.error("é¨åæä»¶å¯¼å ¥å¤±è´¥", response); } return Result.ok("æææä»¶å¯¼å ¥æå"+response); } /** * å®å ¨è£ ç½®æ£æ¥æç»å¯¼å ¥ * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, EamTechnicalStatusEvaluationStandard.class); @PostMapping(value = "/importPrecisionCheck") public Result<?> importPrecisionCheck(HttpServletRequest request, HttpServletResponse response) { return null; } /** * å®å ¨è£ ç½®æ£æ¥æç»å¯¼å ¥ * * @param request * @param response * @return */ @PostMapping(value = "/importOtherCheck") public Result<?> importOtherCheck(HttpServletRequest request, HttpServletResponse response) { return null; } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
@@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.springframework.web.multipart.MultipartFile; /** * @Description: ææ¯ç¶æé´å®è§è @@ -50,4 +52,11 @@ * @return */ boolean upgrade(EamTechnicalStatusEvaluationStandardRequest request); /** * å®å ¨è£ ç½®å¯¼å ¥ * @param file * @return */ Result<?> importSafetyEquipmentCheck(MultipartFile file); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -102,9 +102,11 @@ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())); if (!CollectionUtils.isEmpty(baseFactoryUserList)) { List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCode); }else { return page; } } //æ¥è¯¢æ¡ä»¶è¿æ»¤ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -127,9 +127,11 @@ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); if(!CollectionUtils.isEmpty(baseFactoryUserList)){ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCode); } else { return page; } } if(eamMaintenanceStandard != null) { lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -7,31 +7,43 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFTable; import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.FileUtil; import org.jeecg.common.util.SimpleVersionGenerateUtil; import org.jeecg.modules.system.entity.BaseFactory; import org.jeecg.modules.system.entity.BaseFactoryUser; import org.jeecg.modules.system.service.IBaseFactoryService; import org.jeecg.modules.system.service.IBaseFactoryUserService; import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum; import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum; import org.jeecg.modules.eam.entity.EamEquipment; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail; import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationStandardMapper; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.jeecg.modules.eam.request.ImportException; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardDetailService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService; import org.jeecg.modules.system.entity.BaseFactory; import org.jeecg.modules.system.entity.BaseFactoryUser; import org.jeecg.modules.system.service.IBaseFactoryService; import org.jeecg.modules.system.service.IBaseFactoryUserService; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.util.Arrays; import java.util.List; import java.util.*; import java.util.stream.Collectors; /** @@ -41,6 +53,7 @@ * @Version: V1.0 */ @Service @Slf4j public class EamTechnicalStatusEvaluationStandardServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationStandardMapper, EamTechnicalStatusEvaluationStandard> implements IEamTechnicalStatusEvaluationStandardService { @Autowired @@ -49,6 +62,10 @@ private IBaseFactoryService baseFactoryService; @Autowired private IEamTechnicalStatusEvaluationStandardDetailService standardDetailService; @Autowired private IEamEquipmentService equipmentService; @Autowired private ISysBusinessCodeRuleService businessCodeRuleService; @Override public IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, EamTechnicalStatusEvaluationStandard query) { @@ -68,9 +85,9 @@ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())); if (!CollectionUtils.isEmpty(baseFactoryUserList)) { List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); List<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); queryWrapper.in("e.factory_org_code", factoryCode); Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCodeList); } else { return page; } @@ -301,4 +318,167 @@ this.getBaseMapper().updateById(entity); return true; } @Override @Transactional(rollbackFor = Exception.class) public Result<?> importSafetyEquipmentCheck(MultipartFile file) { String fileName = file.getOriginalFilename(); if (StringUtils.isBlank(fileName)) { return Result.error(fileName + ":æä»¶æ ¼å¼é误,æ æ³è§£æï¼"); } String fileSuffix = FileUtil.getFileSuffix(fileName); //åªæ¯æ .docx çwordææ¡£ if ("docx".equals(fileSuffix)) { try (XWPFDocument doc = new XWPFDocument(file.getInputStream())) { List<XWPFParagraph> paragraphs = doc.getParagraphs(); List<XWPFTable> tables = doc.getTables(); if (CollectionUtil.isEmpty(paragraphs) || CollectionUtil.isEmpty(tables)) { return Result.error(fileName + ":æ¤æä»¶ä¸ç¬¦åå®å ¨è£ ç½®æ£æ¥æ¨¡æ¿è§èï¼è¯·æ£æ¥ï¼"); } //è·åæä»¶æ é¢ StringBuilder builder = new StringBuilder(); paragraphs.forEach(paragraph -> { if (StringUtils.isNotBlank(paragraph.getText())) { builder.append(paragraph.getText().trim()); } }); if (!checkImportCategory(builder.toString(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK)) { return Result.error(fileName + ":æ¤æä»¶ä¸ç¬¦åå®å ¨è£ ç½®æ£æ¥æ¨¡æ¿è§èï¼è¯·æ£æ¥ï¼"); } //è·å设å¤ä¿¡æ¯ EamEquipment equipment = extractEquipmentInfo(tables.get(0)); //æ¥çæ¯å¦ææ¤è®¾å¤å¯ç¨çè§èä¿¡æ¯ EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null); if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) { return Result.error(fileName + ":æ¤è®¾å¤çå®å ¨è£ ç½®æ£æ¥é¡¹å·²æ·»å ï¼è¯·è¿è¡ç¼è¾æåçï¼"); } //è·åæ£æ¥é¡¹ä¿¡æ¯ List<EamTechnicalStatusEvaluationStandardDetail> detailList = extractSafetyEquipmentCheckItems(tables); if(CollectionUtil.isEmpty(detailList)){ return Result.error(fileName + ":æªè§£æå°æ£æ¥é¡¹å 容ï¼è¯·æ£æ¥ï¼"); } if(originalStandard != null) { //å·²å卿æ¯ç¶æé´å®è§è,ä¸è§èç¶æä¸ºå·²æäº¤ originalStandard.setHasSafetyEquipmentCheck(CommonConstant.STATUS_1); originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()); super.getBaseMapper().updateById(originalStandard); detailList.forEach(standardDetail -> { standardDetail.setStandardId(originalStandard.getId()); }); standardDetailService.saveBatch(detailList); }else { String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); //æ°å¢ææ¯ç¶æé´å®è§è EamTechnicalStatusEvaluationStandardRequest request = new EamTechnicalStatusEvaluationStandardRequest(); request.setEquipmentId(equipment.getId()); request.setHasSafetyEquipmentCheck(CommonConstant.STATUS_1); request.setHasOtherCheck(CommonConstant.STATUS_0); request.setHasPrecisionCheck(CommonConstant.STATUS_0); request.setStandardCode(codeSeq); request.setStandardName(equipment.getEquipmentName() + "ææ¯ç¶æé´å®è§è"); request.setTableDetailList(detailList); this.addEamTechnicalStatusEvaluationStandard(request); } } catch (ImportException e) { log.error(e.getMessage(), e); return Result.error(fileName + ":" + e.getMessage() + "ï¼"); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error(fileName + ":ç³»ç»é误-" + e.getMessage() + "ï¼"); } } else { return Result.error(fileName + ":æä»¶æ ¼å¼é误,æ æ³è§£æï¼"); } return Result.OK(fileName + ":å¯¼å ¥æåï¼"); } private boolean checkImportCategory(String title, TechnicalStatusEvaluationCheckCategoryEnum category) { switch (category) { case SAFETY_EQUIPMENT_CHECK: return title.contains("å®å ¨è£ ç½®æ£æ¥"); case PRECISION_CHECK: return title.contains("ç²¾åº¦æ£æ¥å"); case OTHER_CHECK: return title.contains("å ¶ä»æ£æ¥"); } return false; } /** * æå设å¤åºæ¬ä¿¡æ¯ */ private EamEquipment extractEquipmentInfo(XWPFTable table) { if (table.getNumberOfRows() < 4) { //妿 table å°äº4è¡ ä»£è¡¨ä¸ç¬¦å模æ¿è§èï¼å¯¼å ¥å¤±è´¥ throw new JeecgBootException("æ¤æä»¶ä¸ç¬¦åå®å ¨è£ ç½®æ£æ¥æ¨¡æ¿è§èï¼è¯·æ£æ¥"); } // æå第äºè¡æ°æ® Map<String, String> row2Data = extractHeadRowData(table.getRow(1)); //è·å设å¤ç»ä¸ç¼ç String equipmentCode = row2Data.get("ç»ä¸ç¼å·") == null ? null : row2Data.get("ç»ä¸ç¼å·").trim(); EamEquipment eamEquipment = equipmentService.selectByEquipmentCode(equipmentCode); if (eamEquipment == null) { throw new JeecgBootException("æªæ¾å°è®¾å¤ä¿¡æ¯ï¼è¯·æ¥ç设å¤å°è´¦æ¯å¦ææ¤è®¾å¤"); } return eamEquipment; } /** * è¡¨æ ¼è¡¨å¤´æ°æ®è§£æ */ private Map<String, String> extractHeadRowData(XWPFTableRow row) { Map<String, String> data = new HashMap<>(); if(CollectionUtil.isEmpty(row.getTableCells()) || row.getTableCells().size() != 4) { throw new JeecgBootException("æ¤æä»¶ä¸ç¬¦åå®å ¨è£ ç½®æ£æ¥æ¨¡æ¿è§èï¼è¯·æ£æ¥"); } int cellCount = row.getTableCells().size(); for (int i = 0; i < cellCount; i += 2) { String key = row.getCell(i).getText().trim(); String value = row.getCell(i + 1).getText().trim(); if (StringUtils.isNotBlank(key) && StringUtils.isNotBlank(value)) { data.put(key, value); } } return data; } /** * æåå®å ¨è£ ç½®æ£æ¥æç» */ private List<EamTechnicalStatusEvaluationStandardDetail> extractSafetyEquipmentCheckItems(List<XWPFTable> tableList) { List<EamTechnicalStatusEvaluationStandardDetail> items = new ArrayList<>(); EamTechnicalStatusEvaluationStandardDetail item = null; //è§£æç¬¬ä¸ä¸ªè¡¨æ ¼ï¼å¸¦è®¾å¤ä¿¡æ¯ XWPFTable table = tableList.get(0); for (int i = 0; i < table.getNumberOfRows(); i++) { XWPFTableRow row = table.getRow(i); if (row == null || CollectionUtil.isEmpty(row.getTableCells()) || row.getTableCells().size() < 2) { //读åå°ç©ºrowå¼ continue; } //æ£æ¥æ¯å¦å°æ£æ¥é¡¹åºå· String firstCell = row.getCell(0).getText().trim(); Integer itemCode = null; try { itemCode = Integer.parseInt(firstCell); } catch (NumberFormatException e) { //䏿¯æ£æ¥é¡¹å 容ï¼è·³è¿æ¤è¡ continue; } //è·å第äºä¸ªåå æ ¼ String secondCell = row.getCell(1).getText().trim(); //妿è¿ä¸è¡ä¸ºåºå·åè§£ææ´è¡ if (StringUtils.isNotBlank(secondCell)) { item = new EamTechnicalStatusEvaluationStandardDetail(); item.setItemCode(itemCode); item.setItemName(secondCell); item.setCheckCategory(TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name()); items.add(item); } } return items; } }