From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 105 ++++++++++++++--------------------------------------
1 files changed, 28 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 30ce97c..cf1083a 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,28 +1,19 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -33,76 +24,36 @@
@Autowired
private TaskWrkService taskWrkService;
- @Autowired
- private CommandInfoService commandInfoService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocMastService locMastService;
@Autowired
private TaskWrkLogServiceImpl wrkLogService;
- @Value("${wms.url}")
- 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 {
+ @Autowired
+ private TaskWrkReportService taskWrkReportService;
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public synchronized void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- 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);
+ switch (taskWrk.getStatus()) {
+ case 4:
+ break;
+ case 5:
+ break;
}
- 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);
-
- if(jsonObject.get("ReturnStatus").equals(0)){
- TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
- if(!wrkLogService.insert(taskWrkLog)){
- throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
- }
- if(!taskWrkService.deleteById(taskWrk)){
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+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
- );
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ TaskWrkLog taskWrkLog = new TaskWrkLog();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ Synchro.Copy(taskWrk, taskWrkLog);
+ if (!taskWrkReportService.insert(taskWrkReport)) {
+ throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
+ }
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrk);
}
}
}
--
Gitblit v1.9.1