Explorar el Código

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

hejinbo hace 2 años
padre
commit
8c890c415a

+ 7
- 15
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java Ver fichero

169
         double positionXorg = sealSignRecord.getPositionXorg();
169
         double positionXorg = sealSignRecord.getPositionXorg();
170
         double positionYorg = sealSignRecord.getPositionYorg();
170
         double positionYorg = sealSignRecord.getPositionYorg();
171
 
171
 
172
+        String availableSealId = "209af82b-5f87-4e0a-b0d8-cc4923b6e652";
173
+
172
         String jsonParm = "{\n" +
174
         String jsonParm = "{\n" +
173
                 "    \"docs\": [\n" +
175
                 "    \"docs\": [\n" +
174
                 "        {\n" +
176
                 "        {\n" +
175
                 "            \"fileId\": \"" + fileId +  "\",\n" +
177
                 "            \"fileId\": \"" + fileId +  "\",\n" +
176
                 "            \"fileName\": \"" + fileName +  "\"\n" +
178
                 "            \"fileName\": \"" + fileName +  "\"\n" +
177
-
178
                 "        }\n" +
179
                 "        }\n" +
179
                 "    ],\n" +
180
                 "    ],\n" +
180
                 "    \"signFlowConfig\": {\n" +
181
                 "    \"signFlowConfig\": {\n" +
192
                 "           ]\n" +
193
                 "           ]\n" +
193
                 "       },\n" +
194
                 "       },\n" +
194
 
195
 
195
-
196
                 "       \"signConfig\": {\n" +
196
                 "       \"signConfig\": {\n" +
197
                 "           \"availableSignClientTypes\":  \"1\"\n" +
197
                 "           \"availableSignClientTypes\":  \"1\"\n" +
198
                 "       },\n" +
198
                 "       },\n" +
199
 
199
 
200
-
201
                 "        \"autoFinish\": true\n" +
200
                 "        \"autoFinish\": true\n" +
202
                 "    },\n" +
201
                 "    },\n" +
203
 
202
 
204
                 "    \"signers\": [\n" +
203
                 "    \"signers\": [\n" +
205
-
206
                 "          {\n" +
204
                 "          {\n" +
207
-
208
                 "            \"psnSignerInfo\": {\n" +
205
                 "            \"psnSignerInfo\": {\n" +
209
                 "                \"psnAccount\": \"" + psnAccount +  "\",\n" +
206
                 "                \"psnAccount\": \"" + psnAccount +  "\",\n" +
210
-
211
                 "                \"psnInfo\": {\n" +
207
                 "                \"psnInfo\": {\n" +
212
                 "                            \"psnName\": \"" + psnName +  "\"\n" +
208
                 "                            \"psnName\": \"" + psnName +  "\"\n" +
213
                 "                        }\n" +
209
                 "                        }\n" +
214
-
215
                 "            },\n" +
210
                 "            },\n" +
216
                 "            \"signFields\": [\n" +
211
                 "            \"signFields\": [\n" +
217
                 "                {\n" +
212
                 "                {\n" +
218
-
219
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
213
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
220
-
221
                 "                    \"normalSignFieldConfig\": {\n" +
214
                 "                    \"normalSignFieldConfig\": {\n" +
222
                 "                        \"autoSign\": false,\n" +
215
                 "                        \"autoSign\": false,\n" +
223
                 "                        \"freeMode\": false,\n" +
216
                 "                        \"freeMode\": false,\n" +
235
                 "            \"signerType\": 0\n" +
228
                 "            \"signerType\": 0\n" +
236
                 "        },\n" +
229
                 "        },\n" +
237
 
230
 
238
-
239
                 "        {\n" +
231
                 "        {\n" +
240
                 "            \"orgSignerInfo\": {\n" +
232
                 "            \"orgSignerInfo\": {\n" +
241
                 "                \"orgName\": \"" + orgName +  "\",\n" +
233
                 "                \"orgName\": \"" + orgName +  "\",\n" +
242
                 "                \"transactorInfo\": {\n" +
234
                 "                \"transactorInfo\": {\n" +
243
                 "                \"psnAccount\": \"" + orgNamePsnAccount +  "\",\n" +
235
                 "                \"psnAccount\": \"" + orgNamePsnAccount +  "\",\n" +
244
-
245
                 "                \"psnInfo\": {\n" +
236
                 "                \"psnInfo\": {\n" +
246
-
247
                 "                            \"psnName\": \"" + orgNamepsnName +  "\"\n" +
237
                 "                            \"psnName\": \"" + orgNamepsnName +  "\"\n" +
248
                 "                        }\n" +
238
                 "                        }\n" +
249
-
250
                 "                }\n" +
239
                 "                }\n" +
251
                 "            },\n" +
240
                 "            },\n" +
252
 
241
 
253
                 "            \"signFields\": [\n" +
242
                 "            \"signFields\": [\n" +
254
                 "                {\n" +
243
                 "                {\n" +
255
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
244
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
256
-
257
                 "                    \"normalSignFieldConfig\": {\n" +
245
                 "                    \"normalSignFieldConfig\": {\n" +
258
                 "                        \"autoSign\": false,\n" +
246
                 "                        \"autoSign\": false,\n" +
259
                 "                        \"freeMode\": false,\n" +
247
                 "                        \"freeMode\": false,\n" +
260
 
248
 
261
-                "                        \"signFieldPosition\": {\n" +
249
+                "                        \"availableSealIds\": [\n" +
250
+                "                               \"" + availableSealId +  "\"\n" +
251
+                "                           ],\n" +
262
 
252
 
253
+
254
+                "                        \"signFieldPosition\": {\n" +
263
                 "                            \"positionPage\": \"" + positionPageorg +  "\",\n" +
255
                 "                            \"positionPage\": \"" + positionPageorg +  "\",\n" +
264
                 "                            \"positionX\": " + positionXorg +  ",\n" +
256
                 "                            \"positionX\": " + positionXorg +  ",\n" +
265
                 "                            \"positionY\": " + positionYorg +  "\n" +
257
                 "                            \"positionY\": " + positionYorg +  "\n" +