Prechádzať zdrojové kódy

导出优化,重新唤醒去掉

xw 4 dní pred
rodič
commit
ac0eb960c8

+ 31 - 3
fs-common/src/main/java/com/fs/common/utils/poi/ExcelUtil.java

@@ -1121,6 +1121,26 @@ public class ExcelUtil<T>
         }
     }
 
+    /**
+     * 清洗并裁剪 Excel 工作表名称,去掉非法字符并限制长度(31)
+     */
+    private String safeSheetName(String name) {
+        if (name == null) {
+            return "Sheet";
+        }
+
+        String cleaned = name.replaceAll("[\\\\/?*\\[\\]:]", "-");
+        cleaned = cleaned.trim();
+        if (cleaned.isEmpty()) {
+            cleaned = "Sheet";
+        }
+
+        if (cleaned.length() > 31) {
+            cleaned = cleaned.substring(0, 31);
+        }
+        return cleaned;
+    }
+
     /**
      * 创建一个工作簿
      */
@@ -1139,15 +1159,23 @@ public class ExcelUtil<T>
     {
         this.sheet = wb.createSheet();
         this.styles = createStyles(wb);
-        // 设置工作表的名称.
+
+        // 使用清洗后的 sheet 名称
+        String baseName = safeSheetName(this.sheetName);
+        String finalName;
         if (sheetNo == 0)
         {
-            wb.setSheetName(index, sheetName);
+            finalName = baseName;
         }
         else
         {
-            wb.setSheetName(index, sheetName + index);
+            String withIndex = baseName + index;
+            if (withIndex.length() > 31) {
+                withIndex = withIndex.substring(0, 31);
+            }
+            finalName = withIndex;
         }
+        wb.setSheetName(index, finalName);
     }
 
     /**

+ 18 - 18
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -765,17 +765,17 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         logger.info("【判断添加客服】:{}", param);
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserByUserId(param.getUserId());
-        String dateString = "2026-02-11 22:00:00";
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date targetDate = null;
-        try {
-            targetDate = sdf.parse(dateString);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
+//        String dateString = "2026-02-11 22:00:00";
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Date targetDate = null;
+//        try {
+//            targetDate = sdf.parse(dateString);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
 
         //用户不存在唤起重新授权
-        if (fsUser == null  || fsUser.getCreateTime().before(targetDate)) {
+        if (fsUser == null ) {
             return R.error(ExceptionCodeEnum.USER_NOT_FOUND.getCode(), ExceptionCodeEnum.USER_NOT_FOUND.getDescription());
         }
 
@@ -2692,15 +2692,15 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         boolean oneCompanyCourse = config.isOneCompanyCourse();
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
-        String dateString = "2026-02-11 22:40:00";
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date targetDate = null;
-        try {
-            targetDate = sdf.parse(dateString);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        if (fsUser == null || fsUser.getCreateTime().before(targetDate)) {
+//        String dateString = "2026-02-10 23:59:59";
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        Date targetDate = null;
+//        try {
+//            targetDate = sdf.parse(dateString);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+        if (fsUser == null ) {
             return ResponseResult.fail(ExceptionCodeEnum.USER_NOT_FOUND.getCode(), ExceptionCodeEnum.USER_NOT_FOUND.getDescription());
         }
         if (fsUser.getStatus() == 0) {