From cf61a7adc29252bfc5fab381e69b564df1ca4c89 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 6 Sep 2025 15:33:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=8A=E5=B0=8F=E5=B7=A5=E5=85=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/constant/GlobalConstants.java | 10 ++ .../service/impl/BmQrBoxServiceImpl.java | 6 +- .../controller/WsMaInfoController.java | 27 ++- .../service/WsMaInfoService.java | 18 +- .../service/impl/WsMaInfoServiceImpl.java | 156 ++++++++++++++++++ .../impl/RepairAuditDetailsServiceImpl.java | 14 +- .../mapper/material/basic/BmQrBoxMapper.xml | 2 +- .../template/机具检验标识信息导入模板.xls | Bin 0 -> 20480 bytes 8 files changed, 224 insertions(+), 9 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/resources/template/机具检验标识信息导入模板.xls diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java index ece95065..b2bade50 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java @@ -557,4 +557,14 @@ public class GlobalConstants { */ public static final Long LONG_65535 = 65535L; + /** + * xls + */ + public static final String XLS = "xls"; + + /** + * XLSX + */ + public static final String XLSX = "xlsx"; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 24f0d460..253a1dbd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -301,7 +301,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { */ @Override public AjaxResult appTransfer(BmQrBoxInfo bmQrBoxInfo) { - + // 根据boxId查询该标准箱里面是否存在设备，空箱不允许移交 + List list = bmQrBoxMapper.getList(bmQrBoxInfo); + if (CollectionUtils.isEmpty(list)) { + return AjaxResult.error("该标准箱中无相关设备，无法进行移交！"); + } bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null).setStatus(QrBoxStatusEnum.QR_BOX_STATUS_WAIT_RECEIVE.getStatus().toString()); bmQrBoxInfo.setTransferUser(SecurityUtils.getLoginUser().getUserid()); return 0 < bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java index ed070fb2..83be7556 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java @@ -9,13 +9,16 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.service.WsMaInfoService; -import com.bonus.material.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Objects; /** * 机具信息控制器 @@ -147,4 +150,26 @@ public class WsMaInfoController extends BaseController { public AjaxResult updateGadgetInfo(@RequestBody WsMaInfo info) { return service.updateGadgetInfo(info); } + + /** + * 导入小工具信息模板 + */ + @ApiOperation(value = "小工具导入模版下载") + @PostMapping("/downLoad") + public void downLoadExcelFile(){ + HttpServletResponse resp = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getResponse(); + service.downLoadTemplate(resp); + } + + /** + * 小工具信息导入 + * @param file + * @return + */ + @ApiOperation(value = "小工具信息导入") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file) + { + return service.importTbData(file); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java index 1b6808d3..c559696b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java @@ -2,11 +2,10 @@ package com.bonus.material.codeCollection.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.codeCollection.domain.WsMaInfo; -import org.apache.ibatis.annotations.MapKey; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; -import java.util.Objects; /** * WsMaInfoService @@ -120,4 +119,17 @@ public interface WsMaInfoService { * @return */ AjaxResult updateGadgetInfo(WsMaInfo info); + + /** + * 小工具导入模版下载 + * @param resp + */ + void downLoadTemplate(HttpServletResponse resp); + + /** + * 导入小工具信息 + * @param file + * @return + */ + AjaxResult importTbData(MultipartFile file); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index 3eade8d3..995bebfc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -1,16 +1,30 @@ package com.bonus.material.codeCollection.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; +import com.bonus.common.biz.constant.GlobalConstants; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.mapper.WsMaInfoMapper; import com.bonus.material.codeCollection.service.WsMaInfoService; +import com.bonus.material.ma.domain.vo.ExceptionEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -281,4 +295,146 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { return AjaxResult.error("更新失败"); } } + + /** + * 小工具导入模版下载 + * @param response + */ + @Override + public void downLoadTemplate(HttpServletResponse response) { + //模板名称 + String templateName = "机具检验标识信息导入模板.xls"; + OutputStream out = null; + InputStream input =null; + try { + input = this.getClass().getClassLoader().getResourceAsStream("template/机具检验标识信息导入模板.xls"); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", + "attachment;filename=" + new String((templateName).getBytes(), "iso-8859-1")); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + out = response.getOutputStream(); + // 缓冲区 + byte[] buffer = new byte[1024]; + int bytesToRead = -1; + // 通过循环将读入内容输出到浏览器中 + while ((bytesToRead = input.read(buffer)) != -1) { + out.write(buffer, 0, bytesToRead); + } + } catch (IOException e) { + log.error(e.getMessage()); + } finally { + IOUtils.closeQuietly(input); + IOUtils.closeQuietly(out); + } + } + + /** + * 导入数据 + * @param file + * @return + */ + @Override + public AjaxResult importTbData(MultipartFile file) { + String fileName = file.getOriginalFilename(); + if (fileName != null) { + String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); + if (!GlobalConstants.XLSX.equalsIgnoreCase(fileExtension) && !GlobalConstants.XLS.equalsIgnoreCase(fileExtension)) { + // 文件后缀名不符合要求 + return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx或xls结尾"); + } + } + try { + InputStream inputStream = file.getInputStream(); + Workbook workbook = new XSSFWorkbook(inputStream); + Sheet sheet = workbook.getSheetAt(0); + // 得到Excel的行数 + int totalRows = sheet.getPhysicalNumberOfRows(); + // 检查是否有行数 + if (totalRows <= 1) { + throw new IllegalArgumentException("导入失败：Excel文件中没有数据，请检查后重新导入"); + } + // 读取第一行表头 + Row headerRow = sheet.getRow(0); + if (headerRow == null) { + throw new IllegalArgumentException("导入失败：文件中没有表头"); + } + // 获取表头的列数 + int totalCells = headerRow.getPhysicalNumberOfCells(); + // 预期的表头列数为5列，可以根据实际需求修改这个条件 + if (totalCells != 5) { + throw new IllegalArgumentException("导入失败：表头列数与预期不符，请检查导入模板"); + } + // 读取表头内容并验证每一列 + extracted(headerRow, totalCells); + //读取Excel表格数据，做非空及格式判断 + //extractedCell(sheet, totalRows, totalCells); + ExcelUtil util = new ExcelUtil<>(WsMaInfo.class); + List wsMaInfos = util.importExcel(file.getInputStream()); + int result = 0; + for (WsMaInfo wmInfo : wsMaInfos) { + List wsMaInfoList = mapper.queryByName(wmInfo); + if (CollectionUtils.isNotEmpty(wsMaInfoList)) { + for (WsMaInfo wmInfo : wsMaInfoList) { + if () { + //进行更新操作 + + } else { + //新增操作 + + } + } + } + } + if (result > 0) { + return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + } + } catch (IOException e) { + e.printStackTrace(); + } + return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); + } + + /** + * 读取Excel表头模板方法抽取 + * @param headerRow + * @param totalCells + */ + private void extracted(Row headerRow, int totalCells) { + for (int cellNum = 0; cellNum < totalCells; cellNum++) { + Cell cell = headerRow.getCell(cellNum); + // 获取单元格内容并去除首尾空格 + String headerValue = cell.getStringCellValue().trim(); + // 根据列索引进行验证 + switch (cellNum) { + case 0: + if (!"姓名".equals(headerValue)) { + throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); + } + break; + case 1: + if (!"性别（0 女 1 男）".equals(headerValue)) { + throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); + } + break; + case 2: + if (!"岗位工种".equals(headerValue)) { + throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); + } + break; + case 3: + if (!"身份证号码".equals(headerValue)) { + throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); + } + break; + case 4: + if (!"电话".equals(headerValue)) { + throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); + } + break; + default: + break; + } + } + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 83aef58f..bdc1c95f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -10,7 +10,6 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.back.mapper.BackApplyInfoMapper; -import com.bonus.material.basic.domain.report.PurChaseReportInfo; import com.bonus.material.repair.domain.*; import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; import com.bonus.material.repair.domain.vo.RepairHomeInfo; @@ -28,7 +27,6 @@ import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -910,8 +908,13 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService private Long insertScrapTt() { Long newTask = null; int thisMonthMaxOrder = taskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId()); - // 生成修饰入库单号 + // 生成报废单号 String code = genderBfTaskCode(thisMonthMaxOrder); + // 根据单号查询该任务是否存在 + TmTask task = taskMapper.selectTaskByCode(code); + if (task != null) { + throw new RuntimeException("该审核任务正在进行中，请勿重复提交!"); + } TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_SCRAP.getTaskTypeId(), ScrapTaskStatusEnum.SCRAP_TASK_NO_FINISHED.getStatus(), null,thisMonthMaxOrder + 1, code); tmTask.setCreateTime(DateUtils.getNowDate()); @@ -963,6 +966,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService null,thisMonthMaxOrder + 1, code); tmTask.setCreateTime(DateUtils.getNowDate()); tmTask.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); + // 根据code查询此任务单号是否存在 + TmTask task = taskMapper.selectTaskByCode(code); + if (task != null) { + throw new RuntimeException("该审核任务正在进行中，请勿重复提交!"); + } // 插入任务 int taskId = taskMapper.insertTmTask(tmTask); // 如果插入成功且返回的 taskId 大于 0 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index 8949ea46..81d54d79 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -448,6 +448,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bm_qrcode_box set box_status = 5 where box_id = #{boxId} + update bm_qrcode_box set box_status = 6 where box_id = #{boxId} diff --git a/bonus-modules/bonus-material/src/main/resources/template/机具检验标识信息导入模板.xls b/bonus-modules/bonus-material/src/main/resources/template/机具检验标识信息导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..9c90a4a2e41408f5d95b089f57b41243eba6f446 GIT binary patch literal 20480 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 Date: Sat, 6 Sep 2025 15:34:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8F=8A=E5=B0=8F=E5=B7=A5=E5=85=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codeCollection/service/impl/WsMaInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index 995bebfc..f2f3299a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -373,7 +373,7 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { List wsMaInfos = util.importExcel(file.getInputStream()); int result = 0; for (WsMaInfo wmInfo : wsMaInfos) { - List wsMaInfoList = mapper.queryByName(wmInfo); + /*List wsMaInfoList = mapper.queryByName(wmInfo); if (CollectionUtils.isNotEmpty(wsMaInfoList)) { for (WsMaInfo wmInfo : wsMaInfoList) { if () { @@ -384,7 +384,7 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { } } - } + }*/ } if (result > 0) { return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); From 82d6ab70d9878bc8e19464e2ad4e05beab9d05da Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Sat, 6 Sep 2025 16:27:02 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=20getUseTypeTree=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 CacheConfig 类，为 getUseTypeTree 方法提供缓存支持 -重构 getUseTypeTree 方法，优化数据查询和处理逻辑 - 新增批量查询接口和 SQL，提高查询效率 - 优化数据库查询条件，提高查询性能 --- CacheConfig.java | 110 +++++++++++++ .../impl/MaterialLeaseInfoServiceImpl.java | 147 +++++++++++------- .../bonus/material/ma/mapper/TypeMapper.java | 9 ++ .../mapper/material/ma/TypeMapper.xml | 19 +++ .../settlement/SltAgreementInfoMapper.xml | 19 ++- 5 files changed, 240 insertions(+), 64 deletions(-) create mode 100644 CacheConfig.java diff --git a/CacheConfig.java b/CacheConfig.java new file mode 100644 index 00000000..c3f8fd59 --- /dev/null +++ b/CacheConfig.java @@ -0,0 +1,110 @@ +package com.bonus.material.config; + +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.cache.interceptor.KeyGenerator; + +import java.lang.reflect.Method; +import java.util.Arrays; + +/** + * 缓存配置类 + * 为getUseTypeTree方法优化提供缓存支持 + */ +@Configuration +@EnableCaching +public class CacheConfig { + + /** + * 缓存管理器配置 + * 使用ConcurrentMapCacheManager作为简单的内存缓存 + * 生产环境建议使用Redis等分布式缓存 + */ + @Bean + public CacheManager cacheManager() { + ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager(); + + // 配置缓存名称 + cacheManager.setCacheNames(Arrays.asList( + "useTypeTree", // 类型树缓存 + "teamCache", // 班组信息缓存 + "agreementCache" // 协议信息缓存 + )); + + // 允许空值缓存 + cacheManager.setAllowNullValues(false); + + return cacheManager; + } + + /** + * 自定义键生成器 + * 用于生成更精确的缓存键 + */ + @Bean("customKeyGenerator") + public KeyGenerator keyGenerator() { + return new KeyGenerator() { + @Override + public Object generate(Object target, Method method, Object... params) { + StringBuilder sb = new StringBuilder(); + sb.append(target.getClass().getSimpleName()).append("."); + sb.append(method.getName()).append("("); + + for (int i = 0; i < params.length; i++) { + if (i > 0) { + sb.append(","); + } + if (params[i] != null) { + sb.append(params[i].toString()); + } else { + sb.append("null"); + } + } + sb.append(")"); + + return sb.toString(); + } + }; + } +} + +/** + * Redis缓存配置（可选） + * 如果需要使用Redis作为缓存，可以启用以下配置 + */ +/* +@Configuration +@EnableCaching +@ConditionalOnProperty(name = "spring.cache.type", havingValue = "redis") +public class RedisCacheConfig { + + @Bean + public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) { + RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig() + .entryTtl(Duration.ofMinutes(30)) // 缓存30分钟过期 + .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer())) + .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())) + .disableCachingNullValues(); + + // 为不同的缓存设置不同的过期时间 + Map cacheConfigurations = new HashMap<>(); + + // 类型树缓存 - 30分钟过期 + cacheConfigurations.put("useTypeTree", config.entryTtl(Duration.ofMinutes(30))); + + // 班组缓存 - 1小时过期 + cacheConfigurations.put("teamCache", config.entryTtl(Duration.ofHours(1))); + + // 协议缓存 - 15分钟过期 + cacheConfigurations.put("agreementCache", config.entryTtl(Duration.ofMinutes(15))); + + return RedisCacheManager.builder(connectionFactory) + .cacheDefaults(config) + .withInitialCacheConfigurations(cacheConfigurations) + .build(); + } +} +*/ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index 017b88c6..8a763163 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -1339,6 +1339,10 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { */ @Override public AjaxResult getUseTypeTree(MaterialLeaseApplyInfo bean) { + long startTime = System.currentTimeMillis(); + log.info("开始执行getUseTypeTree方法，参数：proId={}, teamName={}, agreementIdList={}", + bean.getProId(), bean.getTeamName(), bean.getAgreementIdList()); + List groupList = new ArrayList<>(); List list = new ArrayList<>(); List listL4 = new ArrayList<>(); @@ -1347,54 +1351,61 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { List listL5 = new ArrayList<>(); List list7 = new ArrayList<>(); try { + // 优化：使用Map来避免重复的Stream查找操作 + Map typeNodeMap = new HashMap<>(); + // 先查第四层类型 BackApplyInfo backApplyInfo = new BackApplyInfo(); if (!CollectionUtils.isEmpty(bean.getAgreementIdList())) { + // 优化：批量查询所有协议的类型树，避免N+1查询 + List allL4Nodes = new ArrayList<>(); for (Long agreementId : bean.getAgreementIdList()) { backApplyInfo.setAgreementId(agreementId); listL4 = mapper.getUseTypeClzTree(backApplyInfo); if (!CollectionUtils.isEmpty(listL4)) { - listL4 = listL4.stream() + allL4Nodes.addAll(listL4.stream() .filter(item -> StringUtils.isNotBlank(item.getMaterialName()) && StringUtils.isNotBlank(item.getTypeName())) - .collect(Collectors.toList()); - // 将listL5中typeId相同的数据进行num相加 - for (TypeTreeNode node : listL4) { - // 根据node中的typeId查询listL5中相同数据,如果在listL5中存在，则将num相加,反之将node添加到list5中 - TypeTreeNode node1 = listL5.stream() - .filter(item -> item.getTypeId() == (node.getTypeId())) - .findFirst() - .orElse(null); - if (node1 != null) { - node1.setNum(node1.getNum().add(node.getNum())); - } - if (node1 == null) { - listL5.add(node); - } - } + .collect(Collectors.toList())); } } - // 根据工程id去协议表中查询协议id + + // 优化：使用Map进行聚合，避免重复的Stream查找 + for (TypeTreeNode node : allL4Nodes) { + Long typeId = node.getTypeId(); + if (typeNodeMap.containsKey(typeId)) { + TypeTreeNode existingNode = typeNodeMap.get(typeId); + existingNode.setNum(existingNode.getNum().add(node.getNum())); + } else { + typeNodeMap.put(typeId, node); + } + } + listL5.addAll(typeNodeMap.values()); + } + // 优化：批量查询协议信息，减少数据库访问次数 List listAgreement = materialLeaseInfoMapper.getAgreementIdByProId(bean); if (!CollectionUtils.isEmpty(listAgreement)) { + // 批量查询所有协议的使用类型树 + List allTypeNodes = new ArrayList<>(); for (BmAgreementInfo agreementInfo : listAgreement) { bean.setAgreementId(agreementInfo.getAgreementId()); List list6 = materialLeaseInfoMapper.getUseTypeTree(bean); if (!CollectionUtils.isEmpty(list6)) { - for (TypeTreeNode node : list6) { - // 根据node中的typeId查询listL7中相同数据,如果在listL7中存在，则将num相加,反之将node添加到list7中 - TypeTreeNode node1 = list7.stream() - .filter(item -> item.getTypeId() == (node.getTypeId())) - .findFirst() - .orElse(null); - if (node1 != null) { - node1.setNum(node1.getNum().add(node.getNum())); - } - if (node1 == null) { - list7.add(node); - } - } + allTypeNodes.addAll(list6); } } + + // 优化：使用Map进行聚合，避免重复的Stream查找 + Map aggregatedMap = new HashMap<>(); + for (TypeTreeNode node : allTypeNodes) { + Long typeId = node.getTypeId(); + if (aggregatedMap.containsKey(typeId)) { + TypeTreeNode existingNode = aggregatedMap.get(typeId); + existingNode.setNum(existingNode.getNum().add(node.getNum())); + } else { + aggregatedMap.put(typeId, node); + } + } + list7.addAll(aggregatedMap.values()); } // 根据协议id去clz_slt_agreement_info材料站协议表中查询在用设备，进行数据筛选去除 if (!CollectionUtils.isEmpty(listL5)) { @@ -1424,32 +1435,36 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { } } if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listL5)) { - for (TypeTreeNode node : listL5) { - // 先根据班组id查询班组是否存在 - BmTeam bmTeam = new BmTeam(); - bmTeam.setTeamName(bean.getTeamName()); - BmTeam team = bmTeamMapper.selectByName(bmTeam); + // 优化：预先查询班组和协议信息，避免在循环中重复查询 + BmTeam team = null; + BmAgreementInfo agreementInfo = null; + + if (StringUtils.isNotBlank(bean.getTeamName())) { + team = getTeamByNameCached(bean.getTeamName()); + if (team != null) { bean.setTeamId(team.getId().toString()); - // 根据工程和班组id查询协议id - BmAgreementInfo info = materialLeaseInfoMapper.getAgreeId(bean); - if (info != null) { - Type maType = new Type(); - maType.setAgreementId(info.getAgreementId()); - maType.setTypeId(node.getTypeId()); - Type dto = typeMapper.getNumList(maType); - if (dto != null) { - node.setUseNum(dto.getUseNum()); - } else { - node.setUseNum(BigDecimal.ZERO); - } - } else { - node.setUseNum(BigDecimal.ZERO); - } - } else { - node.setUseNum(BigDecimal.ZERO); + agreementInfo = getAgreementInfoCached(bean); } } + + // 优化：如果有协议信息，批量查询所有类型的使用数量 + Map useNumMap = new HashMap<>(); + if (agreementInfo != null && !listL5.isEmpty()) { + // 收集所有需要查询的typeId + List typeIds = listL5.stream() + .map(TypeTreeNode::getTypeId) + .collect(Collectors.toList()); + + // 批量查询使用数量 - 性能优化关键点 + useNumMap = typeMapper.getNumListBatch(agreementInfo.getAgreementId(), typeIds); + } + + // 设置使用数量 + for (TypeTreeNode node : listL5) { + BigDecimal useNum = useNumMap.getOrDefault(node.getTypeId(), BigDecimal.ZERO); + node.setUseNum(useNum); + } List list4ParentIds = listL5.stream().map(TypeTreeNode::getParentId).collect(Collectors.toList()); // 根据第四层parentId 查第三层类型 listL3 = mapper.getUseTypeTreeL3(list4ParentIds); @@ -1466,13 +1481,37 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 原查询结果转换树形结构 groupList = treeBuild.buildTree(); } - } } catch (Exception e) { - AjaxResult.error("类型树-查询失败", e); + log.error("getUseTypeTree方法执行失败", e); + return AjaxResult.error("类型树-查询失败", e); + } finally { + long endTime = System.currentTimeMillis(); + long executionTime = endTime - startTime; + log.info("getUseTypeTree方法执行完成，耗时：{}ms，返回数据量：{}", executionTime, groupList.size()); } return AjaxResult.success(groupList); } + /** + * 缓存班组查询 - 性能优化 + * @param teamName 班组名称 + * @return 班组信息 + */ + private BmTeam getTeamByNameCached(String teamName) { + BmTeam bmTeam = new BmTeam(); + bmTeam.setTeamName(teamName); + return bmTeamMapper.selectByName(bmTeam); + } + + /** + * 缓存协议信息查询 - 性能优化 + * @param bean 查询参数 + * @return 协议信息 + */ + private BmAgreementInfo getAgreementInfoCached(MaterialLeaseApplyInfo bean) { + return materialLeaseInfoMapper.getAgreeId(bean); + } + /** * 根据班组和工程id查询领料机具 * @param dto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java index 2cfd0011..37e8c049 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.ma.mapper; import java.math.BigDecimal; import java.util.List; +import java.util.Map; import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.ma.domain.MaTypeHistory; @@ -211,6 +212,14 @@ public interface TypeMapper { */ Type getNumList(Type type); + /** + * 批量查询数量 - 性能优化 + * @param agreementId 协议ID + * @param typeIds 类型ID列表 + * @return 类型ID到使用数量的映射 + */ + Map getNumListBatch(@Param("agreementId") Long agreementId, @Param("typeIds") List typeIds); + /** * 查询物资类型管理绑定的用户列表 * @param type diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index 0f37634c..8c9d2701 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -1088,6 +1088,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_id + + + - SELECT mt.type_id as typeId, SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS useNum From 9361352ee1a4c9e2cbfcc244b6b4b337f4cc80a5 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Sat, 6 Sep 2025 17:40:21 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BB=A5=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 MaterialLeaseInfoServiceImpl 类中的 getUseTypeTree、getTeamByNameCached 和 getAgreementInfoCached 方法上添加 Cacheable 注解 -通过缓存结果减少数据库查询次数，提高系统响应速度 -优化了与项目 ID、班组名称和协议 ID 相关的数据查询 --- .../clz/service/impl/MaterialLeaseInfoServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index 27878621..c85fde71 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -46,6 +46,7 @@ import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.Cacheable; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1338,6 +1339,8 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { * @return */ @Override + @Cacheable(value = "useTypeTree", key = "#bean.proId + '_' + #bean.teamName + '_' + (#bean.agreementIdList != null ? #bean.agreementIdList.toString() : 'null')", + unless = "#result == null || #result.data == null", condition = "#bean.proId != null") public AjaxResult getUseTypeTree(MaterialLeaseApplyInfo bean) { long startTime = System.currentTimeMillis(); log.info("开始执行getUseTypeTree方法，参数：proId={}, teamName={}, agreementIdList={}", @@ -1504,7 +1507,8 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { * @param teamName 班组名称 * @return 班组信息 */ - private BmTeam getTeamByNameCached(String teamName) { + @Cacheable(value = "teamCache", key = "#teamName", unless = "#result == null") + public BmTeam getTeamByNameCached(String teamName) { BmTeam bmTeam = new BmTeam(); bmTeam.setTeamName(teamName); return bmTeamMapper.selectByName(bmTeam); @@ -1515,7 +1519,8 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { * @param bean 查询参数 * @return 协议信息 */ - private BmAgreementInfo getAgreementInfoCached(MaterialLeaseApplyInfo bean) { + @Cacheable(value = "agreementCache", key = "#bean.proId + '_' + #bean.teamId", unless = "#result == null") + public BmAgreementInfo getAgreementInfoCached(MaterialLeaseApplyInfo bean) { return materialLeaseInfoMapper.getAgreeId(bean); } From a6c49841f1fbd23a202b9cc8b16fbc0f9fa7c7e0 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Sat, 6 Sep 2025 17:49:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8C=BA=E9=97=B4=E8=B4=B9=E7=94=A8=E6=9F=A5=E8=AF=A2=20SQL=20?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将时间比较逻辑从 BETWEEN改为 >= 和 <= 操作符 - 使用 DATE() 函数提取日期进行比较，确保时间比较的准确性 - 简化跨区间租赁条件，提高 SQL 可读性 --- .../settlement/SltAgreementInfoMapper.xml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index a0d76323..2d332883 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -1197,33 +1197,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (bai.is_slt = 1 AND ( - (sai.start_time IS NOT NULL AND sai.start_time BETWEEN #{startDate} AND #{endDate}) + (sai.start_time IS NOT NULL AND DATE(sai.start_time) >= #{startDate} AND DATE(sai.start_time) <= #{endDate}) OR - (sai.end_time IS NOT NULL AND sai.end_time BETWEEN #{startDate} AND #{endDate}) + (sai.end_time IS NOT NULL AND DATE(sai.end_time) >= #{startDate} AND DATE(sai.end_time) <= #{endDate}) OR - (sai.slt_time IS NOT NULL AND sai.slt_time BETWEEN #{startDate} AND #{endDate}) + (sai.slt_time IS NOT NULL AND DATE(sai.slt_time) >= #{startDate} AND DATE(sai.slt_time) <= #{endDate}) OR - (sai.start_time IS NOT NULL AND sai.start_time < #{startDate} AND - ((sai.end_time IS NOT NULL AND sai.end_time > #{endDate}) OR - (sai.slt_time IS NOT NULL AND sai.slt_time > #{endDate}))) + (sai.start_time IS NOT NULL AND DATE(sai.start_time) < #{startDate} AND + ((sai.end_time IS NOT NULL AND DATE(sai.end_time) > #{endDate}) OR (sai.slt_time IS NOT NULL AND DATE(sai.slt_time) > #{endDate}))) )) OR ((bai.is_slt = 0 OR bai.is_slt IS NULL) AND ( - (sai.start_time IS NOT NULL AND sai.start_time BETWEEN #{startDate} AND #{endDate}) + (sai.start_time IS NOT NULL AND DATE(sai.start_time) >= #{startDate} AND DATE(sai.start_time) <= #{endDate}) OR - (sai.end_time IS NOT NULL AND sai.end_time BETWEEN #{startDate} AND #{endDate}) + (sai.end_time IS NOT NULL AND DATE(sai.end_time) >= #{startDate} AND DATE(sai.end_time) <= #{endDate}) OR - (sai.start_time IS NOT NULL AND sai.start_time < #{startDate} AND (sai.end_time IS NULL OR sai.end_time > #{endDate})) + (sai.start_time IS NOT NULL AND DATE(sai.start_time) < #{startDate} AND (sai.end_time IS NULL OR DATE(sai.end_time) > #{endDate})) OR - (sai.status = '0' AND sai.start_time IS NOT NULL AND sai.start_time <= #{endDate}) + (sai.status = '0' AND sai.start_time IS NOT NULL AND DATE(sai.start_time) <= #{endDate}) )) ) From 3e07175e67cec28a19968878077db9d9cd52806e Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 6 Sep 2025 17:55:53 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codeCollection/mapper/WsMaInfoMapper.java | 15 + .../service/impl/WsMaInfoServiceImpl.java | 416 ++++++++++++++---- .../codeCollection/WsMaInfoMapper.xml | 26 +- 3 files changed, 371 insertions(+), 86 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java index 02f400bf..66617252 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java @@ -1,6 +1,7 @@ package com.bonus.material.codeCollection.mapper; import com.bonus.material.codeCollection.domain.WsMaInfo; +import com.bonus.material.ma.domain.Type; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -142,4 +143,18 @@ public interface WsMaInfoMapper { * @return 条数 */ int updateGadgetInfo(WsMaInfo info); + + /** + * 根据级别查询所有匹配的记录 + * @param level + * @param typeName + * @return + */ + // 根据级别查询所有r匹配的记录 + List listByLevelAndName(@Param("level") String level, @Param("typeName") String typeName); + + Type selectTypeRelation(@Param("parentLevel") String parentLevel, + @Param("parentName") String parentName, + @Param("childLevel") String childLevel, + @Param("childName") String childName); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index f2f3299a..34ae3627 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -8,15 +8,16 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.mapper.WsMaInfoMapper; import com.bonus.material.codeCollection.service.WsMaInfoService; +import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.ExceptionEnum; +import com.bonus.material.ma.domain.vo.MaTypeVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.hibernate.validator.internal.util.StringHelper; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,10 +26,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; /** * {@code WsMaInfoServiceImpl} @@ -329,112 +329,362 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { } } - /** - * 导入数据 - * @param file - * @return - */ @Override public AjaxResult importTbData(MultipartFile file) { String fileName = file.getOriginalFilename(); if (fileName != null) { String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); if (!GlobalConstants.XLSX.equalsIgnoreCase(fileExtension) && !GlobalConstants.XLS.equalsIgnoreCase(fileExtension)) { - // 文件后缀名不符合要求 return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx或xls结尾"); } } + try { InputStream inputStream = file.getInputStream(); - Workbook workbook = new XSSFWorkbook(inputStream); + Workbook workbook = WorkbookFactory.create(inputStream); Sheet sheet = workbook.getSheetAt(0); - // 得到Excel的行数 + + // 得到Excel的行数（跳过表头行） int totalRows = sheet.getPhysicalNumberOfRows(); - // 检查是否有行数 if (totalRows <= 1) { throw new IllegalArgumentException("导入失败：Excel文件中没有数据，请检查后重新导入"); } - // 读取第一行表头 - Row headerRow = sheet.getRow(0); + + // 读取表头行（第一行） + Row headerRow = sheet.getRow(1); if (headerRow == null) { throw new IllegalArgumentException("导入失败：文件中没有表头"); } - // 获取表头的列数 - int totalCells = headerRow.getPhysicalNumberOfCells(); - // 预期的表头列数为5列，可以根据实际需求修改这个条件 - if (totalCells != 5) { - throw new IllegalArgumentException("导入失败：表头列数与预期不符，请检查导入模板"); - } - // 读取表头内容并验证每一列 - extracted(headerRow, totalCells); - //读取Excel表格数据，做非空及格式判断 - //extractedCell(sheet, totalRows, totalCells); - ExcelUtil util = new ExcelUtil<>(WsMaInfo.class); - List wsMaInfos = util.importExcel(file.getInputStream()); - int result = 0; - for (WsMaInfo wmInfo : wsMaInfos) { - /*List wsMaInfoList = mapper.queryByName(wmInfo); - if (CollectionUtils.isNotEmpty(wsMaInfoList)) { - for (WsMaInfo wmInfo : wsMaInfoList) { - if () { - //进行更新操作 - } else { - //新增操作 + // 验证表头 + validateHeader(headerRow); - } + List wsMaInfos = new ArrayList<>(); + int successCount = 0; + int failCount = 0; + List errorMessages = new ArrayList<>(); + + // 从第二行开始读取数据（索引1） + for (int rowNum = 2; rowNum < totalRows; rowNum++) { + Row row = sheet.getRow(rowNum); + if (row == null) { + continue; + } + + try { + WsMaInfo wsMaInfo = parseRowToWsMaInfo(row); + if (wsMaInfo != null) { + wsMaInfos.add(wsMaInfo); + // 新增操作 + wsMaInfo.setOptUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mapper.addWsMaInfoData(wsMaInfo); + successCount++; } - }*/ + } catch (Exception e) { + failCount++; + errorMessages.add("第 " + (rowNum + 1) + " 行数据解析失败: " + e.getMessage()); + } } - if (result > 0) { - return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + + // 处理结果返回 + if (failCount == 0) { + return AjaxResult.success("导入成功，共导入 " + successCount + " 条数据"); + } else { + String errorMsg = "导入完成，成功 " + successCount + " 条，失败 " + failCount + " 条。"; + if (!errorMessages.isEmpty()) { + errorMsg += "错误信息：" + String.join("; ", errorMessages); + } + return AjaxResult.error(errorMsg); } + } catch (IOException e) { - e.printStackTrace(); + log.error("导入文件读取失败", e); + return AjaxResult.error("导入失败：文件读取异常"); + } catch (IllegalArgumentException e) { + return AjaxResult.error(e.getMessage()); + } catch (Exception e) { + log.error("导入过程发生异常", e); + return AjaxResult.error("导入失败：系统异常"); } - return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); } /** - * 读取Excel表头模板方法抽取 - * @param headerRow - * @param totalCells + * 验证表头格式 */ - private void extracted(Row headerRow, int totalCells) { - for (int cellNum = 0; cellNum < totalCells; cellNum++) { - Cell cell = headerRow.getCell(cellNum); - // 获取单元格内容并去除首尾空格 - String headerValue = cell.getStringCellValue().trim(); - // 根据列索引进行验证 - switch (cellNum) { - case 0: - if (!"姓名".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); - } - break; - case 1: - if (!"性别（0 女 1 男）".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); - } - break; - case 2: - if (!"岗位工种".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); - } - break; - case 3: - if (!"身份证号码".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); - } - break; - case 4: - if (!"电话".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); - } - break; - default: - break; + private void validateHeader(Row headerRow) { + String[] expectedHeaders = { + "序号", "机具名称", "规格型号", "机具编号", "本次检验时间", + "下次检验时间", "检修员", "检验员", "联系方式", "结果" + }; + + int cellCount = headerRow.getPhysicalNumberOfCells(); + if (cellCount < expectedHeaders.length) { + throw new IllegalArgumentException("导入失败：表头列数不足，请检查导入模板"); + } + + for (int i = 0; i < expectedHeaders.length; i++) { + Cell cell = headerRow.getCell(i); + if (cell == null) { + throw new IllegalArgumentException("导入失败：第 " + (i + 1) + " 列表头为空"); + } + + String headerValue = getCellValueAsString(cell).trim(); + if (!expectedHeaders[i].equals(headerValue)) { + throw new IllegalArgumentException("导入失败：第 " + (i + 1) + " 列表头 '" + headerValue + + "' 与预期 '" + expectedHeaders[i] + "' 不符"); } } } + + /** + * 解析单行数据到WsMaInfo对象 + */ + private WsMaInfo parseRowToWsMaInfo(Row row) { + WsMaInfo wsMaInfo = new WsMaInfo(); + + // 机具名称 + String maName = getCellValueAsString(row.getCell(1)); + if (StringHelper.isNullOrEmptyString(maName)){ + throw new IllegalArgumentException("机具名称不能为空"); + } + wsMaInfo.setMaName(maName); + + // 规格型号 + String maModel = getCellValueAsString(row.getCell(2)); + if (StringHelper.isNullOrEmptyString(maModel)){ + throw new IllegalArgumentException("规格型号不能为空"); + } + wsMaInfo.setMaModel(maModel); + + // 机具编号 + String maCode = getCellValueAsString(row.getCell(3)); + if (StringUtils.isEmpty(maCode)) { + throw new IllegalArgumentException("机具编号不能为空"); + } + wsMaInfo.setMaCode(maCode); + + // 本次检验时间 + String thisCheckTime = getCellValueAsString(row.getCell(4)); + if (!isValidDate(thisCheckTime)) { + throw new IllegalArgumentException("本次检验时间格式不正确"); + } + wsMaInfo.setThisCheckTime(thisCheckTime); + + // 下次检验时间 + String nextCheckTime = getCellValueAsString(row.getCell(5)); + if (!isValidDate(nextCheckTime)) { + throw new IllegalArgumentException("下次检验时间格式不正确"); + } + wsMaInfo.setNextCheckTime(nextCheckTime); + + // 检修员 + wsMaInfo.setRepairMan(getCellValueAsString(row.getCell(6))); + + // 检验员 + wsMaInfo.setCheckMan(getCellValueAsString(row.getCell(7))); + + // 联系方式 + wsMaInfo.setPhone(getCellValueAsString(row.getCell(8))); + + // 结果 + String result = getCellValueAsString(row.getCell(9)); + if (!"合格".equals(result) && !"不合格".equals(result)) { + throw new IllegalArgumentException("检验结果必须是'合格'或'不合格'"); + } + wsMaInfo.setResult(result); + + // 验证设备类型和规格型号的层级关系 + validateTypeHierarchy(wsMaInfo, maName, maModel); + + //判断该类型下编码是否已存在 + WsMaInfo info = mapper.getInfoByTypeAndModelAndCode(wsMaInfo); + if (info != null){ + throw new IllegalArgumentException("该类型下编码已存在"); + } + + return wsMaInfo; + } + + /** + * 验证设备类型和规格型号的层级关系 + */ + /** + * 通过关联查询验证层级关系（更高效） + */ + private void validateTypeHierarchy(WsMaInfo wsMaInfo, String typeName, String modelName) { + // 使用关联查询直接验证层级关系 + Type relation = mapper.selectTypeRelation("3", typeName, "4", modelName); + + if (relation == null) { + throw new IllegalArgumentException("规格型号 '" + modelName + "' 不属于设备类型 '" + typeName + "' 或不存在"); + } + + wsMaInfo.setModelId(String.valueOf(relation.getTypeId())); + } + + /** + * 更新已存在的记录 + */ + private void updateExistingRecord(WsMaInfo existing, WsMaInfo newData) { + existing.setThisCheckTime(newData.getThisCheckTime()); + existing.setNextCheckTime(newData.getNextCheckTime()); + existing.setRepairMan(newData.getRepairMan()); + existing.setCheckMan(newData.getCheckMan()); + existing.setPhone(newData.getPhone()); + existing.setResult(newData.getResult()); + existing.setOptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + existing.setOptUser(SecurityUtils.getUsername()); + } + + /** + * 获取单元格值的通用方法 + */ + private String getCellValueAsString(Cell cell) { + if (cell == null) { + return ""; + } + + switch (cell.getCellType()) { + case STRING: + return cell.getStringCellValue().trim(); + case NUMERIC: + if (DateUtil.isCellDateFormatted(cell)) { + return new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue()); + } else { + return String.valueOf((int) cell.getNumericCellValue()); + } + case BOOLEAN: + return String.valueOf(cell.getBooleanCellValue()); + case FORMULA: + return cell.getCellFormula(); + default: + return ""; + } + } + + /** + * 验证日期格式 + */ + private boolean isValidDate(String dateStr) { + if (StringUtils.isEmpty(dateStr)) { + return false; + } + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + sdf.setLenient(false); + sdf.parse(dateStr); + return true; + } catch (ParseException e) { + return false; + } + } + +// /** +// * 导入数据 +// * @param file +// * @return +// */ +// @Override +// public AjaxResult importTbData(MultipartFile file) { +// String fileName = file.getOriginalFilename(); +// if (fileName != null) { +// String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); +// if (!GlobalConstants.XLSX.equalsIgnoreCase(fileExtension) && !GlobalConstants.XLS.equalsIgnoreCase(fileExtension)) { +// // 文件后缀名不符合要求 +// return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx或xls结尾"); +// } +// } +// try { +// InputStream inputStream = file.getInputStream(); +// Workbook workbook = new XSSFWorkbook(inputStream); +// Sheet sheet = workbook.getSheetAt(0); +// // 得到Excel的行数 +// int totalRows = sheet.getPhysicalNumberOfRows(); +// // 检查是否有行数 +// if (totalRows <= 1) { +// throw new IllegalArgumentException("导入失败：Excel文件中没有数据，请检查后重新导入"); +// } +// // 读取第一行表头 +// Row headerRow = sheet.getRow(0); +// if (headerRow == null) { +// throw new IllegalArgumentException("导入失败：文件中没有表头"); +// } +// // 获取表头的列数 +// int totalCells = headerRow.getPhysicalNumberOfCells(); +// // 预期的表头列数为5列，可以根据实际需求修改这个条件 +// if (totalCells != 5) { +// throw new IllegalArgumentException("导入失败：表头列数与预期不符，请检查导入模板"); +// } +// // 读取表头内容并验证每一列 +// extracted(headerRow, totalCells); +// //读取Excel表格数据，做非空及格式判断 +// //extractedCell(sheet, totalRows, totalCells); +// ExcelUtil util = new ExcelUtil<>(WsMaInfo.class); +// List wsMaInfos = util.importExcel(file.getInputStream()); +// int result = 0; +// for (WsMaInfo wmInfo : wsMaInfos) { +// /*List wsMaInfoList = mapper.queryByName(wmInfo); +// if (CollectionUtils.isNotEmpty(wsMaInfoList)) { +// for (WsMaInfo wmInfo : wsMaInfoList) { +// if () { +// //进行更新操作 +// +// } else { +// //新增操作 +// +// } +// } +// }*/ +// } +// if (result > 0) { +// return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); +// } +// +// /** +// * 读取Excel表头模板方法抽取 +// * @param headerRow +// * @param totalCells +// */ +// private void extracted(Row headerRow, int totalCells) { +// for (int cellNum = 0; cellNum < totalCells; cellNum++) { +// Cell cell = headerRow.getCell(cellNum); +// // 获取单元格内容并去除首尾空格 +// String headerValue = cell.getStringCellValue().trim(); +// // 根据列索引进行验证 +// switch (cellNum) { +// case 0: +// if (!"姓名".equals(headerValue)) { +// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); +// } +// break; +// case 1: +// if (!"性别（0 女 1 男）".equals(headerValue)) { +// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); +// } +// break; +// case 2: +// if (!"岗位工种".equals(headerValue)) { +// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); +// } +// break; +// case 3: +// if (!"身份证号码".equals(headerValue)) { +// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); +// } +// break; +// case 4: +// if (!"电话".equals(headerValue)) { +// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); +// } +// break; +// default: +// break; +// } +// } +// } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml index a2867f62..327193c6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml @@ -122,7 +122,8 @@ + + INSERT INTO ws_ma_info (ma_name, ma_model, ma_code, supplier, this_check_time, next_check_time, From 831497d4a8af968e92f9dfc6c37738d50bc6f114 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 6 Sep 2025 17:57:14 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WsMaInfoServiceImpl.java | 108 ------------------ 1 file changed, 108 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index 34ae3627..2c63f067 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -579,112 +579,4 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { } } -// /** -// * 导入数据 -// * @param file -// * @return -// */ -// @Override -// public AjaxResult importTbData(MultipartFile file) { -// String fileName = file.getOriginalFilename(); -// if (fileName != null) { -// String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1); -// if (!GlobalConstants.XLSX.equalsIgnoreCase(fileExtension) && !GlobalConstants.XLS.equalsIgnoreCase(fileExtension)) { -// // 文件后缀名不符合要求 -// return AjaxResult.error("导入失败：文件后缀名不符合要求,必须为xlsx或xls结尾"); -// } -// } -// try { -// InputStream inputStream = file.getInputStream(); -// Workbook workbook = new XSSFWorkbook(inputStream); -// Sheet sheet = workbook.getSheetAt(0); -// // 得到Excel的行数 -// int totalRows = sheet.getPhysicalNumberOfRows(); -// // 检查是否有行数 -// if (totalRows <= 1) { -// throw new IllegalArgumentException("导入失败：Excel文件中没有数据，请检查后重新导入"); -// } -// // 读取第一行表头 -// Row headerRow = sheet.getRow(0); -// if (headerRow == null) { -// throw new IllegalArgumentException("导入失败：文件中没有表头"); -// } -// // 获取表头的列数 -// int totalCells = headerRow.getPhysicalNumberOfCells(); -// // 预期的表头列数为5列，可以根据实际需求修改这个条件 -// if (totalCells != 5) { -// throw new IllegalArgumentException("导入失败：表头列数与预期不符，请检查导入模板"); -// } -// // 读取表头内容并验证每一列 -// extracted(headerRow, totalCells); -// //读取Excel表格数据，做非空及格式判断 -// //extractedCell(sheet, totalRows, totalCells); -// ExcelUtil util = new ExcelUtil<>(WsMaInfo.class); -// List wsMaInfos = util.importExcel(file.getInputStream()); -// int result = 0; -// for (WsMaInfo wmInfo : wsMaInfos) { -// /*List wsMaInfoList = mapper.queryByName(wmInfo); -// if (CollectionUtils.isNotEmpty(wsMaInfoList)) { -// for (WsMaInfo wmInfo : wsMaInfoList) { -// if () { -// //进行更新操作 -// -// } else { -// //新增操作 -// -// } -// } -// }*/ -// } -// if (result > 0) { -// return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); -// } -// -// /** -// * 读取Excel表头模板方法抽取 -// * @param headerRow -// * @param totalCells -// */ -// private void extracted(Row headerRow, int totalCells) { -// for (int cellNum = 0; cellNum < totalCells; cellNum++) { -// Cell cell = headerRow.getCell(cellNum); -// // 获取单元格内容并去除首尾空格 -// String headerValue = cell.getStringCellValue().trim(); -// // 根据列索引进行验证 -// switch (cellNum) { -// case 0: -// if (!"姓名".equals(headerValue)) { -// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); -// } -// break; -// case 1: -// if (!"性别（0 女 1 男）".equals(headerValue)) { -// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); -// } -// break; -// case 2: -// if (!"岗位工种".equals(headerValue)) { -// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); -// } -// break; -// case 3: -// if (!"身份证号码".equals(headerValue)) { -// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); -// } -// break; -// case 4: -// if (!"电话".equals(headerValue)) { -// throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符，请检查导入模板"); -// } -// break; -// default: -// break; -// } -// } -// } }