From 1bde682d9149b5b55488cfaa277ec1deacab4bee Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 30 四月 2025 08:57:11 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 3 ++- src/main/java/com/zy/core/thread/RgvThread.java | 10 ++++++++++ src/main/java/com/zy/asrs/entity/TaskWrk.java | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +- src/main/java/com/zy/asrs/controller/TaskWrkController.java | 6 +++--- src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 6 +++--- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 3df677d..7a58fad 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -87,9 +87,9 @@ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit); - Page<TaskWrk> page1 = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList); - page1.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); - return R.ok(page1); + Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList); + page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); + return R.ok(page); // return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper)); } catch (Exception e) { diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java index b705e4e..5d01b7f 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java @@ -59,9 +59,9 @@ } } List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit); - Page<TaskWrkLog> page1 = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList); - page1.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); - return R.ok(page1); + Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList); + page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); + return R.ok(page); } catch (Exception e) { return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage()); diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java index a42dea1..38d98da 100644 --- a/src/main/java/com/zy/asrs/entity/TaskWrk.java +++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java @@ -50,7 +50,7 @@ /** * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 */ - @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ") + @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 9锛氱瓑寰呭皬杞︽惉杩�") @TableField("STATUS") private Integer status; diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 6eccd41..fa6d1e3 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -605,7 +605,7 @@ if (offer) { log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk)); Date now = new Date(); - taskWrk.setStatus(5); + taskWrk.setStatus(9); taskWrk.setWrkSts(14); taskWrk.setModiTime(now); taskWrk.setCompleteTime(now); diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index be9bc8b..aa32429 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -54,7 +54,8 @@ @Scheduled(cron = "0/3 * * * * ? ") public void execute() throws IOException { - for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) { + List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData(); + for (TaskWrk taskWrk : taskWrkList) { JSONObject jsonObject = null; String response = null; boolean success = false; diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java index db77cf4..f8cc43d 100644 --- a/src/main/java/com/zy/core/thread/RgvThread.java +++ b/src/main/java/com/zy/core/thread/RgvThread.java @@ -81,6 +81,9 @@ // 鍚姩婕父绾跨▼ new Thread(this::taskWalkIssued).start(); + + // 鍚姩浠诲姟瀹屾垚绾跨▼ + new Thread(this::taskComplete).start(); } } @@ -102,6 +105,13 @@ } /** + * 瀹屾垚 + */ + private void taskComplete() { + + } + + /** * 婕父 */ private void taskWalkIssued() { -- Gitblit v1.9.1