diff --git a/pom.xml b/pom.xml index 1aa2192b..91bd0e55 100644 --- a/pom.xml +++ b/pom.xml @@ -386,6 +386,11 @@ easyexcel 2.2.10 + + redis.clients + jedis + 4.2.3 + 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 12cd0db3..c5045f50 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -135,7 +135,7 @@ public class IoOrderReviewController extends BaseController { @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, BindingResult bindingResult) { - + log.error("单据审核进来了==="+updateExportStatusRequest); if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -145,9 +145,13 @@ public class IoOrderReviewController extends BaseController { } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { BaseResponse baseResponse = updateReview(getUser(), orderEntity); + log.error("单据审核进来了===orderEntity===="+orderEntity); + if(baseResponse.getCode() == 20000) { //todo 审核通过上传关联关系 BasicBussinessTypeEntity businessType = basicBussinessTypeService.findByAction(orderEntity.getAction()); + log.error("单据审核进来了===businessType===="+businessType); + if (businessType.getCorpType() == ConstantStatus.CORP_SP && businessType.getMainAction().equals(ConstantType.TYPE_PUT) && businessType.getProductType() == 2) { aliBillsDispose(orderEntity); } @@ -482,15 +486,16 @@ public class IoOrderReviewController extends BaseController { alihealthYljgUploadinoutbillReqeust.setTrace_codes( String.join(",", codeList)); BaseResponse baseResponseUploadinoutbill = alihealthYljgUtils.yljgUploadinoutbill(alihealthYljgUploadinoutbillReqeust,orderEntity.getFromCorp()); // if(baseResponseUploadinoutbill.getCode() == 20000){ - try { - Thread.sleep(1000); +// try { +// Thread.sleep(1000); + log.error("要查询阿里关联关系的码==="+set); relCodeBatchService.addRelCodeAli(set, orderEntity.getFromCorp()); - - } catch (InterruptedException e) { - } +// +// } catch (InterruptedException e) { +// } // }else { // log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage()); diff --git a/src/main/java/com/glxp/api/controller/test/TestCodeController.java b/src/main/java/com/glxp/api/controller/test/TestCodeController.java index 8cd3ddf1..a63e1624 100644 --- a/src/main/java/com/glxp/api/controller/test/TestCodeController.java +++ b/src/main/java/com/glxp/api/controller/test/TestCodeController.java @@ -30,10 +30,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; @RestController public class TestCodeController { @@ -159,11 +157,15 @@ public class TestCodeController { public BaseResponse> test3() { AlihealthYljgListupoutReqeust alihealthYljgListupoutReqeust1 = new AlihealthYljgListupoutReqeust(); - alihealthYljgListupoutReqeust1.setBegin_date("2019-01-01"); - alihealthYljgListupoutReqeust1.setEnd_date("2024-05-01"); + alihealthYljgListupoutReqeust1.setBegin_date("2024-10-01"); + alihealthYljgListupoutReqeust1.setEnd_date("2025-01-16"); alihealthYljgListupoutReqeust1.setPage(1); - alihealthYljgListupoutReqeust1.setPage_size(20); - return alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, "72890663819159"); + alihealthYljgListupoutReqeust1.setPage_size(1000); + BaseResponse> baseResponse = alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1,null); + Map> groupedStudents = baseResponse.getData().stream() + .collect(Collectors.groupingBy(AliYljgSearchbill::getFromEntName)); + + return ResultVOUtils.success(groupedStudents.keySet()); } @PostMapping("/test4") diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 6538f99b..63117c41 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -290,5 +290,4 @@ public class IoOrderEntity { */ @TableField(value = "ycBillNo") private String ycBillNo; - } 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 a6adf340..d130e2e1 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -49,6 +49,7 @@ import com.glxp.api.util.HttpClient; import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; +import com.glxp.api.util.redis.RedisDelayedQueue; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -701,11 +702,16 @@ public class RelCodeBatchService extends ServiceImpl set, String erpId){ try { - List relCodeBatchList =new ArrayList<>(); //2.下载关联关系存到关联关系表 for (String code : set) { AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); @@ -736,10 +742,9 @@ public class RelCodeBatchService extends ServiceImpl().eq("curCode", relCodeBatch.getCurCode())); } - relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); + relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); - Integer id = relCodeBatchOne.getId(); - relCodeBatchList.add(relCodeBatchOne.getCurCode()); + Integer id = relCodeBatchOne.getId(); // 进行查询 List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id,relCodeBatch.getCurCode()); @@ -757,6 +762,14 @@ public class RelCodeBatchService extends ServiceImpl().eq("curCode",code) + ); + if(Objects.isNull(relCodeBatch)){ + redisDelayedQueue.addTaskToQueue(code+"&&&"+erpId,relCodeDelaySeconds); + }else { + log.error("有关联关系了此码==="+code); + } } }catch (Exception E){ E.printStackTrace(); diff --git a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java new file mode 100644 index 00000000..c51141cf --- /dev/null +++ b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java @@ -0,0 +1,154 @@ +package com.glxp.api.task; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.collect.RelCodeBatch; +import com.glxp.api.entity.collect.RelCodeDetail; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; +import com.glxp.api.req.system.ScheduledRequest; +import com.glxp.api.res.alihealth.AlihealthYljgSinglerelationResponse; +import com.glxp.api.service.collect.RelCodeBatchService; +import com.glxp.api.service.collect.RelCodeDetailService; +import com.glxp.api.util.CacheUtils; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.RedisUtil; +import com.glxp.api.util.alihealth.AlihealthYljgUtils; +import com.glxp.api.util.redis.RedisDelayedQueue; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.SchedulingConfigurer; +import org.springframework.scheduling.config.ScheduledTaskRegistrar; +import org.springframework.scheduling.support.CronTrigger; +import org.springframework.stereotype.Component; +import redis.clients.jedis.resps.Tuple; + +import javax.annotation.Resource; +import java.util.*; + +@Component +@EnableScheduling +@Slf4j +public class AliRelCodeDetailTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(AsyncDiDlTask.class); + @Resource + AsyncCompanyDlHelper udiCompanyTask; + @Resource + RedisUtil redisUtil; + + @Resource + private ScheduledDao scheduledDao; + @Resource + private RedisDelayedQueue redisDelayedQueue; + @Resource + private AlihealthYljgUtils alihealthYljgUtils; + @Resource + private RelCodeBatchService relCodeBatchService; + @Resource + private RelCodeDetailService relCodeDetailService; + + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("aliRelCodeDetailTask"); + ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); + if (scheduledEntity == null) { + return null; + } + String cron = scheduledEntity.getCron(); + if (cron.isEmpty()) { + logger.error("cron is null"); + } + return new CronTrigger(cron).nextExecutionTime(triggerContext); + }); + } + + private void process() { + + long currentTimestamp = System.currentTimeMillis() / 1000; // 当前时间戳（秒） + + // 获取所有超时的任务 (score <= 当前时间戳) + List tasksToProcess = redisDelayedQueue.getJedis().zrangeByScoreWithScores("rel_code_queue", "-inf", String.valueOf(currentTimestamp)); + + 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()); + } + + } + // 从队列中删除已执行的任务 + redisDelayedQueue.getJedis().zrem("rel_code_queue", taskId); + log.error("关联关系下载删除任务ID " + taskId + " removed from queue."); + + } + } + +} diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java index 93824987..8c3484f6 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java @@ -20,7 +20,9 @@ import com.glxp.api.res.alihealth.*; import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.collect.RelCodeBatchService; import com.glxp.api.service.collect.RelCodeDetailService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jfree.util.Log; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -29,6 +31,7 @@ import java.util.List; import java.util.Map; @Component +@Slf4j public class AlihealthYljgUtils { @Resource private CustomerInfoService customerInfoService; @@ -138,7 +141,9 @@ public class AlihealthYljgUtils { try { Map map = alihealthUtils.disposeSign(reqeust, authCompany.getAppSecret()); + log.error("阿里啦关联关系入参==="+map); String json = HttpUtil.get(alihealthUrl, map); + log.error("阿里啦关联关系结果==="+json); alihealthYljgSinglerelationResponse = new AlihealthYljgSinglerelationResponse(json); } catch (Exception e) { diff --git a/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java new file mode 100644 index 00000000..3f57548d --- /dev/null +++ b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java @@ -0,0 +1,72 @@ +package com.glxp.api.util.redis; + +import org.springframework.stereotype.Component; +import redis.clients.jedis.Jedis; + +import java.util.List; +import java.util.Set; +import java.util.Iterator; +import java.util.concurrent.TimeUnit; +import redis.clients.jedis.resps.Tuple; +@Component +public class RedisDelayedQueue { + + private Jedis jedis = new Jedis("localhost", 6379); // Redis连接 + + + // 将任务加入延时队列 + public void addTaskToQueue(String taskId, long delaySeconds) { + long timestamp = System.currentTimeMillis() / 1000 + delaySeconds; // 计算任务执行的时间戳 + jedis.zadd("rel_code_queue", timestamp, taskId); // 将任务添加到有序集合，score 为任务的执行时间戳 + System.out.println("Task " + taskId + " added to queue with " + delaySeconds + " seconds delay."); + } + + public Jedis getJedis() { + jedis.select(10); + return jedis; + } + + // 获取并处理超时的任务 + public void processTasks() { + long currentTimestamp = System.currentTimeMillis() / 1000; // 当前时间戳（秒） + + // 获取所有超时的任务 (score <= 当前时间戳) + List tasksToProcess = jedis.zrangeByScoreWithScores("delay_queue", "-inf", String.valueOf(currentTimestamp)); + + Iterator iterator = tasksToProcess.iterator(); + while (iterator.hasNext()) { + Tuple task = iterator.next(); + String taskId = task.getElement(); + System.out.println("Processing task " + taskId); + + // 执行任务逻辑 (你可以在这里调用实际的业务逻辑) + + // 从队列中删除已执行的任务 + jedis.zrem("delay_queue", taskId); + System.out.println("Task " + taskId + " removed from queue."); + } + } + + // 定期检查并处理任务 +// public static void startTaskProcessor() { +// while (true) { +// try { +// // 每隔1秒检查一次队列 +// TimeUnit.SECONDS.sleep(1); +// processTasks(); // 处理超时的任务 +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// } +// } +// public static void main(String[] args) { +// // 添加任务到延时队列 +// addTaskToQueue("task1", 60); // 任务 1 延迟 5 秒执行 +// startTaskProcessor(); +// System.out.println("123"); +// return; +// // 启动任务处理器，定期检查队列 +// } + + +}