From a131d5a7345c04f8a14aca41c3c977dfcff1f7ca Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 10 Feb 2025 09:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderReviewController.java | 65 +++++----- .../service/collect/RelCodeBatchService.java | 117 +++++++----------- .../glxp/api/task/AliRelCodeDetailTask.java | 59 +-------- 3 files changed, 80 insertions(+), 161 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 016c2e1d..85c2417e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -21,6 +21,7 @@ import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; @@ -47,8 +48,10 @@ import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.alihealth.AlihealthYljgUtils; +import com.glxp.api.util.redis.RedisDelayedQueue; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -129,13 +132,14 @@ public class IoOrderReviewController extends BaseController { private RelCodeDetailService relCodeDetailService; @Resource private IoCodeDao ioCodeDao; + //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, BindingResult bindingResult) { - log.error("单据审核进来了==="+updateExportStatusRequest); + log.error("单据审核进来了===" + updateExportStatusRequest); if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -144,13 +148,13 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.error(500, "未找到该业务单据"); } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { - BaseResponse baseResponse = updateReview(getUser(), orderEntity); - log.error("单据审核进来了===orderEntity===="+orderEntity); + BaseResponse baseResponse = updateReview(getUser(), orderEntity); + log.error("单据审核进来了===orderEntity====" + orderEntity); - if(baseResponse.getCode() == 20000) { + if (baseResponse.getCode() == 20000) { //todo 审核通过上传关联关系 BasicBussinessTypeEntity businessType = basicBussinessTypeService.findByAction(orderEntity.getAction()); - log.error("单据审核进来了===businessType===="+businessType); + log.error("单据审核进来了===businessType====" + businessType); if (businessType.getCorpType() == ConstantStatus.CORP_SP && businessType.getMainAction().equals(ConstantType.TYPE_PUT) && businessType.getProductType() == 2) { aliBillsDispose(orderEntity); @@ -165,9 +169,6 @@ public class IoOrderReviewController extends BaseController { } - - - } //前端第三次验收 @@ -463,8 +464,14 @@ public class IoOrderReviewController extends BaseController { ioCheckInoutService.checkThird(orderEntity); return ResultVOUtils.success("更新成功"); } + + @Value("${REL_CODE_DELAY_SECONDS:7200}") + private Integer relCodeDelaySeconds; + @Resource + private RedisDelayedQueue redisDelayedQueue; + // 异步处理阿里单据 - public BaseResponse aliBillsDispose( IoOrderEntity orderEntity) { + public BaseResponse aliBillsDispose(IoOrderEntity orderEntity) { ThreadUtil.execAsync(() -> { //1.上传入库单 AlihealthYljgUploadinoutbillReqeust alihealthYljgUploadinoutbillReqeust = new AlihealthYljgUploadinoutbillReqeust(); @@ -475,40 +482,34 @@ public class IoOrderReviewController extends BaseController { alihealthYljgUploadinoutbillReqeust.setPhysic_type(3); alihealthYljgUploadinoutbillReqeust.setClient_type("2"); // 查询改单据传的码 - List ioCodeEntityList = ioCodeDao.selectList(new QueryWrapper().eq("orderId", orderEntity.getBillNo())); - if(ioCodeEntityList!=null && ioCodeEntityList.size() >0){ + List ioCodeEntityList = ioCodeDao.selectList(new QueryWrapper().eq("orderId", orderEntity.getBillNo())); + if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) { List codeList = new ArrayList<>(); for (IoCodeEntity ioCodeEntity : ioCodeEntityList) { codeList.add(ioCodeEntity.getCode()); } Set set = new HashSet<>(codeList); - - alihealthYljgUploadinoutbillReqeust.setTrace_codes( String.join(",", codeList)); + alihealthYljgUploadinoutbillReqeust.setTrace_codes(String.join(",", codeList)); // 单据上传先注释了 // BaseResponse baseResponseUploadinoutbill = alihealthYljgUtils.yljgUploadinoutbill(alihealthYljgUploadinoutbillReqeust,orderEntity.getFromCorp()); -// if(baseResponseUploadinoutbill.getCode() == 20000){ -// try { -// Thread.sleep(1000); - log.error("要查询阿里关联关系的码==="+set); - relCodeBatchService.addRelCodeAli(set, orderEntity.getFromCorp()); - - - -// -// } catch (InterruptedException e) { -// } - -// }else { -// log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage()); -// -// } - + log.error("要查询阿里关联关系的码===" + set); + String erpId = orderEntity.getFromCorp(); + for (String code : set) { + relCodeBatchService.addRelCodeAli(code, orderEntity.getFromCorp()); + RelCodeBatch relCodeBatch = relCodeBatchService.getOne( + new QueryWrapper().eq("curCode", code) + ); + if (Objects.isNull(relCodeBatch)) { + redisDelayedQueue.addTaskToQueue(code + "&&&" + erpId, relCodeDelaySeconds, "rel_code_queue"); + } else { + log.error("有关联关系了此码===" + code); + } + } } }); - - return ResultVOUtils.success("更新成功"); } + @Resource SpsSyncDownloadService spsSyncDownloadService; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 09c41ad7..d730fb58 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -83,6 +83,7 @@ public class RelCodeBatchService extends ServiceImpl set, String erpId){ - try { - //2.下载关联关系存到关联关系表 - for (String code : set) { - AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); - alihealthYljgSinglerelationReqeust.setCode(code); - BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); - if (baseResponse.getCode() == 20000) { - AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); - // 返回的码关联关系进行插入 - List batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId,code); - for (RelCodeBatch relCodeBatch : batchList) { - RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode()) - .last("limit 1") - ); - if (Objects.isNull(relCodeBatchOne)) { - relCodeBatch.setCreateUser(erpId); - relCodeBatch.setCreateTime(new Date()); - relCodeBatchService.save(relCodeBatch); - } else { - if(relCodeBatchOne.getOneLevelCount()!=null){ - relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() +relCodeBatch.getOneLevelCount() ); - } - if(relCodeBatchOne.getTwoLevelCount()!=null){ - relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() +relCodeBatch.getTwoLevelCount() ); - } - if(relCodeBatchOne.getThreeLevelCount()!=null){ - relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() +relCodeBatch.getThreeLevelCount() ); - } - relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); - } - relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); + // 处理阿里新增关联关系 + public void addRelCodeAli(String code, String erpId) { + //2.下载关联关系存到关联关系表 + AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); + alihealthYljgSinglerelationReqeust.setCode(code); + BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); + if (baseResponse.getCode() == 20000) { + AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); + // 返回的码关联关系进行插入 + List batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId, code); + for (RelCodeBatch relCodeBatch : batchList) { + RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode()) + .last("limit 1") + ); + if (Objects.isNull(relCodeBatchOne)) { + relCodeBatch.setCreateUser(erpId); + relCodeBatch.setCreateTime(new Date()); + relCodeBatchService.save(relCodeBatch); - Integer id = relCodeBatchOne.getId(); + } else { + if (relCodeBatchOne.getOneLevelCount() != null) { + relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() + relCodeBatch.getOneLevelCount()); + } + if (relCodeBatchOne.getTwoLevelCount() != null) { + relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() + relCodeBatch.getTwoLevelCount()); + } + if (relCodeBatchOne.getThreeLevelCount() != null) { + relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() + relCodeBatch.getThreeLevelCount()); + } + relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); + } + relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); - // 进行查询 - List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id,relCodeBatch.getCurCode()); - if (list != null && list.size() > 0) { - List curCodeList = new ArrayList(); - for (RelCodeDetail relCodeDetail : list) { - curCodeList.add(relCodeDetail.getCurCode()); - } - relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); + Integer id = relCodeBatchOne.getId(); - relCodeDetailService.saveBatch(list); - } + // 进行查询 + List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id, relCodeBatch.getCurCode()); + if (list != null && list.size() > 0) { + List curCodeList = new ArrayList(); + for (RelCodeDetail relCodeDetail : list) { + curCodeList.add(relCodeDetail.getCurCode()); } + relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); - } else { - log.error("阿里调用码关联关系失败==="+baseResponse.getMessage()); - } - RelCodeBatch relCodeBatch = relCodeBatchService.getOne( - new QueryWrapper().eq("curCode",code) - ); - if(Objects.isNull(relCodeBatch)){ - redisDelayedQueue.addTaskToQueue(code+"&&&"+erpId,relCodeDelaySeconds,"rel_code_queue"); - }else { - log.error("有关联关系了此码==="+code); + relCodeDetailService.saveBatch(list); } } - }catch (Exception E){ - E.printStackTrace(); - } - - // 父级编码 -// if(relCodeBatchList!=null && relCodeBatchList.size() >0){ -// List list = relCodeDetailService.list( -// new QueryWrapper().in("curCode",relCodeBatchList) -// ); -// if(list!=null && list.size() >0){ -// RelCodeBatch relCodeBatch =new RelCodeBatch(); -// relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); -// -// } -// } + } else { + log.error("阿里调用码关联关系失败===" + baseResponse.getMessage()); + } } diff --git a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java index c51141cf..6376ae19 100644 --- a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java +++ b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java @@ -80,74 +80,19 @@ public class AliRelCodeDetailTask implements SchedulingConfigurer { Iterator iterator = tasksToProcess.iterator(); while (iterator.hasNext()) { - Tuple task = iterator.next(); String taskId = task.getElement(); String[] codes = taskId.split("&&&"); - if (codes!=null && codes.length>0) { -// List relCodeBatchList =new ArrayList<>(); - String code = codes[0]; String erpId = codes[1]; log.error("关联关系下载任务ID===" + code); - - // 执行任务逻辑 (你可以在这里调用实际的业务逻辑) - AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); - alihealthYljgSinglerelationReqeust.setCode(code); - BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); - if (baseResponse.getCode() == 20000) { - AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); - // 返回的码关联关系进行插入 - List batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId,code); - for (RelCodeBatch relCodeBatch : batchList) { - RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode()) - .last("limit 1") - ); - if (Objects.isNull(relCodeBatchOne)) { - relCodeBatch.setCreateUser(erpId); - relCodeBatch.setCreateTime(new Date()); - relCodeBatchService.save(relCodeBatch); - - } else { - if(relCodeBatchOne.getOneLevelCount()!=null){ - relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() +relCodeBatch.getOneLevelCount() ); - } - if(relCodeBatchOne.getTwoLevelCount()!=null){ - relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() +relCodeBatch.getTwoLevelCount() ); - } - if(relCodeBatchOne.getThreeLevelCount()!=null){ - relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() +relCodeBatch.getThreeLevelCount() ); - } - relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); - } - relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); - - Integer id = relCodeBatchOne.getId(); -// relCodeBatchList.add(relCodeBatchOne.getCurCode()); - - // 进行查询 - List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id,relCodeBatch.getCurCode()); - if (list != null && list.size() > 0) { - List curCodeList = new ArrayList(); - for (RelCodeDetail relCodeDetail : list) { - curCodeList.add(relCodeDetail.getCurCode()); - } - relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); - - relCodeDetailService.saveBatch(list); - } - } - - } else { - log.error("阿里调用码关联关系失败==="+baseResponse.getMessage()); - } - + // 处理阿里关联关系 + relCodeBatchService.addRelCodeAli(code,erpId); } // 从队列中删除已执行的任务 redisDelayedQueue.getJedis().zrem("rel_code_queue", taskId); log.error("关联关系下载删除任务ID " + taskId + " removed from queue."); - } }