From 34dc1b70deae57325acca3bebb4865afdfc1f4b9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 七月 2024 10:54:45 +0800
Subject: [PATCH] 任务执行慢，日志埋点
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
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 b8f44be..3a0a9f4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4,21 +4,18 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.R;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.fasterxml.jackson.databind.ObjectMapper;
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.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.mapper.*;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CommandUtils;
-import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.Utils;
-import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -34,7 +31,6 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -91,6 +87,13 @@
@Autowired
private ApiLogService apiLogService;
+//
+// // 鍏ュ簱绔欑偣鍙峰搴旂殑鍫嗗灈鏈�
+// private static final Map<Integer,Integer> staNoToCrnMap = new HashMap<Integer,Integer>(){{
+// put(103,1); put(205,1); put(107,2); put(211,2);
+// put(111,3); put(217,3); put(115,4); put(223,4);
+// put(119,5); put(229,5); put(123,6); put(235,6);
+// }};
@Value("${wms.url}")
private String wmsUrl;
@@ -170,6 +173,10 @@
}
continue;
}
+// // 鍏ュ簱绔欑偣瀵瑰簲鍫嗗灈鏈猴紝鍒ゆ柇鍫嗗灈鏈虹姸鎬侊紝涓嶆槸鑷姩,鍏堝脊绐�,鐒跺悗continue
+// if (getCrnByStaNo(inSta.getStaNo())) {
+// continue;
+// }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -291,6 +298,12 @@
}
}
}
+//
+// private boolean getCrnByStaNo(Integer staNo) {
+// int crn = staNoToCrnMap.get(staNo);
+// BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crn));
+// return crnp.getCrnSts() == 0;
+// }
/**
@@ -357,6 +370,8 @@
} else if (taskWrk.getIoType() == 2) {
taskWrk.setWrkSts(14);
}
+ Date now = new Date();
+ taskWrk.setCompleteTime(now);
if (!taskWrkService.updateById(taskWrk)){
log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
}
@@ -464,6 +479,7 @@
log.error("杩涘叆淇敼宸ヤ綔妗ｆ祦绋�");
Date now = new Date();
taskWrk.setWrkSts(3);
+ taskWrk.setExecuteTime(now);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
@@ -586,6 +602,18 @@
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+ // 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负S鐩存帴鍑猴紝鐘舵�佷负R锛屽垯鎵惧埌杩欎釜搴撲綅鐨勫伐浣滄。锛屾彁鍗囦紭鍏堢骇鍏堝嚭
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (locMast.getLocSts().equals("R")) {
+ List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
+ if (!wrkMastList.isEmpty()) {
+ TaskWrk wrkMast = wrkMastList.get(0);
+ wrkMast.setIoPri(99);
+ taskWrkMapper.updateById(wrkMast);
+ continue;
+ }
+ }
taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
@@ -642,6 +670,7 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
+ taskWrk.setExecuteTime(now);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
@@ -833,6 +862,8 @@
} else if (taskWrk.getIoType() == 2) {
taskWrk.setWrkSts(14);
}
+ Date now = new Date();
+ taskWrk.setCompleteTime(now);
if (!taskWrkService.updateById(taskWrk)){
log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
}
--
Gitblit v1.9.1