toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2025-12-24 17:20:47 +08:00
parent d24583a44a 14925bed13
commit d57bb63d42
15 changed files with 185 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/com/sdm/common/feign/impl/flowable/FlowableClientFeignClientImpl.java
View File

@@ -95,4 +95,17 @@ public class FlowableClientFeignClientImpl implements IFlowableFeignClient {
}
return SdmResponse.success();
}
@Override
public SdmResponse retryFailedNode(String processInstanceId, String failNodeId) {
SdmResponse response;
try {
response = flowableFeignClient.retryFailedNode(processInstanceId, failNodeId);
log.info("重试当前失败节点："+ response);
return response;
} catch (Exception e) {
log.error("重试当前失败节点失败", e);
return SdmResponse.failed("重试当前失败节点失败");
}
}
}

3
common/src/main/java/com/sdm/common/feign/inter/flowable/IFlowableFeignClient.java
View File

@@ -36,4 +36,7 @@ public interface IFlowableFeignClient {
@PostMapping("/process/asyncCallback")
SdmResponse asyncCallback(@RequestBody AsyncCallbackRequest request);
@PostMapping("/process/retryFailedNode")
SdmResponse retryFailedNode(@RequestParam String processInstanceId, @RequestParam String failNodeId);
}

10
common/src/main/java/com/sdm/common/utils/excel/ExcelUtil.java
View File

@@ -687,6 +687,16 @@ public class ExcelUtil {
for (int i = 0; i < 8; i++) {
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, i, i));
}
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 21, 21));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 22, 22));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 23, 23));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 29, 29));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 30, 30));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 31, 31));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 32, 32));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 33, 33));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 34, 34));
sheet.addMergedRegion(new CellRangeAddress(startIndex, endIndex, 35, 35));
}
}
}