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

ruoyi-admin/src/main/resources/application.yml

 # 调解机构代码配置
 organizeConfig:
   # creditCode
-  creditCode: 910000058386410047
+  creditCode: 910000870060480009
 #  引入仲裁系统url配置
 arbitrateConfig:
   url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication

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

 import java.util.stream.Collectors;
 
 import static com.google.common.io.Files.getFileExtension;
+import static com.ruoyi.common.core.domain.AjaxResult.error;
 import static com.ruoyi.common.core.domain.AjaxResult.success;
 
 @Slf4j
             Example msSealSignRecordExample = new Example(MsSealSignRecord.class);
             msSealSignRecordExample.createCriteria().andEqualTo("signFlowId", signFlowId);
             MsSealSignRecord sealSignRecordsel = sealSignRecordMapper.selectOneByExample(msSealSignRecordExample);
-
+            if(sealSignRecordsel==null){
+                return error("未找到签署流程");
+            }
             String pensonAccountApply = sealSignRecordsel.getPensonAccount();
             String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc();
             String pensonAccountRes = sealSignRecordsel.getPensonAccountRes();
 
                             //下载审核完成的调解书
                             msSignSealService.downloadMediationBook(caseApplicationselect, signFlowId, gson, caseAppliId);
-//                            EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId);
-//                            JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(), JsonObject.class);
-//                            JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data");
-//                            JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray();
-//                            if (filesArray != null && filesArray.size() > 0) {
-//                                JsonObject fileObject = (JsonObject) filesArray.get(0);
-//                                String fileDownloadUrl = fileObject.get("downloadUrl").toString();
-//                                LocalDate now = LocalDate.now();
-//                                String year = Integer.toString(now.getYear());
-//                                String month = String.format("%02d", now.getMonthValue());
-//                                String day = String.format("%02d", now.getDayOfMonth());
-//                                String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
-//                                String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf";
-//                                String saveName = fileName;
-//                                String savePath = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName;
-//
-//                                // 创建日期目录
-//                                File saveFolder = new File(saveFolderPath);
-//                                if (!saveFolder.exists()) {
-//                                    saveFolder.mkdirs();
-//                                }
-//                                String resultFilePath = saveFolderPath + "/" + fileName;
-//                                File resultFilePathFile = new File(resultFilePath);
-//                                if (!resultFilePathFile.exists()) {
-//                                    resultFilePathFile.createNewFile();
-//                                }
-//
-//                                String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1);
-//                                boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
-//                                if (downLoadFile) {
-//                                    // 先删除已经存在的调解书
-//                                    if(StrUtil.isEmpty(caseApplicationselect.getCaseSource())){
-//                                        List<MsCaseAttach> existAttach = msCaseAttachMapper.listCaseAttachByCaseIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode());
-//                                        if(CollectionUtil.isNotEmpty(existAttach)){
-//                                            //  对接北明，同步案件状态，删除
-//                                            for (MsCaseAttach msCaseAttach : existAttach) {
-//                                                if(StrUtil.isEmpty(msCaseAttach.getOtherSysFileId())||StrUtil.isEmpty(msCaseAttach.getAnnexPath())){
-//                                                    continue;
-//                                                }
-//                                                beiMingInterfaceService.deleteAttachmentInfo(caseApplicationselect.getCaseNum(), msCaseAttach.getOtherSysFileId(), FileUtil.getName(msCaseAttach.getAnnexPath()));
-//                                            }
-//                                        }
-//                                    }
-//                                    msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode());
-//                                    MsCaseAttach caseAttach = new MsCaseAttach();
-//                                    caseAttach.setCaseAppliId(caseAppliId);
-//                                    caseAttach.setAnnexType(AnnexTypeEnum.MEDIATE_BOOK.getCode());
-//                                    caseAttach.setAnnexPath(savePath);
-//                                    caseAttach.setAnnexName(saveName);
-//                                    caseAttachMapper.save(caseAttach);
-//                                    //  对接北明，调用上传附件接口
-//                                    if(StrUtil.isEmpty(caseApplicationselect.getCaseSource()) ) {
-//                                        String templatePath = "/home/ruoyi" + savePath;
-//                                        File file = new File(templatePath.replace("/profile", "/uploadPath"));
-//                                        MsCaseFileInfo caseFileInfo = beiMingInterfaceService.pushAttachmentInfo(BMUserName, BMPassword, file, BMSyncSource, caseApplicationselect.getCaseNum(), AttachmentOperateTypeEnum.ADD,DocumentTypeEnum.EVEDENT_AGREEMENT);
-//                                        // 更新附件表
-//                                        if(caseFileInfo!=null && StrUtil.isNotEmpty(caseFileInfo.getFileId())){
-//                                            caseAttach.setOtherSysFileId(caseFileInfo.getFileId());
-//                                            msCaseAttachMapper.updateCaseAttachBycaseid(caseAttach);
-//                                        }
-//
-//                                    }
-//                                }
-//
-//                            }
+
                         }
                     } else if (StringUtils.isNotEmpty(accountMobile) && accountMobile.equals(pensonAccountRes)) {
                         //被申请人签名
 
                             //下载审核完成的调解书
                             msSignSealService.downloadMediationBook(caseApplicationselect, signFlowId, gson, caseAppliId);
-//                            EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId);
-//                            JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(), JsonObject.class);
-//                            JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data");
-//                            JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray();
-//                            if (filesArray != null && filesArray.size() > 0) {
-//                                JsonObject fileObject = (JsonObject) filesArray.get(0);
-//                                String fileDownloadUrl = fileObject.get("downloadUrl").toString();
-//                                LocalDate now = LocalDate.now();
-//                                String year = Integer.toString(now.getYear());
-//                                String month = String.format("%02d", now.getMonthValue());
-//                                String day = String.format("%02d", now.getDayOfMonth());
-//                                String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
-//                                String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf";
-//                                String saveName = fileName;
-//                                String savePath = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName;
-//
-//                                // 创建日期目录
-//                                File saveFolder = new File(saveFolderPath);
-//                                if (!saveFolder.exists()) {
-//                                    saveFolder.mkdirs();
-//                                }
-//                                String resultFilePath = saveFolderPath + "/" + fileName;
-//                                File resultFilePathFile = new File(resultFilePath);
-//                                if (!resultFilePathFile.exists()) {
-//                                    resultFilePathFile.createNewFile();
-//                                }
-//
-//                                String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1);
-//                                boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
-//                                if (downLoadFile) {
-//                                    // 先删除已经存在的调解书
-//                                    if(StrUtil.isEmpty(caseApplicationselect.getCaseSource())){
-//                                        List<MsCaseAttach> existAttach = msCaseAttachMapper.listCaseAttachByCaseIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode());
-//                                        if(CollectionUtil.isNotEmpty(existAttach)){
-//                                            //  对接北明，同步案件状态，删除
-//                                            for (MsCaseAttach msCaseAttach : existAttach) {
-//                                                if(StrUtil.isEmpty(msCaseAttach.getOtherSysFileId())||StrUtil.isEmpty(msCaseAttach.getAnnexPath())){
-//                                                    continue;
-//                                                }
-//                                                beiMingInterfaceService.deleteAttachmentInfo(caseApplicationselect.getCaseNum(), msCaseAttach.getOtherSysFileId(), FileUtil.getName(msCaseAttach.getAnnexPath()));
-//                                            }
-//                                        }
-//                                    }
-//                                    msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAppliId, AnnexTypeEnum.MEDIATE_BOOK.getCode());
-//                                    MsCaseAttach caseAttach = new MsCaseAttach();
-//                                    caseAttach.setCaseAppliId(caseAppliId);
-//                                    caseAttach.setAnnexType(7);
-//                                    caseAttach.setAnnexPath(savePath);
-//                                    caseAttach.setAnnexName(saveName);
-//
-//                                    //  对接北明，调用上传附件接口
-//
-//                                    if(StrUtil.isEmpty(caseApplicationselect.getCaseSource()) ) {
-//                                        String templatePath = "/home/ruoyi" + savePath;
-//                                        File file = new File(templatePath.replace("/profile", "/uploadPath"));
-//                                        MsCaseFileInfo caseFileInfo = beiMingInterfaceService.pushAttachmentInfo(BMUserName, BMPassword, file, BMSyncSource, caseApplicationselect.getCaseNum(), AttachmentOperateTypeEnum.ADD,DocumentTypeEnum.EVEDENT_AGREEMENT);
-//                                        // 更新附件表
-//                                        if(caseFileInfo!=null && StrUtil.isNotEmpty(caseFileInfo.getFileId())){
-//                                            caseAttach.setOtherSysFileId(caseFileInfo.getFileId());
-//                                        }
-//                                    }
-//                                    caseAttachMapper.save(caseAttach);
-//                                }
-//
-//                            }
                         }
                     }
                 }

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

     /**
      * 定时查询印章审核状态
      */
-    @Scheduled(cron = "0/30 * * * * ?")
+//    @Scheduled(cron = "0/30 * * * * ?")
     @Transactional
     public void searchForInstitutionalSeal() {
         try {