From ac3ed8b281ea11c484d572b7781976c20cdb9a5a Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 17 Mar 2023 00:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E5=9D=97=E7=9A=84bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/util/excelGroupValidation/ExcelUtil.java | 12 ++++++++++++ .../util/excel/ExcelSelectorDataWriteHandler.java | 3 +++ .../entity/vo/ResourcesCourseInfoAuthDetailsVO.java | 6 +++--- .../ibeetl/jlw/web/ResourcesQuestionController.java | 2 ++ .../java/com/ibeetl/jlw/web/StudentController.java | 2 ++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java index f1062e6e..8a49b9fa 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/excelGroupValidation/ExcelUtil.java @@ -1,5 +1,6 @@ package com.ibeetl.admin.core.util.excelGroupValidation; +import cn.hutool.core.util.ReUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; @@ -159,6 +160,7 @@ public class ExcelUtil { String format = "%s!$%s$%s:$%s$%s"; // 创建名称管理器 Name name = workbook.createName(); + nameString = replaceNameName(nameString); name.setNameName(nameString); String cellColumnFlag = getCellColumnFlag(columnIndex + 2); int nameManageRegan = CollectionUtils.isEmpty(data) ? 1 : data.size() + 1; @@ -172,6 +174,16 @@ public class ExcelUtil { } } + /** + * 对poi的name字段，进行小加工 + * @param nameName + * @return + */ + public static String replaceNameName(String nameName) { + // 首字母必须是中文，支持有限的符号 + return ReUtil.get("[\\u4e00-\\u9fa5]+[_0-9]*", nameName, 0); + } + private static String getCellColumnFlag(int num) { String colFiled = ""; int chuNum = 0; diff --git a/web/src/main/java/cn/jlw/util/excel/ExcelSelectorDataWriteHandler.java b/web/src/main/java/cn/jlw/util/excel/ExcelSelectorDataWriteHandler.java index 4d40aefc..6cdef534 100644 --- a/web/src/main/java/cn/jlw/util/excel/ExcelSelectorDataWriteHandler.java +++ b/web/src/main/java/cn/jlw/util/excel/ExcelSelectorDataWriteHandler.java @@ -11,6 +11,8 @@ import org.apache.poi.xssf.usermodel.XSSFDataValidation; import java.util.Map; +import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName; + /** * 实现easyExcel的接口, 下拉框注解处理程序 * @@ -56,6 +58,7 @@ public class ExcelSelectorDataWriteHandler implements SheetWriteHandler { hidden.createRow(endRow + i).createCell(k).setCellValue(deptList[i]); } Name category1Name = workbook.createName(); + hiddenName = replaceNameName(hiddenName); category1Name.setNameName(hiddenName); //3 A1:A代表隐藏域创建第N列createCell(N)时。以A1列开始A行数据获取下拉数组 category1Name.setRefersToFormula(hiddenName + "!A2:A" + (deptList.length + endRow)); diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java index a14ead87..dea42e5e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesCourseInfoAuthDetailsVO.java @@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity.vo; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.jlw.entity.CourseInfo; import lombok.Data; -import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.Auto; import org.beetl.sql.annotation.entity.Table; import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.FetchSql; @@ -28,13 +28,13 @@ import static com.ibeetl.admin.core.util.StreamUtils.listJoin; */ @Data @Fetch -@Table(name = "course_info", assignID = true) +@Table(name = "course_info") public class ResourcesCourseInfoAuthDetailsVO extends BaseEntity { /** * 留空不传值 */ - @AssignID + @Auto private Long courseInfoId; /** diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index 23998ea4..6c3260ac 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -56,6 +56,7 @@ import java.util.*; import static cn.hutool.core.util.ArrayUtil.join; import static cn.hutool.core.util.ObjectUtil.defaultIfNull; import static cn.jlw.util.excel.ExcelUtil.standardName; +import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName; /** * ResourcesQuestion 接口 @@ -458,6 +459,7 @@ public class ResourcesQuestionController{ String range = getRange(1, rowId, son.size()); Name name = workbook.createName(); // key不可重复 + key = replaceNameName(key); name.setNameName(key); String formula = "课程章节信息!" + range; name.setRefersToFormula(formula); diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index 1d849935..6c6efa41 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -70,6 +70,7 @@ import static com.ibeetl.admin.console.service.OrgConsoleService.setObjectOrgId; import static com.ibeetl.admin.core.util.ExcelUtil.convertData; import static com.ibeetl.admin.core.util.ExcelUtil.write; import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel; +import static com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.replaceNameName; import static com.ibeetl.admin.core.web.JsonReturnCode.DIY_ERROR; import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap; import static java.util.function.UnaryOperator.identity; @@ -2501,6 +2502,7 @@ public class StudentController extends BaseController{ String range = getRange(1, rowId, son.size()); Name name = workbook.createName(); // key不可重复 + key = replaceNameName(key); name.setNameName(key); String formula = "院校及班级信息!" + range; name.setRefersToFormula(formula);