From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 3 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 36fd10b..7965f89 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
@@ -2,36 +2,62 @@
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.redis.service.RedisLockUtils;
import com.aps.common.security.utils.SecurityUtils;
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.IApsPlateProcessShopStatService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.aps.core.domain.ApsPlanTask;
import com.aps.core.service.ApsPlanTaskService;
import com.aps.core.mapper.ApsPlanTaskMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import static com.aps.common.core.web.domain.AjaxResult.success;
+import static com.aps.core.enums.REDIS_LOCK_KEY.PLATE_ORDER_PLAN;
+
/**
* @author zhl
* @description 閽堝琛ㄣ�恆ps_plan_task(璁″垝鐢熸垚鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
* @createDate 2025-05-16 14:41:49
*/
+
+@Slf4j
@Service
public class ApsPlanTaskServiceImpl extends ServiceImpl<ApsPlanTaskMapper, ApsPlanTask> implements ApsPlanTaskService{
@Autowired
ApsPlanTaskMapper mapper;
+ @Autowired
+ private IApsPlateStandardRequireService apsPlateStandardRequireService;
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
+ @Resource
+ RedisLockUtils redisLockUtils;
+
+ @Resource
+ ApsPlateStandardRequireOrderEndDayMapper orderEndDayMapper;
+
+ @Resource
+ IApsPlateProcessShopStatService plateProcessShopStatService;
+
+ @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);
}
@@ -65,6 +91,74 @@
.build();
baseMapper.update(task,queryWrapper);
}
+
+ @Override
+ public AjaxResult generatorPlan() {
+ String plateOrderPlanKey = PLATE_ORDER_PLAN.getKey();
+ boolean existsLock = redisLockUtils.existLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
+ 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());
+ boolean existsDbTask = mapper.exists(queryWrapper);
+ if (existsDbTask) {
+ return AjaxResult.warn("閽ｉ噾宸ュ崟璁″垝浠诲姟姝ｅ湪鎵ц涓�!!");
+ }
+ String currentBatchNum = requireBatchService.getNewBatchNumber();
+ try {
+ 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());
+ this.updateTaskStatus(currentBatchNum, PLAN_TASK_STATUS.ERROR);
+ return AjaxResult.error("璁″垝浠诲姟鎵ц澶辫触!" + e.getMessage());
+ } finally {
+ redisLockUtils.releaseLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_PLAN.getCode());
+ }
+ }
+ @Override
+ public AjaxResult generatorPlatePlanTable() {
+ String plateOrderPlanKey = REDIS_LOCK_KEY.PLATE_SHOP_PLAN_TABLE.getKey();
+ boolean existsLock = redisLockUtils.existLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_SHOP_PLAN_TABLE.getCode());
+ if (existsLock) {
+ return AjaxResult.warn("閽ｉ噾璁″垝澶ц〃璁″垝浠诲姟姝ｅ湪鎵ц涓�!");
+ }
+ LambdaQueryWrapper<ApsPlanTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ApsPlanTask::getTaskType, PLAN_TASK_TYPE.PLATE_SHOP_PLAN_TABLE.getCode());
+ queryWrapper.eq(ApsPlanTask::getTaskStatus, PLAN_TASK_STATUS.IN_PROCESS.getCode());
+ boolean existsDbTask = mapper.exists(queryWrapper);
+ if (existsDbTask) {
+ return AjaxResult.warn("閽ｉ噾璁″垝澶ц〃浠诲姟姝ｅ湪鎵ц涓�!!");
+ }
+ String currentBatchNum = String.valueOf(IdUtil.getSnowflakeNextId()) ;
+ try {
+ redisLockUtils.getLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_SHOP_PLAN_TABLE.getCode(), 15 * 60L);
+ this.savePlanTask( currentBatchNum);
+ Thread.sleep(60000);
+ plateProcessShopStatService.saveShopStat();
+ this.updateTaskStatus(currentBatchNum, PLAN_TASK_STATUS.FINISHED);
+ log.info("閽ｉ噾璁″垝澶ц〃浠诲姟鎵ц瀹屾垚!" + currentBatchNum);
+ return success();
+ } catch (Exception e) {
+ redisLockUtils.releaseLock(plateOrderPlanKey, PLAN_TASK_TYPE.PLATE_SHOP_PLAN_TABLE.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_SHOP_PLAN_TABLE.getCode());
+ }
+ }
+
}
--
Gitblit v1.9.3