diff --git a/src/main/java/com/docus/server/report/controller/FetchPacsBase64ExceptController.java b/src/main/java/com/docus/server/report/controller/FetchPacsBase64ExceptController.java new file mode 100644 index 0000000..0e4bea6 --- /dev/null +++ b/src/main/java/com/docus/server/report/controller/FetchPacsBase64ExceptController.java @@ -0,0 +1,35 @@ +package com.docus.server.report.controller; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.report.job.FetchPacsBase64Job; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Slf4j +@Api(tags = "pacs获取base64异常相关接口") +@RestController +@RequestMapping("/api/fetchPacsBase64Except") +public class FetchPacsBase64ExceptController { + @Resource + private FetchPacsBase64Job fetchPacsBase64Job; + + + @ApiOperation(value = "根据异常数据表的id补偿") + @GetMapping("/compenstateById") + public CommonResult compenstateById(@Param("id") Long exceptId) { + fetchPacsBase64Job.compensateFetchBase64Report(exceptId); + return CommonResult.success("完成"); + } + + + + + +} diff --git a/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java b/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java index a2c4659..d7a8d88 100644 --- a/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java +++ b/src/main/java/com/docus/server/report/job/FetchPacsBase64Job.java @@ -76,7 +76,7 @@ public class FetchPacsBase64Job { } /** - * 检查报告1009更新需要获取base64报告的job + * 检查报告1008新增需要获取base64报告的job */ @XxlJob("fetchBase64ReportHip1008Job") public void fetchBase64ReportHip1008Job() { @@ -130,9 +130,13 @@ public class FetchPacsBase64Job { sdryPacsPrintExceptService.insert(pacsPrintExcept); } - private void compensateFetchBase64Report(Long id) { + public void compensateFetchBase64Report(Long id) { // base64的和job的检查报告统一处理逻辑,不然会出现重复 SdryPacsPrintExcept except = sdryPacsPrintExceptService.getById(id); + if(Objects.isNull(except)){ + log.error("未找到id为:{} 的获取pacs异常的数据!",id); + return; + } String messagePath = except.getReportMessagePath(); String xml = FileUtil.readStr(new File(messagePath)); if (Objects.isNull(xml)) {