diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index 2122fc5..f4b0644 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -108,7 +108,7 @@ public class EntrustMaterialCheckoutResultController { @ApiOperation("推送检出结果") public R pushSuspectDetectionResult(String entrustId) throws SQLException { DLPUser dlpUser = SecurityUtils.getUser(); - return R.ok(entrustMaterialCheckoutResultService.pushSuspectDetectionResult(entrustId, dlpUser)); + return R.ok(entrustMaterialCheckoutResultService.pushSuspectDetectionResult(entrustId)); } @GetMapping("/pushSuspectDetectionResultTask") diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java index 2cd5cb7..214b9bc 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustMaterialCheckoutResultService.java @@ -87,7 +87,7 @@ public interface EntrustMaterialCheckoutResultService extends IService materialMap = entrustmentIdentificationMaterialService.lambdaQuery() @@ -1146,7 +1144,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl flagList = Optional.ofNullable(StrUtil.split(entrust.getPushFlag(), StrUtil.COMMA)) .orElse(new ArrayList<>()); @@ -1228,7 +1226,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl suspects, List resultVOS, Entrustment entrustment, CaseEvent caseEvent, DLPUser user) { + private boolean pushToDatabase(List suspects, List resultVOS, Entrustment entrustment, CaseEvent caseEvent) { try (Connection connection = DriverManager.getConnection(intDBUrl, intDBUsername, intDBPassword)) { @@ -1254,7 +1252,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl vos = resutlMap.get(entrust.getId()); List suspects = susMap.get(entrust.getId()); CaseEvent caseEvent = caseMap.get(entrust.getCaseId()); - boolean ret = this.pushToDatabase(suspects, vos, entrust, caseEvent, dlpUser); + boolean ret = this.pushToDatabase(suspects, vos, entrust, caseEvent); if (!ret) { return R.failed("推送失败"); } @@ -2149,7 +2147,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl entrustmentVOS = entrustmentMapper.getEntrustmentVOList( + Wrappers.query() + .in("e.status", + EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus(), + EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH.getStatus(), + EntrustStatusConstants.ENTRUST_STATUS_COMPLETED.getStatus()) + .and(wrapper -> wrapper + .isNull("e.platform_flag") + .or() + .like("e.platform_flag", "false") + )); + Integer count1 = 0; + log.info("开始推送数据到 情报平台"); + for (EntrustmentVO entrustmentVO : entrustmentVOS) { + try { + resultService.pushSuspectDetectionResult(entrustmentVO.getId()); + count1++; + } catch (Exception e) { + log.error("推送鉴定结果数据失败, 受理编号: {}, 响应: {}", entrustmentVO.getAcceptNo(), e.getMessage()); + } + } + log.info("成功推送 {} 条数据到 情报平台", count1); log.info("成功推送 {} 条数据到 LabsCare", count); }