分析结果操作

@@ -23,9 +23,6 @@ public abstract class BaseController {
     @Value("${ash.errorFilePath}")
     public String errorFilePath;
 
-    @Value("${ash.fileDomain}")
-    public String fileDomain;
-
     /**
      * 生成错误信息excel
      *

@@ -7,11 +7,13 @@ import com.ash.base.JsonResult;
 import com.ash.base.OptionStatus;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.Case;
+import com.ash.entity.CaseAnalysis;
 import com.ash.entity.FileData;
 import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.FileDataTypeEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.CaseExcelData;
+import com.ash.service.CaseAnalysisService;
 import com.ash.service.CaseService;
 import com.ash.service.FileDataService;
 import com.ash.util.UUIDGenerator;
@@ -30,6 +32,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -44,6 +47,10 @@ public class CaseController extends BaseController {
     @Resource
     private FileDataService fileDataService;
 
+    @Resource
+    private CaseAnalysisService caseAnalysisService;
+
+
     @PostMapping("/save")
     public JsonResult save(@RequestBody Case data) {
         try {
@@ -129,6 +136,12 @@ public class CaseController extends BaseController {
         page.setCurrent(pageNo);
         page.setSize(pageSize);
         Page<Case> dataPage = caseService.pageByCondition(params, page);
+        if (CollectionUtils.isNotEmpty(dataPage.getRecords())) {
+            List<String> caseIds = dataPage.getRecords()
+                    .stream().map(Case::getId).collect(Collectors.toList());
+            Map<String, CaseAnalysis> caseAnalysisMap = caseAnalysisService.listByCaseId(caseIds);
+            dataPage.getRecords().forEach(e -> e.setAnalysis(caseAnalysisMap.get(e.getId())));
+        }
 
         return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataPage);
 
@@ -174,4 +187,40 @@ public class CaseController extends BaseController {
     public JsonResult reAnalysis() throws IOException {
         return JsonResult.ok();
     }
+
+    @PostMapping("/saveAnalysis")
+    public JsonResult save(@RequestBody CaseAnalysis analysis) {
+        try {
+            Boolean success = caseAnalysisService.save(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/conformAnalysis")
+    public JsonResult conformAnalysis(@RequestBody CaseAnalysis analysis) {
+        try {
+            Boolean success = caseAnalysisService.conform(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/cancelConform")
+    public JsonResult cancelConform(@RequestBody CaseAnalysis analysis) {
+        try {
+            Boolean success = caseAnalysisService.cancelConform(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
 }

@@ -8,11 +8,13 @@ import com.ash.base.OptionStatus;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.FileData;
 import com.ash.entity.WarningInstance;
+import com.ash.entity.WarningInstanceAnalysis;
 import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.FileDataTypeEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.service.FileDataService;
+import com.ash.service.WarningInstanceAnalysisService;
 import com.ash.service.WarningInstanceService;
 import com.ash.util.UUIDGenerator;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +32,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -39,6 +42,10 @@ import java.util.stream.Collectors;
 public class WarningInstanceController extends BaseController {
     @Resource
     private WarningInstanceService warningInstanceService;
+
+    @Resource
+    private WarningInstanceAnalysisService warningInstanceAnalysisService;
+
     @Resource
     private FileDataService fileDataService;
 
@@ -139,6 +146,12 @@ public class WarningInstanceController extends BaseController {
         page.setCurrent(pageNo);
         page.setSize(pageSize);
         Page<WarningInstance> dataPage = warningInstanceService.pageByCondition(params, page);
+        if (CollectionUtils.isNotEmpty(dataPage.getRecords())) {
+            List<String> wiIds = dataPage.getRecords()
+                    .stream().map(WarningInstance::getId).collect(Collectors.toList());
+            Map<String, WarningInstanceAnalysis> analysisMap = warningInstanceAnalysisService.listByWiId(wiIds);
+            dataPage.getRecords().forEach(e -> e.setAnalysis(analysisMap.get(e.getId())));
+        }
 
         return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataPage);
 
@@ -186,4 +199,41 @@ public class WarningInstanceController extends BaseController {
         return JsonResult.ok();
     }
 
+    @PostMapping("/saveAnalysis")
+    public JsonResult save(@RequestBody WarningInstanceAnalysis analysis) {
+        try {
+            Boolean success = warningInstanceAnalysisService.save(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/conformAnalysis")
+    public JsonResult conformAnalysis(@RequestBody WarningInstanceAnalysis analysis) {
+        try {
+            Boolean success = warningInstanceAnalysisService.conform(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    @PostMapping("/cancelConform")
+    public JsonResult cancelConform(@RequestBody WarningInstanceAnalysis analysis) {
+        try {
+            Boolean success = warningInstanceAnalysisService.cancelConform(analysis);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+
 }

@@ -77,85 +77,12 @@ public class Case extends BaseModel {
     private ReviewStatusEnum reviewStatus;
 
 
-
-//    分析数据
-    /**
-     * 地区
-     */
-    @TableField(value = "area")
-    private String area;
-
-    /**
-     * 县区
-     */
-    @TableField(value = "county")
-    private String county;
-
-
-    /**
-     * 涉案总金额
-     */
-    @TableField(value = "total_amount")
-    private Double totalAmount;
-
-    /**
-     * 案损金额
-     */
-    @TableField(value = "amount")
-    private Double amount;
-
-    /**
-     * 受害人性别
-     */
-    @TableField(value = "sex")
-    private String sex;
-
-    /**
-     * 受害人年龄
-     */
-    @TableField(value = "age")
-    private Integer age;
-
-    /**
-     * 受害人职业
-     */
-    @TableField(value = "career")
-    private String career;
-
-    /**
-     * 身份证号码
-     */
-    @TableField(value = "id_card")
-    private String idCard;
-
-    /**
-     * 诈骗类型
-     */
-    @TableField(value = "fraud_type")
-    private String fraudType;
-
-    /**
-     * 引流方式
-     */
-    @TableField(value = "rainage_method")
-    private String rainageMethod;
-
-    /**
-     * 引流方式详情
-     */
-    @TableField(value = "rainage_detail")
-    private String rainageDetail;
-
-    /**
-     * 支付方式
-     */
-    @TableField(value = "pay_method")
-    private String payMethod;
-
-
     @Transient
     private transient String startTime;
 
     @Transient
     private transient String endTime;
+
+    @Transient
+    private transient CaseAnalysis analysis;
 }

+package com.ash.entity;
+
+import com.ash.base.BaseModel;
+import com.ash.enums.ConformStatusEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+@Data
+@TableName(value = "t_ash_case_analysis")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CaseAnalysis extends BaseModel {
+
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 案件id
+     */
+    @TableField(value = "case_id")
+    private String caseId;
+
+    /**
+     * 地区
+     */
+    @TableField(value = "area")
+    private String area;
+
+    /**
+     * 县区
+     */
+    @TableField(value = "county")
+    private String county;
+
+
+    /**
+     * 涉案总金额
+     */
+    @TableField(value = "total_amount")
+    private Double totalAmount;
+
+    /**
+     * 案损金额
+     */
+    @TableField(value = "amount")
+    private Double amount;
+
+    /**
+     * 受害人性别
+     */
+    @TableField(value = "sex")
+    private String sex;
+
+    /**
+     * 受害人年龄
+     */
+    @TableField(value = "age")
+    private Integer age;
+
+    /**
+     * 受害人职业
+     */
+    @TableField(value = "career")
+    private String career;
+
+    /**
+     * 身份证号码
+     */
+    @TableField(value = "id_card")
+    private String idCard;
+
+    /**
+     * 诈骗类型
+     */
+    @TableField(value = "fraud_type")
+    private String fraudType;
+
+    /**
+     * 引流方式
+     */
+    @TableField(value = "rainage_method")
+    private String rainageMethod;
+
+    /**
+     * 引流方式详情
+     */
+    @TableField(value = "rainage_detail")
+    private String rainageDetail;
+
+    /**
+     * 支付方式
+     */
+    @TableField(value = "pay_method")
+    private String payMethod;
+
+    /**
+     * 确认状态
+     */
+    @TableField(value = "conform_status")
+    private ConformStatusEnum conformStatus;
+}

@@ -152,4 +152,7 @@ public class WarningInstance extends BaseModel {
 
     @Transient
     private transient String endTime;
+
+    @Transient
+    private transient WarningInstanceAnalysis analysis;
 }

 package com.ash.entity;
 
 import com.ash.base.BaseModel;
+import com.ash.enums.ConformStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.yulichang.common.support.func.S;
 import lombok.Data;
 
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @TableName(value = "t_ash_warning_instance_analysis")
 public class WarningInstanceAnalysis extends BaseModel {
     @TableId(value = "id")
     private String id;
 
+
+    /**
+     * 警情id
+     */
+    @TableField(value = "wi_id")
+    private String wiId;
+
     /**
      * 地区
      */
@@ -48,4 +59,10 @@ public class WarningInstanceAnalysis extends BaseModel {
     @TableField(value = "pay_method")
     private String payMethod;
 
+    /**
+     * 确认状态
+     */
+    @TableField(value = "conform_status")
+    private ConformStatusEnum conformStatus;
+
 }

+package com.ash.entity.dao;
+
+import com.ash.entity.CaseAnalysis;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CaseAnalysisMapper extends CommonBaseMapper<CaseAnalysis>, MPJBaseMapper<CaseAnalysis> {
+}

+package com.ash.enums;
+
+public enum ConformStatusEnum {
+    CONFIRMED("已确认"),
+    UNCONFIRMED("未确认"),
+    ;
+
+
+    private final String text;
+
+    private ConformStatusEnum(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

+package com.ash.service;
+
+import com.ash.base.AshErrorCode;
+import com.ash.base.AshException;
+import com.ash.entity.Case;
+import com.ash.entity.CaseAnalysis;
+import com.ash.entity.dao.CaseAnalysisMapper;
+import com.ash.enums.ConformStatusEnum;
+import com.ash.enums.ReviewStatusEnum;
+import com.ash.util.UUIDGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class CaseAnalysisService {
+
+    @Resource
+    private CaseAnalysisMapper caseAnalysisMapper;
+
+    @Resource
+    private CaseService caseService;
+
+    public static Map<String, String> codeAreaMap = new HashMap<>();
+
+    static {
+        codeAreaMap.put("A3401", "合肥");
+        codeAreaMap.put("A3402", "芜湖");
+        codeAreaMap.put("A3403", "蚌埠");
+        codeAreaMap.put("A3404", "淮南");
+        codeAreaMap.put("A3405", "马鞍山");
+        codeAreaMap.put("A3406", "淮北");
+        codeAreaMap.put("A3407", "铜陵");
+        codeAreaMap.put("A3408", "安庆");
+        codeAreaMap.put("A3410", "黄山");
+        codeAreaMap.put("A3411", "滁州");
+        codeAreaMap.put("A3412", "阜阳");
+        codeAreaMap.put("A3413", "宿州");
+        codeAreaMap.put("A3415", "六安");
+        codeAreaMap.put("A3416", "亳州");
+        codeAreaMap.put("A3417", "池州");
+        codeAreaMap.put("A3418", "宣城");
+    }
+
+    public Boolean save(CaseAnalysis data) {
+        String uuid = UUIDGenerator.uuid();
+        data.setId(uuid);
+        if (data.getConformStatus() == null) {
+            data.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+        }
+
+        if (StringUtils.isBlank(data.getCaseId())) {
+            throw new AshException(AshErrorCode.ILLEGAL_PARAM, "caseId is empty!");
+        }
+
+        Case caseInfo = caseService.load(data.getCaseId());
+        setArea(caseInfo.getCode(), data);
+
+        int insert = caseAnalysisMapper.insert(data);
+        return insert > 0;
+    }
+
+    public CaseAnalysis load(String id) {
+        return caseAnalysisMapper.selectById(id);
+    }
+
+    public void update(CaseAnalysis data) {
+        String id = data.getId();
+        if (StringUtils.isBlank(id)) {
+            throw new AshException(AshErrorCode.ILLEGAL_PARAM, "id is empty!");
+        }
+        CaseAnalysis oldData = caseAnalysisMapper.selectById(id);
+        if (oldData == null) {
+            throw new AshException(AshErrorCode.DATA_NOT_EXIST);
+        }
+
+        Case caseInfo = caseService.load(data.getCaseId());
+        setArea(caseInfo.getCode(), data);
+
+        caseAnalysisMapper.updateById(data);
+    }
+
+    private void setArea(String caseCode, CaseAnalysis data) {
+        if (data != null && StringUtils.isNotBlank(caseCode) && caseCode.length() >= 4) {
+            String area = codeAreaMap.get(caseCode.substring(0, 5));
+            if (StringUtils.isNotBlank(area)) {
+                data.setArea(area);
+            } else {
+                data.setArea("未知");
+            }
+        }
+    }
+
+    public Map<String, CaseAnalysis> listByCaseId(List<String> caseIds) {
+        QueryWrapper<CaseAnalysis> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CaseAnalysis> lambda = queryWrapper.lambda();
+        lambda.in(CaseAnalysis::getCaseId, caseIds);
+        List<CaseAnalysis> warningInstanceAnalyses = caseAnalysisMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(warningInstanceAnalyses)) {
+            return warningInstanceAnalyses.stream()
+                    .collect(Collectors.toMap(CaseAnalysis::getCaseId, Function.identity()));
+        }
+        return new HashMap<>();
+    }
+
+    @Transactional
+    public Boolean conform(CaseAnalysis data) {
+        Boolean result = true;
+        data.setConformStatus(ConformStatusEnum.CONFIRMED);
+        update(data);
+        Case caseInfo = caseService.load(data.getCaseId());
+        caseInfo.setReviewStatus(ReviewStatusEnum.AUDITED);
+        caseService.update(caseInfo);
+        return result;
+    }
+
+
+    @Transactional
+    public Boolean cancelConform(CaseAnalysis data) {
+        Boolean result = true;
+        CaseAnalysis wa = load(data.getId());
+        wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+        update(wa);
+        Case caseInfo = caseService.load(wa.getCaseId());
+        caseInfo.setReviewStatus(ReviewStatusEnum.UNAUDITED);
+        caseService.update(caseInfo);
+        return result;
+    }
+}

@@ -8,6 +8,7 @@ import com.ash.base.AshException;
 import com.ash.base.BaseModel;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.Case;
+import com.ash.entity.CaseAnalysis;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.excelData.CaseExcelData;
 import com.ash.listener.CaseExcelListener;
@@ -37,46 +38,19 @@ public class CaseService {
     @Resource
     private CaseMapper caseMapper;
 
-    public static Map<String, String> codeAreaMap = new HashMap<>();
-
-    static {
-        codeAreaMap.put("A3401", "合肥");
-        codeAreaMap.put("A3402", "芜湖");
-        codeAreaMap.put("A3403", "蚌埠");
-        codeAreaMap.put("A3404", "淮南");
-        codeAreaMap.put("A3405", "马鞍山");
-        codeAreaMap.put("A3406", "淮北");
-        codeAreaMap.put("A3407", "铜陵");
-        codeAreaMap.put("A3408", "安庆");
-        codeAreaMap.put("A3410", "黄山");
-        codeAreaMap.put("A3411", "滁州");
-        codeAreaMap.put("A3412", "阜阳");
-        codeAreaMap.put("A3413", "宿州");
-        codeAreaMap.put("A3415", "六安");
-        codeAreaMap.put("A3416", "亳州");
-        codeAreaMap.put("A3417", "池州");
-        codeAreaMap.put("A3418", "宣城");
-    }
-
     public Boolean save(Case data) {
         String uuid = UUIDGenerator.uuid();
         data.setId(uuid);
-        setArea(data);
         int insert = caseMapper.insert(data);
         return insert > 0;
     }
 
-    private void setArea(Case data) {
-        if (data != null && StringUtils.isNotBlank(data.getCode()) && data.getCode().length() >= 4) {
-            String area = codeAreaMap.get(data.getCode().substring(0, 5));
-            if (StringUtils.isNotBlank(area)) {
-                data.setArea(area);
-            } else {
-                data.setArea("未知");
-            }
-        }
+    public Case load(String id) {
+        return caseMapper.selectById(id);
     }
 
+
+
     public Boolean saveAll(List<Case> dataList) {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new AshException(AshErrorCode.ILLEGAL_PARAM, "dataList is empty!");
@@ -97,7 +71,6 @@ public class CaseService {
             sub.forEach(t -> {
                 String uuid = UUIDGenerator.uuid();
                 t.setId(uuid);
-                setArea(t);
             });
             try {
                 Integer result = caseMapper.insertBatchSomeColumn(sub);
@@ -122,7 +95,6 @@ public class CaseService {
             throw new AshException(AshErrorCode.DATA_NOT_EXIST);
         }
 
-        setArea(data);
         int result = caseMapper.updateById(data);
         return result > 0;
     }

@@ -15,11 +15,10 @@ public class FileDataService {
     @Resource
     private FileDataMapper fileDataMapper;
 
-    public Boolean save(FileData data) {
+    public void save(FileData data) {
         String uuid = UUIDGenerator.uuid();
         data.setId(uuid);
         int insert = fileDataMapper.insert(data);
-        return insert > 0;
     }
 
     public FileData load(String id) {

+package com.ash.service;
+
+import com.ash.base.AshErrorCode;
+import com.ash.base.AshException;
+import com.ash.entity.WarningInstance;
+import com.ash.entity.WarningInstanceAnalysis;
+import com.ash.entity.dao.WarningInstanceAnalysisMapper;
+import com.ash.enums.ConformStatusEnum;
+import com.ash.enums.ReviewStatusEnum;
+import com.ash.util.UUIDGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class WarningInstanceAnalysisService {
+
+    @Resource
+    private WarningInstanceAnalysisMapper warningInstanceAnalysisMapper;
+
+    @Resource
+    private WarningInstanceService warningInstanceService;
+
+    public Boolean save(WarningInstanceAnalysis data) {
+        String uuid = UUIDGenerator.uuid();
+        data.setId(uuid);
+        if (data.getConformStatus() == null) {
+            data.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+        }
+        int insert = warningInstanceAnalysisMapper.insert(data);
+        return insert > 0;
+    }
+
+    public WarningInstanceAnalysis load(String id) {
+        return warningInstanceAnalysisMapper.selectById(id);
+    }
+
+    public void update(WarningInstanceAnalysis data) {
+        String id = data.getId();
+        if (StringUtils.isBlank(id)) {
+            throw new AshException(AshErrorCode.ILLEGAL_PARAM, "id is empty!");
+        }
+        WarningInstanceAnalysis oldData = warningInstanceAnalysisMapper.selectById(id);
+        if (oldData == null) {
+            throw new AshException(AshErrorCode.DATA_NOT_EXIST);
+        }
+
+        int result = warningInstanceAnalysisMapper.updateById(data);
+    }
+
+    public Map<String, WarningInstanceAnalysis> listByWiId(List<String> wiIds) {
+        QueryWrapper<WarningInstanceAnalysis> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<WarningInstanceAnalysis> lambda = queryWrapper.lambda();
+        lambda.in(WarningInstanceAnalysis::getWiId, wiIds);
+        List<WarningInstanceAnalysis> warningInstanceAnalyses = warningInstanceAnalysisMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(warningInstanceAnalyses)) {
+            return warningInstanceAnalyses.stream()
+                    .collect(Collectors.toMap(WarningInstanceAnalysis::getWiId, Function.identity()));
+        }
+        return new HashMap<>();
+    }
+
+    @Transactional
+    public Boolean conform(WarningInstanceAnalysis data) {
+        Boolean result = true;
+        data.setConformStatus(ConformStatusEnum.CONFIRMED);
+        update(data);
+        WarningInstance wi = warningInstanceService.load(data.getWiId());
+        wi.setReviewStatus(ReviewStatusEnum.AUDITED);
+        warningInstanceService.update(wi);
+        return result;
+    }
+
+
+    @Transactional
+    public Boolean cancelConform(WarningInstanceAnalysis data) {
+        Boolean result = true;
+        WarningInstanceAnalysis wa = load(data.getId());
+        wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+        update(wa);
+        WarningInstance wi = warningInstanceService.load(wa.getWiId());
+        wi.setReviewStatus(ReviewStatusEnum.UNAUDITED);
+        warningInstanceService.update(wi);
+        return result;
+    }
+
+}

@@ -41,6 +41,10 @@ public class WarningInstanceService {
         return insert > 0;
     }
 
+    public WarningInstance load(String id) {
+        return warningInstanceMapper.selectById(id);
+    }
+
     public Boolean saveAll(List<WarningInstance> dataList) {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new AshException(AshErrorCode.ILLEGAL_PARAM, "dataList is empty!");

@@ -36,4 +36,3 @@ logging:
 ash:
  # errorFilePath: D:/data/errorData
   errorFilePath: /web/errorData
-  fileDomain: http://localhost/file

@@ -29,6 +29,26 @@ create table `t_ash_warning_instance`
     primary key (id)
 ) comment = '警情列表' ENGINE = InnoDB;
 
+create table `t_ash_warning_instance_analysis`
+(
+    id                  varchar(32) not null,
+    wi_id               varchar(32),
+    area                varchar(50),
+    amount              double,
+    sex                 varchar(50),
+    career              varchar(50),
+    rainage_method      varchar(50),
+    pay_method          varchar(50),
+    conform_status      varchar(50) DEFAULT 'UNCONFIRMED',
+    create_time         timestamp null,
+    create_by           varchar(32),
+    last_modify_time    timestamp null,
+    last_modify_by      varchar(32),
+    primary key (id)
+) comment = '警情分析结果' ENGINE = InnoDB;
+
+create index i_wia_wi on t_ash_warning_instance_analysis(wi_id);
+
 create table `t_ash_case`
 (
     id               varchar(32) not null,
@@ -60,6 +80,31 @@ create table `t_ash_case`
     primary key (id)
 ) comment = '案件列表' ENGINE = InnoDB;
 
+create table `t_ash_case_analysis`
+(
+    id               varchar(32) not null,
+    case_id          varchar(50),
+    area             varchar(50),
+    county           varchar(50),
+    total_amount     double,
+    amount           double,
+    sex              varchar(50),
+    age              int,
+    career           varchar(50),
+    id_card          varchar(50),
+    fraud_type       varchar(50),
+    rainage_method   varchar(50),
+    rainage_detail   varchar(500),
+    pay_method       varchar(50),
+    conform_status      varchar(50) DEFAULT 'UNCONFIRMED',
+    create_time      timestamp null,
+    create_by        varchar(32),
+    last_modify_time timestamp null,
+    last_modify_by   varchar(32),
+    primary key (id)
+) comment = '案件分析结果' ENGINE = InnoDB;
+
+create index i_case_ci on t_ash_case_analysis(case_id);
 
 create table `t_ash_file_data`
 (