Merge branch 'feature' into 'dev'

2023/10/20 词云调整

See merge request !405

src/main/java/com/zhiwei/brandkbs2/controller/app/AppToolsetController.java

@@ -69,6 +69,6 @@ public class AppToolsetController {
     @LogRecord(description = "工具库-词云提取")
     public ResponseResult getHighWord(@RequestParam MultipartFile file,
                                       @ApiParam(name = "type", value = "关键词|文章") @RequestParam String type){
-        return ResponseResult.success(toolsetService.getHighWord(file, type));
+        return toolsetService.getHighWord(file, type);
     }
 }

src/main/java/com/zhiwei/brandkbs2/easyexcel/EasyExcelUtil.java

@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.URLEncoder;
@@ -66,6 +67,10 @@ public class EasyExcelUtil {
         }
     }
 
+    public static void readWithoutTryCatch(MultipartFile file, ReadExcelDTO readExcelDTO) throws IOException {
+        EasyExcel.read(file.getInputStream(), readExcelDTO.getClazz(), readExcelDTO.getAnalysisEventListener()).sheet().doRead();
+    }
+
     /**
      * 读取多个sheet
      *

src/main/java/com/zhiwei/brandkbs2/easyexcel/listener/HighWordArticleListener.java

@@ -6,6 +6,7 @@ import com.zhiwei.brandkbs2.easyexcel.dto.UploadHighWordArticleDTO;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author cjz
@@ -22,6 +23,13 @@ public class HighWordArticleListener extends AnalysisEventListener<UploadHighWor
     }
 
     @Override
+    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context){
+        if (!"序号".equals(headMap.get(0)) || !"标题".equals(headMap.get(1)) || !"文本".equals(headMap.get(2)) || !"链接".equals(headMap.get(3))) {
+            throw new  IllegalArgumentException("表格格式有误");
+        }
+    }
+
+    @Override
     public void invoke(UploadHighWordArticleDTO data, AnalysisContext context) {
         if (StringUtils.isNotBlank(data.getContent())) {
             contents.add(data.getContent());

src/main/java/com/zhiwei/brandkbs2/easyexcel/listener/HighWordKeywordListener.java

@@ -22,6 +22,13 @@ public class HighWordKeywordListener extends AnalysisEventListener<UploadHighWor
     }
 
     @Override
+    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context){
+        if (!"序号".equals(headMap.get(0)) || !"关键词".equals(headMap.get(1)) || !"词频".equals(headMap.get(2))) {
+            throw new IllegalArgumentException("表格格式有误");
+        }
+    }
+
+    @Override
     public void invoke(UploadHighWordKeywordDTO data, AnalysisContext context) {
         map.compute(data.getKeyword(), (k, v) ->{
             if (Objects.isNull(v)){

src/main/java/com/zhiwei/brandkbs2/service/ToolsetService.java

@@ -68,5 +68,5 @@ public interface ToolsetService {
      * @param type  类型 关键词|文章
      * @return
      */
-    List<JSONObject> getHighWord(MultipartFile file, String type);
+    ResponseResult getHighWord(MultipartFile file, String type);
 }

src/main/java/com/zhiwei/brandkbs2/service/impl/ToolsetServiceImpl.java

@@ -291,7 +291,7 @@ public class ToolsetServiceImpl implements ToolsetService {
     }
 
     @Override
-    public List<JSONObject> getHighWord(MultipartFile file, String type) {
+    public ResponseResult getHighWord(MultipartFile file, String type) {
         if (Objects.equals("关键词", type)){
             return getKeywordHighWord(file);
         }
@@ -303,14 +303,21 @@ public class ToolsetServiceImpl implements ToolsetService {
      * @param file  excel文件
      * @return
      */
-    private List<JSONObject> getKeywordHighWord(MultipartFile file){
+    private ResponseResult getKeywordHighWord(MultipartFile file){
         Map<String, Integer> map = new HashMap<>();
         // excel信息提取
+        try {
             ReadExcelDTO<UploadHighWordKeywordDTO> readExcel = new ReadExcelDTO<>();
             readExcel.setClazz(UploadHighWordKeywordDTO.class);
             readExcel.setAnalysisEventListener(new HighWordKeywordListener(map));
-        EasyExcelUtil.read(file, readExcel);
-        Map<String, Integer> sortMap = Tools.sortMap(map, 200);
+            EasyExcelUtil.readWithoutTryCatch(file, readExcel);
+        }catch (Exception e){
+            return ResponseResult.failure("表格格式有误");
+        }
+        if (map.size() > 500){
+            return ResponseResult.failure("表格关键词数量超过上限500");
+        }
+        Map<String, Integer> sortMap = Tools.sortMap(map, 500);
         List<JSONObject> res = new ArrayList<>();
         for (Map.Entry<String, Integer> entry : sortMap.entrySet()) {
             JSONObject jsonObject = new JSONObject();
@@ -318,7 +325,7 @@ public class ToolsetServiceImpl implements ToolsetService {
             jsonObject.put("value", entry.getValue());
             res.add(jsonObject);
         }
-        return res;
+        return ResponseResult.success(res);
     }
 
     /**
@@ -326,14 +333,21 @@ public class ToolsetServiceImpl implements ToolsetService {
      * @param file excel文件
      * @return
      */
-    private List<JSONObject> getArticleHighWord(MultipartFile file){
+    private ResponseResult getArticleHighWord(MultipartFile file){
         List<String> contents = new ArrayList<>();
         // excel信息提取
+        try {
             ReadExcelDTO<UploadHighWordArticleDTO> readExcel = new ReadExcelDTO<>();
             readExcel.setClazz(UploadHighWordArticleDTO.class);
             readExcel.setAnalysisEventListener(new HighWordArticleListener(contents));
-        EasyExcelUtil.read(file, readExcel);
-        return textUtil.getHighWordsJsonDifferentFieldName(contents, 200);
+            EasyExcelUtil.readWithoutTryCatch(file, readExcel);
+        }catch (Exception e){
+            return ResponseResult.failure("表格格式有误");
+        }
+        if (contents.size() > 500){
+            return ResponseResult.failure("表格文章数量超过上限500");
+        }
+        return ResponseResult.success(textUtil.getHighWordsJsonDifferentFieldName(contents, 500));
     }
 
     /**