From 4bcccb320474ec651a603c211afb98f0474258b3 Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期六, 21 六月 2025 16:12:26 +0800 Subject: [PATCH] sql问题修复 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java index f86ad18..2c7cc86 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java @@ -48,6 +48,13 @@ @Autowired private WaveService waveService; + + /** + * @author Ryan + * @date 2025/6/20 + * @description: 鍏ュ簱浠诲姟宸插畬鎴� + * @version 1.0 + */ @Scheduled(cron = "0/15 * * * * ? ") @Transactional(rollbackFor = Exception.class) public void inExecute() { @@ -158,6 +165,13 @@ } } + + /** + * @author Ryan + * @date 2025/6/20 + * @description: 鍑哄簱浠诲姟瀹屾垚 + * @version 1.0 + */ @Scheduled(cron = "0/10 * * * * ? ") @Transactional(rollbackFor = Exception.class) public void outExecute() { @@ -166,48 +180,41 @@ //鑾峰彇鍑哄簱瀹屾垚浠诲姟 List<Task> list = taskService.list(new LambdaQueryWrapper<Task>() .eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id) - .in(Task::getTaskType, 101, 53, 57)); + .ge(Task::getTaskType, 101)); if (list.isEmpty()) { return; } - Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1)); - if (dict == null) { - return; - } +// Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1)); +// if (dict == null) { +// return; +// } for (Task task : list) { - int diff = DateUtils.diff(task.getCreateTime(), new Date()); - int taskLogDiffDays = Integer.parseInt(dict.getValue()); - if (diff < taskLogDiffDays) { - continue; - } - +// int diff = DateUtils.diff(task.getCreateTime(), new Date()); +// int taskLogDiffDays = Integer.parseInt(dict.getValue()); +// if (diff < taskLogDiffDays) { +// continue; +// } Long hostId = task.getHostId(); - //淇濆瓨浠诲姟鏄庣粏鍘嗗彶妗� List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId()); if (taskDetls.isEmpty()) { throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�"); } - boolean flag = false; for (TaskDetl taskDetl : taskDetls) { if (taskDetl.getWaveId() == null) { continue; } - Wave wave = waveService.getById(taskDetl.getWaveId()); if (wave != null) { flag = true;//娉㈡鏈畬鎴� break; } } - if (flag) { continue; } - - //淇濆瓨浠诲姟鍘嗗彶妗� TaskLog taskLog = new TaskLog(); taskLog.sync(task); -- Gitblit v1.9.1