gat问题优化

 package com.ash.controller;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.exception.ExcelDataConvertException;
 import com.ash.base.AshErrorCode;
 import com.ash.base.BaseController;
 import com.ash.base.JsonResult;
@@ -23,7 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -218,6 +216,7 @@ public class CaseController extends BaseController {
                         ed.setTrackingNumber(analysis.getTrackingNumber());
                         ed.setExpressCompany(analysis.getExpressCompany());
                         ed.setDeliverWealth(analysis.getDeliverWealth());
+                        ed.setIdCard(analysis.getIdCard());
                     }
 
                     return ed;
@@ -236,25 +235,29 @@ public class CaseController extends BaseController {
 
     @GetMapping(value = "/reAnalysis")
     public JsonResult reAnalysis(@RequestParam(value = "id", required = false) String id) throws IOException {
+        List<Case> reAnaLysisList = new ArrayList<>();
+        if (StringUtils.isNotBlank(id)) {
+            Case data = caseService.load(id);
+            data.setAnalysisStatus(AnalysisStatusEnum.analysis);
+            caseService.update(data);
+            reAnaLysisList.add(data);
+        } else {
+            List<Case> dataList = caseService.listUnAnalysis();
+            if (CollectionUtils.isNotEmpty(dataList)) {
+                dataList.forEach(e -> {
+                    e.setAnalysisStatus(AnalysisStatusEnum.analysis);
+                    caseService.update(e);
+                });
+                reAnaLysisList.addAll(dataList);
+            }
+
+        }
+        if (CollectionUtils.isEmpty(reAnaLysisList)) {
+            return JsonResult.ok("没有需要重新解析的数据！");
+        }
         executorService.execute(() -> {
             try {
-                if (StringUtils.isNotBlank(id)) {
-                    Case data = caseService.load(id);
-                    data.setAnalysisStatus(AnalysisStatusEnum.analysis);
-                    caseService.update(data);
-                    caseService.analysis(Collections.singletonList(data));
-                } else {
-                    List<Case> dataList = caseService.listUnAnalysis();
-                    if (CollectionUtils.isNotEmpty(dataList)) {
-                        dataList.forEach(e -> {
-                            e.setAnalysisStatus(AnalysisStatusEnum.analysis);
-                            caseService.update(e);
-                        });
-                        caseService.analysis(dataList);
-                    }
-
-                }
-
+                caseService.analysis(reAnaLysisList);
             } catch (Exception ex) {
                 log.error(ex.getMessage());
             }

@@ -497,7 +497,7 @@ public class StatisticsController extends BaseController {
         String fileName = UUIDGenerator.uuid() + ".docx";
         String filePath = JFChartUtils.OUTPUT_DIR + fileName;
 
-        String dataRange = "【" + (startTime.equals(endTime) ? startTime : startTime + "~" + endTime) + "】";
+        String dataRange = (startTime.equals(endTime) ? startTime : startTime + "~" + endTime);
         List<String> tempFilePath = new ArrayList<>();
         buildWord(dataMap, dataRange, filePath, tempFilePath);
         try {

@@ -238,28 +238,31 @@ public class WarningInstanceController extends BaseController {
 
     @GetMapping(value = "/reAnalysis")
     public JsonResult reAnalysis(@RequestParam(value = "id", required = false) String id) throws IOException {
+        List<WarningInstance> reAnaLysisList=new ArrayList<>();
+        if (StringUtils.isNotBlank(id)) {
+            WarningInstance data = warningInstanceService.load(id);
+            if (data != null) {
+                data.setAnalysisStatus(AnalysisStatusEnum.analysis);
+                warningInstanceService.update(data);
+                reAnaLysisList.add(data);
+            }
+
+        } else {
+            List<WarningInstance> dataList = warningInstanceService.listUnAnalysis();
+            if (CollectionUtils.isNotEmpty(dataList)) {
+                dataList.forEach(e -> {
+                    e.setAnalysisStatus(AnalysisStatusEnum.analysis);
+                    warningInstanceService.update(e);
+                });
+                reAnaLysisList.addAll(dataList);
+            }
+        }
+        if(CollectionUtils.isEmpty(reAnaLysisList)){
+            return JsonResult.ok("没有需要重新解析的数据！");
+        }
         executorService.execute(() -> {
             try {
-                if (StringUtils.isNotBlank(id)) {
-                    WarningInstance data = warningInstanceService.load(id);
-                    if (data != null) {
-                        data.setAnalysisStatus(AnalysisStatusEnum.analysis);
-                        warningInstanceService.update(data);
-                        warningInstanceService.analysis(Collections.singletonList(data));
-                    }
-
-                } else {
-                    List<WarningInstance> dataList = warningInstanceService.listUnAnalysis();
-                    if (CollectionUtils.isNotEmpty(dataList)) {
-                        dataList.forEach(e -> {
-                            e.setAnalysisStatus(AnalysisStatusEnum.analysis);
-                            warningInstanceService.update(e);
-                        });
-                        warningInstanceService.analysis(dataList);
-                    }
-
-                }
-
+                warningInstanceService.analysis(reAnaLysisList);
             } catch (Exception ex) {
                 log.error(ex.getMessage());
 

@@ -97,44 +97,52 @@ public class CaseExportExcelData implements Serializable {
     @ColumnWidth(25)
     private String career;
 
+
+    @ExcelCheck(canEmpty = false)
+    @ExcelProperty(value = "身份证号码", index = 12)
+    @ContentStyle(dataFormat = 49)
+    @ColumnWidth(25)
+    private String idCard;
+
+
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "诈骗类型", index = 12)
+    @ExcelProperty(value = "诈骗类型", index = 13)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String fraudType;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "引流方式", index = 13)
+    @ExcelProperty(value = "引流方式", index = 14)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String rainageMethod;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "支付方式", index = 14)
+    @ExcelProperty(value = "支付方式", index = 15)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String payMethod;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "引流电话", index = 15)
+    @ExcelProperty(value = "引流电话", index = 16)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String rainagePhone;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "快递单号", index = 16)
+    @ExcelProperty(value = "快递单号", index = 17)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String trackingNumber;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "快递公司", index = 17)
+    @ExcelProperty(value = "快递公司", index = 18)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String expressCompany;
 
     @ExcelCheck(canEmpty = false)
-    @ExcelProperty(value = "受害人是否寄递黄金、现金", index = 18)
+    @ExcelProperty(value = "受害人是否寄递黄金、现金", index = 19)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private String deliverWealth;

@@ -127,6 +127,7 @@ public class CaseAnalysisService {
         update(data);
         Case caseInfo = caseService.load(data.getCaseId());
         caseInfo.setReviewStatus(ReviewStatusEnum.AUDITED);
+        caseInfo.setTotalAmount(data.getTotalAmount());
         caseService.update(caseInfo);
         return result;
     }