qitz 2 лет назад
Родитель
Сommit
a0ecc6bd69

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java Просмотреть файл

46
      * @return
46
      * @return
47
      */
47
      */
48
     @GetMapping("/logistics")
48
     @GetMapping("/logistics")
49
-    @PreAuthorize("@ss.hasPermi('delivery:detail')")
49
+//    @PreAuthorize("@ss.hasPermi('delivery:detail')")
50
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
50
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
51
         List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
51
         List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
52
         return AjaxResult.success(logisticsInfo);
52
         return AjaxResult.success(logisticsInfo);

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Просмотреть файл

32
     /**
32
     /**
33
      * 查询立案数据
33
      * 查询立案数据
34
      */
34
      */
35
-    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
35
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
36
     @GetMapping("/list")
36
     @GetMapping("/list")
37
     public TableDataInfo list(CaseApplication caseApplication) {
37
     public TableDataInfo list(CaseApplication caseApplication) {
38
         startPage();
38
         startPage();

+ 31
- 14
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/SaaSAPIFileUtils.java Просмотреть файл

64
         return EsignHttpHelper.doCommHttp(eSignHost, apiaddr,requestType , jsonParm, header,true);
64
         return EsignHttpHelper.doCommHttp(eSignHost, apiaddr,requestType , jsonParm, header,true);
65
     }
65
     }
66
 
66
 
67
-//  public static void main(String[] args) throws EsignDemoException {
68
- //      String filePath = "D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx";
69
-//        EsignHttpResponse uploadUrl = getUploadUrl(filePath);
70
-//        String body = uploadUrl.getBody();
71
-//        JSONObject jsonObject = new JSONObject(body);
72
-//        JSONObject dataObj = jsonObject.getJSONObject("data");
73
-//        String fileUploadUrl = dataObj.get("fileUploadUrl").toString();
74
-//        System.out.println("这是fileUploadUrl:"+fileUploadUrl);
75
-//        String fileId = dataObj.get("fileId").toString();
76
-//        System.out.println("这是fileId:"+fileId);
77
-//        EsignHttpResponse esignHttpResponse = uploadFile(fileUploadUrl, filePath);
78
-//        System.out.println("这是上传文件流的结果:"+esignHttpResponse.getBody());
67
+    /**
68
+     * 下载已签署文件及附属材料
69
+     */
70
+    public static EsignHttpResponse fileDownloadUrl(String signFlowId) throws EsignDemoException {
71
+        String apiaddr = "/v3/sign-flow/"+ signFlowId +"/file-download-url";
72
+        //请求参数body体,json格式。get或者delete请求时jsonString传空json:"{}"或者null
73
+        String jsonParm=null;
74
+        //请求方法
75
+        EsignRequestType requestType= EsignRequestType.GET;
76
+        //生成签名鉴权方式的的header
77
+        Map<String, String> header = EsignHttpHelper.signAndBuildSignAndJsonHeader(eSignAppId,eSignAppSecret,jsonParm,requestType.name(),apiaddr,true);
78
+        //发起接口请求
79
+        return EsignHttpHelper.doCommHttp(eSignHost, apiaddr,requestType , jsonParm, header,true);
80
+    }
81
+
82
+  public static void main(String[] args) throws EsignDemoException {
83
+      String filePath = "D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\23893bfd3f2249ffa5c82850c11c482e.docx";
84
+        EsignHttpResponse uploadUrl = getUploadUrl(filePath);
85
+        String body = uploadUrl.getBody();
86
+        JSONObject jsonObject = new JSONObject(body);
87
+        JSONObject dataObj = jsonObject.getJSONObject("data");
88
+        String fileUploadUrl = dataObj.get("fileUploadUrl").toString();
89
+        System.out.println("这是fileUploadUrl:"+fileUploadUrl);
90
+        String fileId = dataObj.get("fileId").toString();
91
+        System.out.println("这是fileId:"+fileId);
92
+      //String fileUploadUrl = "https://esignoss.esign.cn/1111564182/ccf6db5a-92da-4523-89ba-385a30423596/23893bfd3f2249ffa5c82850c11c482e.docx?Expires=1697021257&OSSAccessKeyId=STS.NTmgvSC8n5Zg1y7EciQftF23N&Signature=CxVZmpwFksWmLYkxPjVz9K4mVyA%3D&callback-var=eyJ4OmZpbGVfa2V5IjoiJDAyODhjOTg3LWNlNzgtNDM1OC04NWYwLTdlNmUyM2NjOTJmNiQzNDk1NzQ3MjE5In0%3D%0A&callback=eyJjYWxsYmFja1VybCI6Imh0dHA6Ly9zbWx0YXBpLnRzaWduLmNuL2FueWRvb3IvZmlsZS1zeXN0ZW0vY2FsbGJhY2svYWxpb3NzIiwiY2FsbGJhY2tCb2R5IjogIntcIm1pbWVUeXBlXCI6JHttaW1lVHlwZX0sXCJzaXplXCI6ICR7c2l6ZX0sXCJidWNrZXRcIjogJHtidWNrZXR9LFwib2JqZWN0XCI6ICR7b2JqZWN0fSxcImV0YWdcIjogJHtldGFnfSxcImZpbGVfa2V5XCI6JHt4OmZpbGVfa2V5fX0iLCJjYWxsYmFja0JvZHlUeXBlIjogImFwcGxpY2F0aW9uL2pzb24ifQ%3D%3D%0A&security-token=CAIS%2BAF1q6Ft5B2yfSjIr5fYLMznrudPgpiMM1%2BGoWM8XelYqfeYrDz2IHtKdXRvBu8Xs%2F4wnmxX7f4YlqB6T55OSAmcNZEofT7katr4MeT7oMWQweEurv%2FMQBqyaXPS2MvVfJ%2BOLrf0ceusbFbpjzJ6xaCAGxypQ12iN%2B%2Fm6%2FNgdc9FHHPPD1x8CcxROxFppeIDKHLVLozNCBPxhXfKB0ca0WgVy0EHsPnvm5DNs0uH1AKjkbRM9r6ceMb0M5NeW75kSMqw0eBMca7M7TVd8RAi9t0t1%2FIVpGiY4YDAWQYLv0rda7DOltFiMkpla7MmXqlft%2BhzcgeQY0pc%2FRqAAaxcPCSY0Du8wgErfR1llD8t2zeFG%2B1mktU4Rsl7AgxsSFxrwILBUk2x7imVsFVA0kkS8rNBMDKGIsIZTCl5M7S2L%2BD8364htwcZgIZYHK2fCN6gCuy%2Bfk9C%2FfQaTc00IWBMw8OubuJ%2Fq2mdMh32yoi7dLuJyhwt1z%2F%2BWf5vIFHdIAA%3D";
93
+        EsignHttpResponse esignHttpResponse = uploadFile(fileUploadUrl, filePath);
94
+        System.out.println("这是上传文件流的结果:"+esignHttpResponse.getBody());
79
 //       EsignHttpResponse fileStatus = getFileStatus(fileId);
95
 //       EsignHttpResponse fileStatus = getFileStatus(fileId);
80
 //        System.out.println("这是获取文件上传状态的结果:"+fileStatus.getBody());
96
 //        System.out.println("这是获取文件上传状态的结果:"+fileStatus.getBody());
81
-//        getFileStatus("a0c2ad21065f48ff8b872412c39d5d3a");
82
-//    }
97
+//        getFileStatus("a808f1f39a744357a2f018e4ab34c55d");
98
+//     fileDownloadUrl("");
99
+    }
83
 }
100
 }

+ 10
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java Просмотреть файл

210
     private double positionXorg;
210
     private double positionXorg;
211
     /** 印章位置y坐标 */
211
     /** 印章位置y坐标 */
212
     private double positionYorg;
212
     private double positionYorg;
213
+    /** 案件申请id */
214
+    private Long caseAppliId;
215
+
216
+    public Long getCaseAppliId() {
217
+        return caseAppliId;
218
+    }
219
+
220
+    public void setCaseAppliId(Long caseAppliId) {
221
+        this.caseAppliId = caseAppliId;
222
+    }
213
 
223
 
214
     public Long getId() {
224
     public Long getId() {
215
         return id;
225
         return id;

+ 0
- 14
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Просмотреть файл

118
                 datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
118
                 datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
119
             }
119
             }
120
             datas.put("legalProvisions", "仲裁法");
120
             datas.put("legalProvisions", "仲裁法");
121
-            if (arbitratorName == null) {
122
-                datas.put("arbitratorName1", null);
123
-                datas.put("arbitratorName2", null);
124
-            } else if (arbitratorName.contains(",")) {
125
-                String[] nameArray = arbitratorName.split(",");
126
-                String firstName = nameArray[0];
127
-                String secondName = nameArray[1];
128
-                datas.put("arbitratorName1", firstName);
129
-                datas.put("arbitratorName2", secondName);
130
-            } else {
131
-                String secondName = "";
132
-                datas.put("arbitratorName1", arbitratorName);
133
-                datas.put("arbitratorName2", secondName);
134
-            }
135
             LocalDate now = LocalDate.now();
121
             LocalDate now = LocalDate.now();
136
             String year = Integer.toString(now.getYear());
122
             String year = Integer.toString(now.getYear());
137
             String month = String.format("%02d", now.getMonthValue());
123
             String month = String.format("%02d", now.getMonthValue());