From d2b000d74d23f5c70e9f1414b57cab892c2b6eec Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期五, 28 三月 2025 15:07:34 +0800 Subject: [PATCH] #输送线暂存数优化 --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index 8463ff2..1e53034 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -51,12 +51,36 @@ private String wmsUrl; @Value("${wms.movePath}") private String movePath; + @Value("${wms.inboundTaskApplyPath}") + private String inboundTaskApplyPath; + @Value("${wms.TaskExecCallback}") + private String TaskExecCallback; + @Value("${wms.taskStatusFeedbackPath}") + private String taskStatusFeedbackPath; @Scheduled(cron = "0/3 * * * * ? ") public void execute() throws IOException { + for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) { - if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚 - //鍖哄垎鍏ュ嚭搴� + HashMap<String, Object> headParam = new HashMap<>(); + if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚 + headParam.put("Result", 1); + } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) { + headParam.put("Result", 2); + } + String response = ""; + Boolean bool = false; + try { + headParam.put("TaskNo", taskWrk.getTaskNo()); + log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk); + response = new HttpHandler.Builder() + // .setHeaders(headParam) + .setUri(wmsUrl) + .setPath(TaskExecCallback) + .setJson(JSON.toJSONString(headParam)) + .build() + .doPost(); + JSONObject jsonObject = JSON.parseObject(response); TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk); if (!wrkLogService.insert(taskWrkLog)) { throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog); @@ -64,16 +88,19 @@ if (!taskWrkService.deleteById(taskWrk)) { throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog); } - } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) { - TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk); - if(!wrkLogService.insert(taskWrkLog)){ - throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog); - } - if(!taskWrkService.deleteById(taskWrk)){ - throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog); - } + bool = true; + } catch (Exception e) { + log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response); + } finally { + apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms" + , wmsUrl + TaskExecCallback + , null + , "127.0.0.1" + , JSON.toJSONString(headParam) + , response + , bool + ); } - } } -- Gitblit v1.9.1