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

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

@@ -120,6 +120,7 @@ public class AdjudicationController extends BaseController {
      */
     @GetMapping("/archives")
     public AjaxResult getArchivesDetail(Long id){
+
         return adjudicationService.getArchivesDetail(id);
     }
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java

@@ -37,14 +37,16 @@ public class FixSelectFlowDetailUtils {
     @Autowired
     private DeptIdentifyMapper deptIdentifyMapper;
 
-    @Scheduled(cron = "0/3 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     @Transactional
-    public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException {
+    public void fixExecuteSelectFlowDetailUtils(){
         Gson gson = new Gson();
 
         SealSignRecord sealSignRecordselect = new SealSignRecord();
 //        sealSignRecordselect.setSignFlowStatus(1);
         List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect);
+
+        try {
             if(sealSignRecords!=null&&sealSignRecords.size()>0){
                 for (int i = 0; i < sealSignRecords.size(); i++) {
                     SealSignRecord sealSignRecord = sealSignRecords.get(i);
@@ -127,6 +129,7 @@ public class FixSelectFlowDetailUtils {
                                     String resultFilePath = saveFolderPath + "/" + fileName;
                                     String fileDownloadUrlnew  = fileDownloadUrl.substring(1,fileDownloadUrl.length()-1);
                                     FileTransformation.downLoadFileByUrl(fileDownloadUrlnew,resultFilePath);
+                                    Thread.sleep(3000);
 
                                     Long caseAppliId = sealSignRecord.getCaseAppliId();
                                     CaseAttach caseAttach = new CaseAttach();
@@ -147,10 +150,21 @@ public class FixSelectFlowDetailUtils {
 
 
 
+        } catch (EsignDemoException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
 
 
-    @Scheduled(cron = "0/10 * * * * ?")
+
+
+
+
+    }
+
+
+    @Scheduled(cron = "0/30 * * * * ?")
     @Transactional
     public void fixExecuteSelectDeptIndentifyUtils() throws EsignDemoException {
         Gson gson = new Gson();

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.EsignHttpHelper;
 import com.ruoyi.wisdomarbitrate.domain.DeptIdentify;
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
 
+import java.io.File;
 import java.util.Date;
 import java.util.Map;
 
@@ -28,7 +29,6 @@ public class SignAward {
 
         SealSignRecord sealSignRecord = new SealSignRecord();
 
-
         /* 发起签署*/
 //        EsignHttpResponse createByFile = createByFile(sealSignRecord);
 //        JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class);