Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java

@@ -4,12 +4,15 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.LogisticsInfoVO;
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/adjudication")
 public class AdjudicationController extends BaseController {
@@ -45,7 +48,8 @@ public class AdjudicationController extends BaseController {
     @GetMapping("/logistics")
     @PreAuthorize("@ss.hasPermi('delivery:detail')")
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
-        return adjudicationService.getLogisticsInfo(caseApplication);
+        List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
+        return AjaxResult.success(logisticsInfo);
     }
 
     /**
@@ -90,4 +94,14 @@ public class AdjudicationController extends BaseController {
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.stamp(caseApplication);
     }
+
+    /**
+     * 档案详情查询
+     * @param id 案件id
+     * @return
+     */
+    @GetMapping("/archives")
+    public AjaxResult getArchivesDetail(Long id){
+        return adjudicationService.getArchivesDetail(id);
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/SaaSAPIFileUtils.java

@@ -64,20 +64,20 @@ public class SaaSAPIFileUtils {
         return EsignHttpHelper.doCommHttp(eSignHost, apiaddr,requestType , jsonParm, header,true);
     }
 
-/*    public static void main(String[] args) throws EsignDemoException {
-        String filePath = "D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\07\\6babb8e261454fffbacf6d9fd1589b9b.docx";
-        EsignHttpResponse uploadUrl = getUploadUrl(filePath);
-        String body = uploadUrl.getBody();
-        JSONObject jsonObject = new JSONObject(body);
-        JSONObject dataObj = jsonObject.getJSONObject("data");
-        String fileUploadUrl = dataObj.get("fileUploadUrl").toString();
-        System.out.println("这是fileUploadUrl:"+fileUploadUrl);
-        String fileId = dataObj.get("fileId").toString();
-        System.out.println("这是fileId:"+fileId);
-        EsignHttpResponse esignHttpResponse = uploadFile(fileUploadUrl, filePath);
-        System.out.println("这是上传文件流的结果:"+esignHttpResponse.getBody());
-        EsignHttpResponse fileStatus = getFileStatus(fileId);
-        System.out.println("这是获取文件上传状态的结果:"+fileStatus.getBody());
-        getFileStatus("95d0c307d91e4985bdb8874f6f84daa5");
-    }*/
+//  public static void main(String[] args) throws EsignDemoException {
+ //      String filePath = "D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx";
+//        EsignHttpResponse uploadUrl = getUploadUrl(filePath);
+//        String body = uploadUrl.getBody();
+//        JSONObject jsonObject = new JSONObject(body);
+//        JSONObject dataObj = jsonObject.getJSONObject("data");
+//        String fileUploadUrl = dataObj.get("fileUploadUrl").toString();
+//        System.out.println("这是fileUploadUrl:"+fileUploadUrl);
+//        String fileId = dataObj.get("fileId").toString();
+//        System.out.println("这是fileId:"+fileId);
+//        EsignHttpResponse esignHttpResponse = uploadFile(fileUploadUrl, filePath);
+//        System.out.println("这是上传文件流的结果:"+esignHttpResponse.getBody());
+//       EsignHttpResponse fileStatus = getFileStatus(fileId);
+//        System.out.println("这是获取文件上传状态的结果:"+fileStatus.getBody());
+//        getFileStatus("a0c2ad21065f48ff8b872412c39d5d3a");
+//    }
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ArchivesDetailVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.wisdomarbitrate.domain.vo;
+
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
+import com.ruoyi.wisdomarbitrate.mapper.CaseLogRecordMapper;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ArchivesDetailVO {
+    /**
+     * 案件信息
+     */
+    private CaseApplication caseApplication;
+    /**
+     * 案件日志信息
+     */
+    private List<CaseLogRecord> caseLogRecordList;
+    /**
+     * 快递信息
+     */
+    private List<LogisticsInfoVO> logisticsInfoVOList;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java

@@ -2,13 +2,16 @@ package com.ruoyi.wisdomarbitrate.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.vo.LogisticsInfoVO;
+
+import java.util.List;
 
 public interface IAdjudicationService {
     AjaxResult createDocument(CaseApplication caseApplication);
 
     AjaxResult sendDocumentByEmail(Long id,String appEmail,String resEmail ,String apptrackingNum,String restrackingNum);
 
-    AjaxResult getLogisticsInfo(CaseApplication caseApplication);
+    List<LogisticsInfoVO> getLogisticsInfo(CaseApplication caseApplication);
 
     AjaxResult signature(CaseApplication caseApplication);
 
@@ -18,4 +21,5 @@ public interface IAdjudicationService {
 
     AjaxResult stamp(CaseApplication caseApplication);
 
+    AjaxResult getArchivesDetail(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
 import com.ruoyi.common.utils.EmailOutUtil;
 import com.ruoyi.common.utils.WordUtil;
 import com.ruoyi.wisdomarbitrate.domain.*;
+import com.ruoyi.wisdomarbitrate.domain.vo.ArchivesDetailVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.LogisticsInfoVO;
 import com.ruoyi.wisdomarbitrate.mapper.ArbitrateRecordMapper;
 import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper;
@@ -15,6 +16,7 @@ import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
 import com.ruoyi.wisdomarbitrate.mapper.CaseAttachMapper;
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
+import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.MailSendException;
@@ -50,6 +52,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
     private EmailOutUtil emailOutUtil;
     @Autowired
     private ICaseApplicationService caseApplicationService;
+    @Autowired
+    private ICaseLogRecordService caseLogRecordService;
 
     @Override
     public AjaxResult createDocument(CaseApplication caseApplication) {
@@ -246,7 +250,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
     }
 
     @Override
-    public AjaxResult getLogisticsInfo(CaseApplication caseApplication) {
+    public List<LogisticsInfoVO> getLogisticsInfo(CaseApplication caseApplication) {
         try {
             //快递单号查询
             String key = "729437f92468910aee6c12dbfeaee3c1";
@@ -291,11 +295,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
                             }
                         } else {
                             // 请求失败
-                            return AjaxResult.error("请求失败，错误码：" + responseCode);
+                            return null;
                         }
                     }
                 }
-                return AjaxResult.success(logisticsInfoVOList);
+                return logisticsInfoVOList;
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -370,7 +374,32 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
         return AjaxResult.success("用印成功,案件状态已改为待仲裁文书送达");
     }
 
-    public static void main(String[] args) {
+    @Override
+    public AjaxResult getArchivesDetail(Long id) {
+        ArchivesDetailVO archivesDetailVO = new ArchivesDetailVO();
+        CaseApplication caseApplication = new CaseApplication();
+        caseApplication.setId(id);
+        //查询案件信息
+        CaseApplication caseApplication1 = caseApplicationService.selectCaseApplication(caseApplication);
+        if (caseApplication1 != null) {
+            archivesDetailVO.setCaseApplication(caseApplication1);
+        }
+        //查询案件日志信息
+        CaseLogRecord caseLogRecord = new CaseLogRecord();
+        caseLogRecord.setCaseAppliId(id);
+        List<CaseLogRecord> caseLogRecords = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
+        if (caseLogRecords != null && caseLogRecords.size() > 0) {
+            archivesDetailVO.setCaseLogRecordList(caseLogRecords);
+        }
+        //查询快递信息
+        List<LogisticsInfoVO> logisticsInfo = this.getLogisticsInfo(caseApplication);
+        if (logisticsInfo != null && logisticsInfo.size() > 0) {
+            archivesDetailVO.setLogisticsInfoVOList(logisticsInfo);
+        }
+        return AjaxResult.success(archivesDetailVO);
+    }
+
+    /*public static void main(String[] args) {
         try {
             List<File> fileList = new ArrayList<>();
             fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
@@ -385,5 +414,6 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
         } catch (MailSendException e) {
             e.printStackTrace();
         }
-    }
+    }*/
+
 }