Merge branch '0730_word'

@@ -20,6 +20,8 @@ import com.ash.util.UUIDGenerator;
 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;
@@ -30,10 +32,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 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.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @RestController
@@ -50,6 +51,8 @@ public class CaseController extends BaseController {
     @Resource
     private CaseAnalysisService caseAnalysisService;
 
+    private final ExecutorService executorService = Executors.newFixedThreadPool(10);
+
 
     @PostMapping("/save")
     public JsonResult save(@RequestBody Case data) {
@@ -184,8 +187,32 @@ public class CaseController extends BaseController {
     }
 
     @GetMapping(value = "/reAnalysis")
-    public JsonResult reAnalysis() throws IOException {
-        return JsonResult.ok();
+    public JsonResult reAnalysis(@RequestParam(value = "id", required = false) String id) throws IOException {
+        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);
+                    }
+
+                }
+
+            } catch (Exception ex) {
+                log.error(ex.getMessage());
+            }
+        });
+        return JsonResult.ok("重新解析开始");
+
     }
 
     @PostMapping("/saveAnalysis")

@@ -6,6 +6,7 @@ import com.ash.base.BaseController;
 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.FileData;
 import com.ash.entity.WarningInstance;
 import com.ash.entity.WarningInstanceAnalysis;
@@ -20,6 +21,7 @@ import com.ash.util.UUIDGenerator;
 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.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,10 +32,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 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.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @RestController
@@ -49,6 +50,8 @@ public class WarningInstanceController extends BaseController {
     @Resource
     private FileDataService fileDataService;
 
+    private ExecutorService executorService = Executors.newFixedThreadPool(10);
+
     @PostMapping(value = "/list")
     public JsonResult list(@RequestBody WarningInstance warningInstance) {
         try {
@@ -195,8 +198,36 @@ public class WarningInstanceController extends BaseController {
 
 
     @GetMapping(value = "/reAnalysis")
-    public JsonResult reAnalysis() throws IOException {
-        return JsonResult.ok();
+    public JsonResult reAnalysis(@RequestParam(value = "id", required = false) String id) throws IOException {
+        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);
+                    }
+
+                }
+
+            } catch (Exception ex) {
+                log.error(ex.getMessage());
+
+            }
+        });
+        return JsonResult.ok("重新解析开始");
+
     }
 
     @PostMapping("/saveAnalysis")

@@ -84,7 +84,7 @@ public class CaseAnalysis extends BaseModel {
     private String rainageMethod;
 
     /**
-     * 引流方式
+     * 引流方式详情
      */
     @TableField(value = "rainage_method_detail")
     private String rainageMethodDetail;

@@ -35,7 +35,7 @@ public class WarningInstanceExcelData implements Serializable {
     @ColumnWidth(25)
     private Date alarmDate;
 
-    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
+    @ExcelCheck(canEmpty = false)
     @ExcelProperty(value = "报警电话", index = 2)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)

@@ -16,11 +16,13 @@ import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.base.excelOpt.ValidateAnnotation;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.excelData.CaseExcelData;
+import com.ash.service.CaseService;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -147,7 +149,8 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
                 endPosition = (i + 1) * singleThreadDealcount;
             }
             CaseMapper caseMapper = SpringJobBeanFactory.getBean(CaseMapper.class);
-            CaseThread thread = new CaseThread(count, caseMapper, list, startPosition, endPosition);
+            CaseService caseService= SpringJobBeanFactory.getBean(CaseService.class);
+            CaseThread thread = new CaseThread(count, caseMapper, caseService, list, startPosition, endPosition);
             executor.execute(thread);
         }
 
@@ -203,7 +206,7 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
                     try {
                         SimpleDateFormat format = new SimpleDateFormat(excelCheck.dateFormatValid());
                         format.setLenient(false);
-                        format.parse(format.format(value.toString()));
+                        format.parse(format.format(value));
 
                     } catch (Exception e) {
                         addError(rowIndex + 1, annotation.getHeadName() + "时间格式错误!");

 package com.ash.listener;
 
 import com.ash.entity.Case;
+import com.ash.entity.WarningInstance;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.CaseExcelData;
+import com.ash.service.CaseService;
+import com.ash.util.UUIDGenerator;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
 
 @Component
 public class CaseThread implements Runnable {
@@ -23,17 +28,19 @@ public class CaseThread implements Runnable {
     private List<CaseExcelData> list = Collections.synchronizedList(new ArrayList<>());
     private CountDownLatch count;
     private CaseMapper caseMapper;
+    private CaseService caseService;
 
     public CaseThread() {
     }
 
-    public CaseThread(CountDownLatch count, CaseMapper mapper,
-                                 List<CaseExcelData> list, int startPosition, int endPosition) {
+    public CaseThread(CountDownLatch count, CaseMapper mapper, CaseService caseService,
+                      List<CaseExcelData> list, int startPosition, int endPosition) {
         this.count = count;
         this.list = list;
         this.startPosition = startPosition;
         this.endPosition = endPosition;
         this.caseMapper = mapper;
+        this.caseService = caseService;
     }
 
     @Override
@@ -44,11 +51,15 @@ public class CaseThread implements Runnable {
             for (CaseExcelData data : subList) {
                 Case dbData = new Case();
                 BeanUtils.copyProperties(data, dbData);
-                dbData.setAnalysisStatus(AnalysisStatusEnum.unanalysis);
+                dbData.setAnalysisStatus(AnalysisStatusEnum.analysis);
                 dbData.setReviewStatus(ReviewStatusEnum.UNAUDITED);
+                String uuid = UUIDGenerator.uuid();
+                dbData.setId(uuid);
                 dataList.add(dbData);
             }
+            List<String> ids = dataList.stream().map(Case::getId).collect(Collectors.toList());
             caseMapper.insertBatchSomeColumn(dataList);
+            caseService.analysisByIds(ids);
         } catch (Exception ex) {
             ex.printStackTrace();
         } finally {

@@ -16,6 +16,7 @@ import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.base.excelOpt.ValidateAnnotation;
 import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.excelData.WarningInstanceExcelData;
+import com.ash.service.WarningInstanceService;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -150,7 +151,8 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
                 endPosition = (i + 1) * singleThreadDealcount;
             }
             WarningInstanceMapper deadManMapper = SpringJobBeanFactory.getBean(WarningInstanceMapper.class);
-            WarningInstanceThread thread = new WarningInstanceThread(count, deadManMapper, list, startPosition, endPosition);
+            WarningInstanceService warningInstanceService = SpringJobBeanFactory.getBean(WarningInstanceService.class);
+            WarningInstanceThread thread = new WarningInstanceThread(count, deadManMapper, warningInstanceService, list, startPosition, endPosition);
             executor.execute(thread);
         }
 
@@ -207,7 +209,7 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
                     try {
                         SimpleDateFormat format = new SimpleDateFormat(excelCheck.dateFormatValid());
                         format.setLenient(false);
-                        format.parse(format.format(value.toString()));
+                        format.parse(format.format(value));
 
                     } catch (Exception e) {
                         addError(rowIndex + 1, annotation.getHeadName() + "时间格式错误!");

@@ -5,13 +5,17 @@ import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.enums.AnalysisStatusEnum;
 import com.ash.enums.ReviewStatusEnum;
 import com.ash.excelData.WarningInstanceExcelData;
+import com.ash.service.WarningInstanceService;
+import com.ash.util.UUIDGenerator;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
 
 @Component
 public class WarningInstanceThread implements Runnable {
@@ -23,17 +27,19 @@ public class WarningInstanceThread implements Runnable {
     private List<WarningInstanceExcelData> list = Collections.synchronizedList(new ArrayList<>());
     private CountDownLatch count;
     private WarningInstanceMapper warningInstanceMapper;
+    private WarningInstanceService warningInstanceService;
 
     public WarningInstanceThread() {
     }
 
-    public WarningInstanceThread(CountDownLatch count, WarningInstanceMapper mapper,
+    public WarningInstanceThread(CountDownLatch count, WarningInstanceMapper mapper, WarningInstanceService warningInstanceService,
                                  List<WarningInstanceExcelData> list, int startPosition, int endPosition) {
         this.count = count;
         this.list = list;
         this.startPosition = startPosition;
         this.endPosition = endPosition;
         this.warningInstanceMapper = mapper;
+        this.warningInstanceService = warningInstanceService;
     }
 
 
@@ -45,11 +51,15 @@ public class WarningInstanceThread implements Runnable {
             for (WarningInstanceExcelData data : subList) {
                 WarningInstance dbData = new WarningInstance();
                 BeanUtils.copyProperties(data, dbData);
-                dbData.setAnalysisStatus(AnalysisStatusEnum.unanalysis);
+                dbData.setAnalysisStatus(AnalysisStatusEnum.analysis);
                 dbData.setReviewStatus(ReviewStatusEnum.UNAUDITED);
+                String uuid = UUIDGenerator.uuid();
+                dbData.setId(uuid);
                 dataList.add(dbData);
             }
+            List<String> ids = dataList.stream().map(WarningInstance::getId).collect(Collectors.toList());
             warningInstanceMapper.insertBatchSomeColumn(dataList);
+            warningInstanceService.analysisByIds(ids);
         } catch (Exception ex) {
             ex.printStackTrace();
         } finally {

@@ -3,22 +3,26 @@ package com.ash.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.alibaba.fastjson.JSONObject;
 import com.ash.base.*;
 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.enums.AnalysisStatusEnum;
+import com.ash.enums.ConformStatusEnum;
 import com.ash.excelData.CaseExcelData;
 import com.ash.listener.CaseExcelListener;
-import com.ash.util.DateUtils;
-import com.ash.util.MultipartFileToFileUtils;
-import com.ash.util.ObjectValueOption;
-import com.ash.util.UUIDGenerator;
+import com.ash.util.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,20 +30,25 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Service
 public class CaseService {
 
+    @Value("${ash.caseAnalysisUrl}")
+    public String caseAnalysisUrl;
+
+
     @Resource
     private CaseMapper caseMapper;
 
+    @Resource
+    private CaseAnalysisService caseAnalysisService;
+
     public Boolean save(Case data) {
         String uuid = UUIDGenerator.uuid();
         data.setId(uuid);
@@ -105,6 +114,13 @@ public class CaseService {
         return caseMapper.selectList(queryWrapper);
     }
 
+    public List<Case> listUnAnalysis() {
+        QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();
+        lambda.ne(Case::getAnalysisStatus, AnalysisStatusEnum.success);
+        return caseMapper.selectList(queryWrapper);
+    }
+
     public Page<Case> pageByCondition(Case params, Page<Case> page) {
         QueryWrapper<Case> queryWrapper = getCondition(params);
         return caseMapper.selectPage(page, queryWrapper);
@@ -389,4 +405,60 @@ public class CaseService {
         return null;
     }
 
+    public void analysisByIds(List<String> ids) {
+        List<Case> dataList = caseMapper.selectBatchIds(ids);
+        analysis(dataList);
+
+    }
+
+    public void analysis(List<Case> dataList) {
+        if (CollectionUtils.isEmpty(dataList)) {
+            return;
+        }
+        Map<String, Case> dataMap = dataList.stream().collect(Collectors.toMap(Case::getId, Function.identity()));
+        for (String id : dataMap.keySet()) {
+            Case cd = dataMap.get(id);
+            JSONObject analysisResult = invokeAnalysis(cd);
+            if (analysisResult == null) {
+                cd.setAnalysisStatus(AnalysisStatusEnum.fail);
+                update(cd);
+            } else {
+                CaseAnalysis wa = new CaseAnalysis();
+                wa.setCaseId(cd.getId());
+                wa.setCounty(analysisResult.getString("area"));
+                wa.setAmount(analysisResult.getDouble("value"));
+                wa.setTotalAmount(analysisResult.getDouble("value"));
+                wa.setSex(analysisResult.getString("gender"));
+                wa.setAge(analysisResult.getInteger("age"));
+                wa.setCareer(analysisResult.getString("occupation"));
+                wa.setIdCard(analysisResult.getString("idCard"));
+                wa.setFraudType(analysisResult.getString("fraudType"));
+                wa.setRainageMethod(analysisResult.getString("diversionMethod"));
+                wa.setPayMethod(analysisResult.getString("paymentMethod"));
+                wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+                caseAnalysisService.save(wa);
+                cd.setAnalysisStatus(AnalysisStatusEnum.success);
+                update(cd);
+            }
+        }
+    }
+
+    private JSONObject invokeAnalysis(Case cd) {
+        try {
+            Map<String, String> header = new HashMap<>();
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("summary", cd.getCaseDetail());
+            paramsMap.put("unit", cd.getFilingUnit());
+            String toJson = JSONObject.toJSONString(paramsMap);
+            StringEntity myEntity = new StringEntity(toJson, ContentType.APPLICATION_JSON);
+            String sResult = HttpClientUtils.doPostRequest(caseAnalysisUrl, header, null, myEntity);
+            return JSONObject.parseObject(sResult);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+        return null;
+
+    }
+
 }

@@ -3,22 +3,26 @@ package com.ash.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.alibaba.fastjson.JSONObject;
 import com.ash.base.*;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.WarningInstance;
+import com.ash.entity.WarningInstanceAnalysis;
 import com.ash.entity.dao.WarningInstanceMapper;
+import com.ash.enums.AnalysisStatusEnum;
+import com.ash.enums.ConformStatusEnum;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.listener.WarningInstanceExcelListener;
-import com.ash.util.DateUtils;
-import com.ash.util.MultipartFileToFileUtils;
-import com.ash.util.ObjectValueOption;
-import com.ash.util.UUIDGenerator;
+import com.ash.util.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,19 +30,25 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Service
 public class WarningInstanceService {
+
+
+    @Value("${ash.wiAnalysisUrl}")
+    public String wiAnalysisUrl;
+
     @Resource
     private WarningInstanceMapper warningInstanceMapper;
 
+    @Resource
+    private WarningInstanceAnalysisService warningInstanceAnalysisService;
+
     public Boolean save(WarningInstance data) {
         String uuid = UUIDGenerator.uuid();
         data.setId(uuid);
@@ -103,6 +113,15 @@ public class WarningInstanceService {
         return warningInstanceMapper.selectList(queryWrapper);
     }
 
+    public List<WarningInstance> listUnAnalysis() {
+        QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
+        lambda.ne(WarningInstance::getAnalysisStatus,AnalysisStatusEnum.success);
+        return warningInstanceMapper.selectList(queryWrapper);
+    }
+
+
+
     public Page<WarningInstance> pageByCondition(WarningInstance params, Page<WarningInstance> page) {
         QueryWrapper<WarningInstance> queryWrapper = getCondition(params);
         return warningInstanceMapper.selectPage(page, queryWrapper);
@@ -281,4 +300,56 @@ public class WarningInstanceService {
 
         return null;
     }
+
+    public void analysisByIds(List<String> ids) {
+        List<WarningInstance> dataList = warningInstanceMapper.selectBatchIds(ids);
+        analysis(dataList);
+
+    }
+
+    public void analysis(List<WarningInstance> dataList) {
+        if (CollectionUtils.isEmpty(dataList)) {
+            return;
+        }
+        Map<String, WarningInstance> dataMap = dataList.stream().collect(Collectors.toMap(WarningInstance::getId, Function.identity()));
+        for (String id : dataMap.keySet()) {
+            WarningInstance cd = dataMap.get(id);
+            JSONObject analysisResult = invokeAnalysis(cd);
+            if (analysisResult == null) {
+                cd.setAnalysisStatus(AnalysisStatusEnum.fail);
+                update(cd);
+            } else {
+                WarningInstanceAnalysis wa = new WarningInstanceAnalysis();
+                wa.setWiId(cd.getId());
+                wa.setArea(cd.getMunicipalPolice().replaceAll("公安局", ""));
+                wa.setAmount(analysisResult.getDouble("value"));
+                wa.setSex(analysisResult.getString("gender"));
+                wa.setCareer(analysisResult.getString("occupation"));
+                wa.setRainageMethod(analysisResult.getString("diversionMethod"));
+                wa.setPayMethod(analysisResult.getString("paymentMethod"));
+                wa.setConformStatus(ConformStatusEnum.UNCONFIRMED);
+                warningInstanceAnalysisService.save(wa);
+                cd.setAnalysisStatus(AnalysisStatusEnum.success);
+                update(cd);
+            }
+        }
+    }
+
+    private JSONObject invokeAnalysis(WarningInstance cd) {
+        try {
+            Map<String, String> header = new HashMap<>();
+            Map<String, Object> paramsMap = new HashMap<>();
+            paramsMap.put("content", cd.getContent());
+            paramsMap.put("feedback", cd.getFeedbackContent());
+            String toJson = JSONObject.toJSONString(paramsMap);
+            StringEntity myEntity = new StringEntity(toJson, ContentType.APPLICATION_JSON);
+            String sResult = HttpClientUtils.doPostRequest(wiAnalysisUrl, header, null, myEntity);
+            return JSONObject.parseObject(sResult);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+        return null;
+
+    }
 }

+package com.ash.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.*;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+public class HttpClientUtils {
+
+
+	/**
+	 * 发送post请求
+	 *
+	 * @param url:请求地址
+	 * @param header:请求头参数
+	 * @param params:表单参数  form提交
+	 * @param httpEntity   json/xml参数
+	 * @return
+	 */
+	public static String doPostRequest(String url, Map<String, String> header, Map<String, String> params, HttpEntity httpEntity) {
+		String resultStr = "";
+		if (StringUtils.isEmpty(url)) {
+			return resultStr;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse httpResponse = null;
+		try {
+			httpClient = SSLClientCustom.getHttpClinet();
+			HttpPost httpPost = new HttpPost(url);
+			//请求头header信息
+			if (MapUtils.isNotEmpty(header)) {
+				for (Map.Entry<String, String> stringStringEntry : header.entrySet()) {
+					httpPost.setHeader(stringStringEntry.getKey(), stringStringEntry.getValue());
+					log.info("请求header信息,key:{},value:{}", stringStringEntry.getKey(), stringStringEntry.getValue());
+				}
+			}
+			//请求参数信息
+			if (MapUtils.isNotEmpty(params)) {
+				List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+				for (Map.Entry<String, String> stringStringEntry : params.entrySet()) {
+					paramList.add(new BasicNameValuePair(stringStringEntry.getKey(), stringStringEntry.getValue()));
+					log.info("请求参数信息,key:{},value:{}", stringStringEntry.getKey(), stringStringEntry.getValue());
+				}
+				UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(paramList, Consts.UTF_8);
+				httpPost.setEntity(urlEncodedFormEntity);
+			}
+			//实体设置
+			if (httpEntity != null) {
+				String json = EntityUtils.toString(httpEntity);
+				log.info("请求参数信息{}", json);
+				httpPost.setEntity(httpEntity);
+			}
+            //httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
+			//发起请求
+			httpResponse = httpClient.execute(httpPost);
+			int statusCode = httpResponse.getStatusLine().getStatusCode();
+			if (statusCode == HttpStatus.SC_OK||statusCode == HttpStatus.SC_UNAUTHORIZED) {
+				HttpEntity httpResponseEntity = httpResponse.getEntity();
+				resultStr = EntityUtils.toString(httpResponseEntity);
+				//log.info("请求正常,请求地址:{},响应结果:{}", url, statusCode+";"+resultStr);
+			} else {
+				StringBuffer stringBuffer = new StringBuffer();
+				HeaderIterator headerIterator = httpResponse.headerIterator();
+				while (headerIterator.hasNext()) {
+					stringBuffer.append("\t" + headerIterator.next());
+				}
+				log.info("异常信息:请求地址:{},响应状态和结果:{}",url,statusCode+";"+stringBuffer);
+			}
+
+		} catch (Exception e) {
+			log.info("请求地址:{}", url);
+			e.printStackTrace();
+		} finally {
+			HttpClientUtils.closeConnection(httpClient, httpResponse);
+		}
+		return resultStr;
+	}
+
+	public static String doGetRequest(String url, Map<String, String> header, Map<String, Object> params) {
+		String resultStr = "";
+		if (StringUtils.isEmpty(url)) {
+			return resultStr;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse httpResponse = null;
+		try {
+			httpClient = SSLClientCustom.getHttpClinet();
+			//请求参数信息
+			if (MapUtils.isNotEmpty(params)) {
+				url = url + buildUrl(params);
+			}
+			HttpGet httpGet = new HttpGet(url);
+			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000)//连接超时
+					.setConnectionRequestTimeout(25000)//请求超时
+					.setSocketTimeout(25000)//套接字连接超时
+					.setRedirectsEnabled(true).build();//允许重定向
+			httpGet.setConfig(requestConfig);
+			if (MapUtils.isNotEmpty(header)) {
+				for (Map.Entry<String, String> stringStringEntry : header.entrySet()) {
+					httpGet.setHeader(stringStringEntry.getKey(), stringStringEntry.getValue());
+				}
+			}
+			//发起请求
+			httpResponse = httpClient.execute(httpGet);
+			int statusCode = httpResponse.getStatusLine().getStatusCode();
+			if (statusCode == HttpStatus.SC_OK) {
+				resultStr = EntityUtils.toString(httpResponse.getEntity(), Consts.UTF_8);
+				log.info("请求地址:{},响应结果:{}", url, resultStr);
+			} else {
+				StringBuffer stringBuffer = new StringBuffer();
+				HeaderIterator headerIterator = httpResponse.headerIterator();
+				while (headerIterator.hasNext()) {
+					stringBuffer.append("\t" + headerIterator.next());
+				}
+				resultStr = EntityUtils.toString(httpResponse.getEntity(), Consts.UTF_8);
+				log.info("异常信息请求地址:{}", url, resultStr);
+				log.info("异常信息:请求响应状态:{},请求返回结果:{}", httpResponse.getStatusLine().getStatusCode(),StringUtils.isBlank(resultStr)?stringBuffer:resultStr);
+			}
+
+		} catch (Exception e) {
+			log.info("请求地址:{}", url);
+			e.printStackTrace();
+
+		} finally {
+			HttpClientUtils.closeConnection(httpClient, httpResponse);
+		}
+		return resultStr;
+	}
+
+	public static String doGetRequest(String url, Map<String, String> header, Map<String, Object> params,StringBuffer tracecode) {
+		String resultStr = "";
+		if (StringUtils.isEmpty(url)) {
+			return resultStr;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse httpResponse = null;
+		try {
+			httpClient = SSLClientCustom.getHttpClinet();
+			//请求参数信息
+			if (MapUtils.isNotEmpty(params)) {
+				url = url + buildUrl(params);
+			}
+			HttpGet httpGet = new HttpGet(url);
+			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(30000)//连接超时
+					.setConnectionRequestTimeout(30000)//请求超时
+					.setSocketTimeout(30000)//套接字连接超时
+					.setRedirectsEnabled(true).build();//允许重定向
+			httpGet.setConfig(requestConfig);
+			if (MapUtils.isNotEmpty(header)) {
+				for (Map.Entry<String, String> stringStringEntry : header.entrySet()) {
+					httpGet.setHeader(stringStringEntry.getKey(), stringStringEntry.getValue());
+				}
+			}
+			//发起请求
+			httpResponse = httpClient.execute(httpGet);
+			int statusCode = httpResponse.getStatusLine().getStatusCode();
+			if (statusCode == HttpStatus.SC_OK) {
+				Header[] tracecodes = httpResponse.getHeaders("Tracecode");
+				tracecode.append(tracecodes[0].getValue());
+				resultStr = EntityUtils.toString(httpResponse.getEntity(), Consts.UTF_8);
+				log.info("请求地址:{},响应结果:{}", url, resultStr);
+			} else {
+				StringBuffer stringBuffer = new StringBuffer();
+				HeaderIterator headerIterator = httpResponse.headerIterator();
+				while (headerIterator.hasNext()) {
+					stringBuffer.append("\t" + headerIterator.next());
+				}
+				log.info("异常信息:请求地址:{},请求响应状态:{},请求返回结果:{}",url,httpResponse.getStatusLine().getStatusCode(), stringBuffer);
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			HttpClientUtils.closeConnection(httpClient, httpResponse);
+		}
+		return resultStr;
+	}
+
+
+	public static String doPutRequest(String url, Map<String, String> header,StringEntity entity) {
+
+		CloseableHttpClient closeableHttpClient = null;
+		CloseableHttpResponse closeableHttpResponse=null;
+		try {
+			closeableHttpClient = SSLClientCustom.getHttpClinet();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+
+		RequestConfig requestConfig = RequestConfig.custom()
+				.setConnectTimeout(5000)
+				.setConnectionRequestTimeout(5000)
+				.setRedirectsEnabled(true)
+				.build();
+
+		HttpPut httpPost = new HttpPut(url);
+
+		httpPost.setConfig(requestConfig);
+		httpPost.setHeader("Content-Type", "application/json");
+
+		if (MapUtils.isNotEmpty(header)) {
+			for (Map.Entry<String, String> stringStringEntry : header.entrySet()) {
+				httpPost.setHeader(stringStringEntry.getKey(), stringStringEntry.getValue());
+				log.info("请求header信息,key:{},value:{}", stringStringEntry.getKey(), stringStringEntry.getValue());
+			}
+		}
+
+		String strRequest = "";
+		try {
+//			StringEntity entity = new StringEntity(jsonObject.toString(), "utf-8");
+			entity.setContentEncoding("utf-8");
+			entity.setContentType("application/json");
+			httpPost.setEntity(entity);
+
+
+			closeableHttpResponse = closeableHttpClient.execute(httpPost);
+
+			if (null != closeableHttpResponse && !"".equals(closeableHttpResponse)) {
+				int statusCode = closeableHttpResponse.getStatusLine().getStatusCode();
+				if (closeableHttpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+					HttpEntity httpEntity = closeableHttpResponse.getEntity();
+					strRequest = EntityUtils.toString(httpEntity);
+					log.info("请求正常,请求地址:{},响应结果:{}", url, statusCode+";"+strRequest);
+				} else {
+					StringBuffer stringBuffer = new StringBuffer();
+					HeaderIterator headerIterator = closeableHttpResponse.headerIterator();
+					while (headerIterator.hasNext()) {
+						stringBuffer.append("\t" + headerIterator.next());
+					}
+					strRequest = "Error Response" + statusCode;
+					log.info("异常信息:请求地址:{},响应状态和结果:{}",url,strRequest+";"+stringBuffer);
+				}
+			}
+
+		} catch (ClientProtocolException e) {
+			e.printStackTrace();
+		} catch (ParseException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (closeableHttpClient != null) {
+					closeableHttpClient.close();
+				}
+
+				if(closeableHttpResponse!=null){
+					closeableHttpResponse.close();
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return strRequest;
+	}
+
+
+
+	/**
+	 * 关掉连接释放资源
+	 */
+	private static void closeConnection(CloseableHttpClient httpClient, CloseableHttpResponse httpResponse) {
+		if (httpClient != null) {
+			try {
+				httpClient.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		if (httpResponse != null) {
+			try {
+				httpResponse.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+	}
+
+	/**
+	 * 构造get请求的参数
+	 *
+	 * @return
+	 */
+	private static String buildUrl(Map<String, Object> map) {
+		if (MapUtils.isEmpty(map)) {
+			return "";
+		}
+		StringBuffer stringBuffer = new StringBuffer("?");
+		for (Map.Entry<String, Object> stringStringEntry : map.entrySet()) {
+			stringBuffer.append(stringStringEntry.getKey()).append("=").append(stringStringEntry.getValue()).append("&");
+		}
+		String result = stringBuffer.toString();
+		if (StringUtils.isNotEmpty(result)) {
+			result = result.substring(0, result.length() - 1);//去掉结尾的&连接符
+		}
+		return result;
+	}
+
+}

+package com.ash.util;
+
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContextBuilder;
+
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class SSLClientCustom {
+	private static final String HTTP = "http";
+	private static final String HTTPS = "https";
+	private static SSLConnectionSocketFactory sslConnectionSocketFactory = null;
+	private static PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = null;//连接池管理类
+	private static SSLContextBuilder sslContextBuilder = null;//管理Https连接的上下文类
+
+	static {
+		try {
+			sslContextBuilder = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+				@Override
+				public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+//                    信任所有站点 直接返回true
+					return true;
+				}
+			});
+			sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslContextBuilder.build(), new String[]{"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.2"}, null, NoopHostnameVerifier.INSTANCE);
+			Registry<ConnectionSocketFactory> registryBuilder = RegistryBuilder.<ConnectionSocketFactory>create()
+					.register(HTTP, new PlainConnectionSocketFactory())
+					.register(HTTPS, sslConnectionSocketFactory)
+					.build();
+			poolingHttpClientConnectionManager = new PoolingHttpClientConnectionManager(registryBuilder);
+			poolingHttpClientConnectionManager.setMaxTotal(200);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (KeyStoreException e) {
+			e.printStackTrace();
+		} catch (KeyManagementException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * 获取连接
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public static CloseableHttpClient getHttpClinet() throws Exception {
+		CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory)
+				.setConnectionManager(poolingHttpClientConnectionManager)
+				.setConnectionManagerShared(true)
+				.build();
+		return httpClient;
+	}
+}

@@ -5,13 +5,14 @@ spring:
     name: ash
   main:
     allow-bean-definition-overriding: true
+    allow-circular-references: true
   profiles:
     active: default
   datasource:
-    url: jdbc:mysql://53.1.236.89:3306/ash?useSSL=false&autoReconnect=true&characterEncoding=utf8
+    url: jdbc:mysql://10.9.1.252:3306/ash?useSSL=false&autoReconnect=true&characterEncoding=utf8
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: zaq1,lp-
+    username: qixiao
+    password: qixiao123!@#
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5
@@ -25,11 +26,9 @@ spring:
       test-on-return: true
       test-while-idle: true
   redis:
-  #  cluster:
-  #    nodes: 10.9.1.252:16380
-    password: zaq1,lp-
-    host: 53.1.236.89
-    port: 36379
+    cluster:
+      nodes: 10.9.1.252:16380
+    password: qixiao@123.com
     timeout: 3000
   servlet:
     multipart:
@@ -52,6 +51,8 @@ logging:
 ash:
   # errorFilePath: D:/data/errorData
   errorFilePath: /web/errorData
+  wiAnalysisUrl: http://10.124.9.44:9098/review/infoAnalyse
+  caseAnalysisUrl: http://10.124.9.44:9098/review/caseAnalyse
 auth:
   enable: false
   white: