From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 29f7382..eccf1ac 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -22,6 +23,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -80,21 +82,21 @@
taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
Date now = new Date();
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("K");//O.绌哄簱浣�
- locMast.setBarcode("");//鎵樼洏鐮�
- locMast.setModiTime(now);
- locMast.setModiUser(9999L);
- locMastService.updateById(locMast);
-
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast2.setLocSts("Z");//F.鍦ㄥ簱
- locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast2.setModiTime(now);
- locMast2.setModiUser(9999L);
- locMastService.updateById(locMast2);
+// //鏇存柊搴撲綅鐘舵��
+// LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+// locMast.setLocSts("K");//O.绌哄簱浣�
+// locMast.setBarcode("");//鎵樼洏鐮�
+// locMast.setModiTime(now);
+// locMast.setModiUser(9999L);
+// locMastService.updateById(locMast);
+//
+// //鏇存柊搴撲綅鐘舵��
+// LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+// locMast2.setLocSts("Z");//F.鍦ㄥ簱
+// locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+// locMast2.setModiTime(now);
+// locMast2.setModiUser(9999L);
+// locMastService.updateById(locMast2);
}
taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
@@ -105,23 +107,29 @@
.setUri(wmsUrl)
.setPath("wcsManager/wcsInterface/taskStatusFeedback")
.setJson(JSON.toJSONString(taskOverToWms))
+ .setTimeout(60, TimeUnit.SECONDS)
.build()
.doPost();
}catch (Exception e){
+ log.error("wms浠诲姟瀹屾垚璇锋眰鍑洪敊"+e.getMessage());
continue;
}
-
+ if (Cools.isEmpty(response)){
+ log.error("wms浠诲姟瀹屾垚锛岃姹備綋锛�"+JSON.toJSONString(taskOverToWms)+"杩斿洖鍊间负:"+response);
+ }
JSONObject jsonObject = JSON.parseObject(response);
+
+ apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+ ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(taskOverToWms)
+ ,response
+ ,true
+ );
if (jsonObject.getInteger("code").equals(200)){
- apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
- ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(taskOverToWms)
- ,response
- ,true
- );
+
}else {
continue;
}
@@ -202,7 +210,7 @@
}catch (Exception e){
log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
}
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+// ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback"
,null
@@ -231,6 +239,15 @@
}
}
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void clearApiLog(){
+ try {
+ apiLogService.clearWeekBefore();
+ } catch (Exception e) {
+ log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
+ }
+ }
+
}
--
Gitblit v1.9.1