From 771fc6353fe9ef5e9f1095de75f29210adfe3751 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 15:26:40 +0800
Subject: [PATCH] 管路&气柜产能负载对返回结果集进行排序
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
index 383f5f6..d00d0af 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java
@@ -9,8 +9,10 @@
import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.enums.PLAN_TASK_TYPE;
import com.aps.core.enums.REDIS_LOCK_KEY;
+import com.aps.core.mapper.ApsPlateStandardRequireOrderEndDayMapper;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
+import com.aps.core.service.ApsPlateStandardRequireOrderEndDayService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,10 +48,13 @@
@Resource
RedisLockUtils redisLockUtils;
+ @Resource
+ ApsPlateStandardRequireOrderEndDayMapper orderEndDayMapper;
+
@Override
public Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page ,ApsPlanTask task){
LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>();
- queryWrapper.like( !task.getTaskType().isEmpty(), ApsPlanTask::getTaskType,task.getTaskType());
+ queryWrapper.like( null!=task.getTaskType(), ApsPlanTask::getTaskType,task.getTaskType());
return mapper.selectPage(page, queryWrapper);
}
@@ -85,34 +90,37 @@
}
@Override
- public AjaxResult generatorPlan()
- {
+ public AjaxResult generatorPlan() {
String plateOrderPlanKey = PLATE_ORDER_PLAN.getKey();
boolean existsLock = redisLockUtils.existLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
- if (existsLock){
+ if (existsLock) {
return AjaxResult.warn("閽ｉ噾宸ュ崟璁″垝浠诲姟姝ｅ湪鎵ц涓�!");
}
- LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>();
- queryWrapper.eq(ApsPlanTask::getTaskType,PLAN_TASK_TYPE.PLATE_PLAN.getCode());
- queryWrapper.eq(ApsPlanTask::getTaskStatus,PLAN_TASK_STATUS.IN_PROCESS.getCode());
+ LambdaQueryWrapper<ApsPlanTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ApsPlanTask::getTaskType, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
+ queryWrapper.eq(ApsPlanTask::getTaskStatus, PLAN_TASK_STATUS.IN_PROCESS.getCode());
boolean existsDbTask = mapper.exists(queryWrapper);
- if (existsDbTask){
+ if (existsDbTask) {
return AjaxResult.warn("閽ｉ噾宸ュ崟璁″垝浠诲姟姝ｅ湪鎵ц涓�!!");
}
+ String currentBatchNum = requireBatchService.getNewBatchNumber();
try {
- redisLockUtils.getLock(plateOrderPlanKey,PLAN_TASK_TYPE.PLATE_PLAN.getCode(), 3*60L);
- String batchNum= requireBatchService.getNewBatchNumber();
- this.savePlanTask(batchNum);
- apsPlateStandardRequireService.generatorPlan(batchNum);
- this.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
- log.info("璁″垝浠诲姟鎵ц瀹屾垚!"+batchNum);
+ redisLockUtils.getLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode(), 15 * 60L);
+ this.savePlanTask(currentBatchNum);
+ //Thread.sleep(60*1000);
+ apsPlateStandardRequireService.generatorPlan(currentBatchNum);
+ /*娓呴櫎宸茬粡瀛樺湪鐨� 宸ュ崟璁″垝瀹屽伐鏃堕棿*/
+ orderEndDayMapper.batchRemove();
+ this.updateTaskStatus(currentBatchNum, PLAN_TASK_STATUS.FINISHED);
+ log.info("璁″垝浠诲姟鎵ц瀹屾垚!" + currentBatchNum);
return success();
- }catch (Exception e){
- redisLockUtils.releaseLock(plateOrderPlanKey,PLAN_TASK_TYPE.PLATE_PLAN.getCode());
- log.error("璁″垝浠诲姟鎵ц澶辫触!"+e.getMessage());
- return AjaxResult.error("璁″垝浠诲姟鎵ц澶辫触!"+e.getMessage());
- }finally {
- redisLockUtils.releaseLock(plateOrderPlanKey,PLAN_TASK_TYPE.PLATE_PLAN.getCode());
+ } catch (Exception e) {
+ redisLockUtils.releaseLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
+ log.error("璁″垝浠诲姟鎵ц澶辫触!" + e.getMessage());
+ this.updateTaskStatus(currentBatchNum, PLAN_TASK_STATUS.ERROR);
+ return AjaxResult.error("璁″垝浠诲姟鎵ц澶辫触!" + e.getMessage());
+ } finally {
+ redisLockUtils.releaseLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
}
}
--
Gitblit v1.9.3