Quellcode durchsuchen

Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev

qtz vor 2 Jahren
Ursprung
Commit
80fd24e1c3

+ 4
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Datei anzeigen

4
 import cn.hutool.core.collection.CollectionUtil;
4
 import cn.hutool.core.collection.CollectionUtil;
5
 import cn.hutool.core.util.StrUtil;
5
 import cn.hutool.core.util.StrUtil;
6
 import cn.hutool.http.HttpRequest;
6
 import cn.hutool.http.HttpRequest;
7
+import cn.hutool.http.HttpResponse;
7
 import cn.hutool.json.JSONUtil;
8
 import cn.hutool.json.JSONUtil;
8
 import com.alibaba.fastjson.JSONArray;
9
 import com.alibaba.fastjson.JSONArray;
9
 import com.alibaba.fastjson.JSONObject;
10
 import com.alibaba.fastjson.JSONObject;
46
 import com.ruoyi.wisdomarbitrate.mapper.template.TemplateManageMapper;
47
 import com.ruoyi.wisdomarbitrate.mapper.template.TemplateManageMapper;
47
 import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService;
48
 import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService;
48
 import com.ruoyi.wisdomarbitrate.utils.*;
49
 import com.ruoyi.wisdomarbitrate.utils.*;
49
-import org.apache.http.HttpResponse;
50
+
50
 import org.apache.pdfbox.pdmodel.PDDocument;
51
 import org.apache.pdfbox.pdmodel.PDDocument;
51
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
52
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
52
 import org.springframework.beans.BeanUtils;
53
 import org.springframework.beans.BeanUtils;
1883
                     long timestamp = System.currentTimeMillis();
1884
                     long timestamp = System.currentTimeMillis();
1884
                     String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp);
1885
                     String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp);
1885
                     String urlstr = arbitrateUrl;
1886
                     String urlstr = arbitrateUrl;
1886
-                    HttpResponse httpResponse = (HttpResponse) HttpRequest.post(urlstr)
1887
+                    HttpResponse httpResponse = HttpRequest.post(urlstr)
1887
                             .header("timestampstr", String.valueOf(timestamp))
1888
                             .header("timestampstr", String.valueOf(timestamp))
1888
                             .header("signstr", signStr)
1889
                             .header("signstr", signStr)
1889
                             .body(paramsbody)
1890
                             .body(paramsbody)
1890
                             .execute();
1891
                             .execute();
1892
+                    return AjaxResult.success();
1891
                 }else if(mediaResult.intValue()==5){
1893
                 }else if(mediaResult.intValue()==5){
1892
                     // 达成和解
1894
                     // 达成和解
1893
                         List<MsCaseAttach> caseAttachList = msCaseAttachMapper.queryAnnexPathByCaseId(req.getId());
1895
                         List<MsCaseAttach> caseAttachList = msCaseAttachMapper.queryAnnexPathByCaseId(req.getId());