SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
hejinbo
2023-11-03 18:33:20 +08:00
parent 84621de905 e6edadb07c
commit 15426c5b7b
3 changed files with 104 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java
+1
View File
@@ -120,6 +120,7 @@ public class AdjudicationController extends BaseController {
*/ */
@GetMapping("/archives") @GetMapping("/archives")
public AjaxResult getArchivesDetail(Long id){ public AjaxResult getArchivesDetail(Long id){
return adjudicationService.getArchivesDetail(id); return adjudicationService.getArchivesDetail(id);
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
+12 -5
View File
@@ -37,14 +37,16 @@ public class FixSelectFlowDetailUtils {
@Autowired @Autowired
private DeptIdentifyMapper deptIdentifyMapper; private DeptIdentifyMapper deptIdentifyMapper;
@Scheduled(cron = "0/3 * * * * ?") @Scheduled(cron = "0/10 * * * * ?")
@Transactional @Transactional
public void fixExecuteSelectFlowDetailUtils() throws EsignDemoException { public void fixExecuteSelectFlowDetailUtils(){
Gson gson = new Gson(); Gson gson = new Gson();
SealSignRecord sealSignRecordselect = new SealSignRecord(); SealSignRecord sealSignRecordselect = new SealSignRecord();
// sealSignRecordselect.setSignFlowStatus(1); // sealSignRecordselect.setSignFlowStatus(1);
List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect); List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect);
try {
if(sealSignRecords!=null&&sealSignRecords.size()>0){ if(sealSignRecords!=null&&sealSignRecords.size()>0){
for (int i = 0; i < sealSignRecords.size(); i++) { for (int i = 0; i < sealSignRecords.size(); i++) {
SealSignRecord sealSignRecord = sealSignRecords.get(i); SealSignRecord sealSignRecord = sealSignRecords.get(i);
@@ -126,8 +128,8 @@ public class FixSelectFlowDetailUtils {
String savePath = "/home/ruoyi/uploadPath/upload"; String savePath = "/home/ruoyi/uploadPath/upload";
String resultFilePath = saveFolderPath + "/" + fileName; String resultFilePath = saveFolderPath + "/" + fileName;
String fileDownloadUrlnew = fileDownloadUrl.substring(1,fileDownloadUrl.length()-1); String fileDownloadUrlnew = fileDownloadUrl.substring(1,fileDownloadUrl.length()-1);
FileTransformation.downLoadFileByUrl(fileDownloadUrlnew,resultFilePath); boolean b = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
if(b) {
Long caseAppliId = sealSignRecord.getCaseAppliId(); Long caseAppliId = sealSignRecord.getCaseAppliId();
CaseAttach caseAttach = new CaseAttach(); CaseAttach caseAttach = new CaseAttach();
caseAttach.setCaseAppliId(caseAppliId); caseAttach.setCaseAppliId(caseAppliId);
@@ -135,6 +137,7 @@ public class FixSelectFlowDetailUtils {
caseAttach.setAnnexPath(savePath); caseAttach.setAnnexPath(savePath);
caseAttach.setAnnexName(saveName); caseAttach.setAnnexName(saveName);
caseAttachMapper.updateCaseAttachBycaseid(caseAttach); caseAttachMapper.updateCaseAttachBycaseid(caseAttach);
}
} }
} }
@@ -147,10 +150,14 @@ public class FixSelectFlowDetailUtils {
} catch (EsignDemoException e) {
e.printStackTrace();
}
} }
@Scheduled(cron = "0/10 * * * * ?") @Scheduled(cron = "0/30 * * * * ?")
@Transactional @Transactional
public void fixExecuteSelectDeptIndentifyUtils() throws EsignDemoException { public void fixExecuteSelectDeptIndentifyUtils() throws EsignDemoException {
Gson gson = new Gson(); Gson gson = new Gson();
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+1 -1
View File
@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.EsignHttpHelper;
import com.ruoyi.wisdomarbitrate.domain.DeptIdentify; import com.ruoyi.wisdomarbitrate.domain.DeptIdentify;
import com.ruoyi.wisdomarbitrate.domain.SealSignRecord; import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
import java.io.File;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@@ -28,7 +29,6 @@ public class SignAward {
SealSignRecord sealSignRecord = new SealSignRecord(); SealSignRecord sealSignRecord = new SealSignRecord();
/* 发起签署*/ /* 发起签署*/
// EsignHttpResponse createByFile = createByFile(sealSignRecord); // EsignHttpResponse createByFile = createByFile(sealSignRecord);
// JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class); // JsonObject createByFileJsonObject = gson.fromJson(createByFile.getBody(), JsonObject.class);