chengben

assistMg/src/main/java/com/hotent/baseInfo/controller/FileUploadController.java

@@ -1,4 +1,5 @@
 package com.hotent.baseInfo.controller;
+import com.alibaba.fastjson.JSON;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.model.CommonResult;
@@ -9,6 +10,7 @@ import com.hotent.util.FileUploadUtil;
 import com.hotent.util.wordexcelutils.BracketContentExtractor;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,6 +19,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/file/v1")
 @ApiModel(value = "文件上传接口")
@@ -62,6 +65,7 @@ public class FileUploadController {
         }else{
             throw new IOException("不支持的文件格式");
         }
+        log.info(JSON.toJSONString(vo));
         FileUploadResult fileUploadResult = FileUploadUtil.uploadFile(file, EipConfig.getUploadPath());
         fileUploadResult.setFullPath(EipConfig.getImgUrl() +fileUploadResult.getSavePath());
         vo.setFileUploadResult(fileUploadResult);

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyFdTemplateVersionController.java

@@ -187,4 +187,50 @@ public class CostSurveyFdTemplateVersionController extends BaseController<CostSu
 		return CommonResult.<String>ok().message("版本切换成功");
 	}
 
+	/**
+	 * 批量删除历史版本和草稿版本
+	 * @param versionIds 版本ID列表
+	 * @return 删除结果
+	 */
+	@PostMapping(value="/batchDelete")
+	@ApiOperation(value = "批量删除历史版本和草稿版本", httpMethod = "POST", notes = "批量删除历史版本和草稿版本")
+	public CommonResult<String> batchDelete(
+			@ApiParam(name="versionIds",value="版本ID列表", required = true)
+			@RequestBody List<String> versionIds) throws Exception {
+
+		// 检查是否有版本ID传入
+		if (versionIds == null || versionIds.isEmpty()) {
+			return CommonResult.<String>error().message("请选择要删除的版本");
+		}
+
+		// 查询所有要删除的版本
+		List<CostSurveyFdTemplateVersion> versions = baseService.listByIds(versionIds);
+
+		// 过滤出可删除的版本（草稿状态-1 或 历史状态1）
+		List<String> deleteIds = versions.stream()
+				.filter(version -> "-1".equals(version.getStatus()) || "1".equals(version.getStatus()))
+				.map(CostSurveyFdTemplateVersion::getId)
+				.collect(java.util.stream.Collectors.toList());
+
+		// 检查是否有可删除的版本
+		if (deleteIds.isEmpty()) {
+			return CommonResult.<String>error().message("没有可删除的草稿或历史版本");
+		}
+
+		// 检查是否尝试删除现行版本
+		long currentVersionCount = versions.stream()
+				.filter(version -> "0".equals(version.getStatus()))
+				.count();
+
+		// 执行批量删除操作
+		baseService.removeByIds(deleteIds);
+
+		String message = "成功删除" + deleteIds.size() + "个版本";
+		if (currentVersionCount > 0) {
+			message += "（已过滤掉" + currentVersionCount + "个现行版本）";
+		}
+
+		return CommonResult.<String>ok().message(message);
+	}
+
 }

assistMg/src/main/java/com/hotent/util/FileUploadUtil.java

@@ -4,6 +4,7 @@ package com.hotent.util;
 import com.hotent.baseInfo.vo.FileUploadResult;
 import com.hotent.config.EipConfig;
 import com.hotent.constant.BaseConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
@@ -16,6 +17,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 
+@Slf4j
 public class FileUploadUtil {
 
 
@@ -70,6 +72,7 @@ public class FileUploadUtil {
 
                 // 创建目录
                 createDirectories(savePath);
+                log.info(savePath);
 
                 // 保存文件
                 File destFile = new File(savePath);

assistMg/src/main/java/com/hotent/util/wordexcelutils/BracketContentExtractor.java

@@ -7,7 +7,9 @@ import java.util.ArrayList;
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import com.alibaba.fastjson.JSON;
 import com.hotent.base.util.PinyinUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -21,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 /**
  * 文档大括号内容提取工具类
  */
+@Slf4j
 public class BracketContentExtractor {
 
     private static final Pattern BRACKET_PATTERN = Pattern.compile("\\{([^}]+)\\}");
@@ -56,7 +59,6 @@ public class BracketContentExtractor {
                 }
             }
         }
-
         return result;
     }
 
@@ -91,8 +93,10 @@ public class BracketContentExtractor {
                 }
             }
 
+        }catch (Exception e) {
+            log.info("日志:{}",e.getMessage(),e);
         }
-
+        log.info(JSON.toJSONString(result));
         return result;
     }
 
@@ -195,4 +199,8 @@ public class BracketContentExtractor {
             return "原文: " + originalText + ", 拼音: " + pinyin;
         }
     }
+
+    public static void main(String[] args) throws IOException {
+        extractFromWord("C:\\Users\\123\\Desktop\\送  达  回  证.docx");
+    }
 }