From 6ee5f8a9a8cbec6bfe559debfc08ad4b8035add5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 14:11:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/FireHeartScheduler.java | 2 +-
src/main/resources/mapper/LocMastMapper.xml | 4 ++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 48 +++---------------------------------------------
3 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/FireHeartScheduler.java b/src/main/java/com/zy/asrs/task/FireHeartScheduler.java
index 1c1e043..857844d 100644
--- a/src/main/java/com/zy/asrs/task/FireHeartScheduler.java
+++ b/src/main/java/com/zy/asrs/task/FireHeartScheduler.java
@@ -22,7 +22,7 @@
*/
@Scheduled(cron = "0/60 * * * * ? ")
private void execute() {
- if (confirmDeep) return;
+ if (!confirmDeep) return;
ReturnT<String> result = fireHeartHandler.start();
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 2b9f511..b93bd99 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -69,7 +70,7 @@
combParam.setLocNo(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,combParam);
+// result = new PostMesDataUtils().postMesData(inpath,combParam);
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (pakin!=null){
@@ -90,7 +91,7 @@
combParam.setLocNo(wrkMast.getSourceLocNo());
// combParam.setPackSts(0);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(outPath,combParam);
+// result = new PostMesDataUtils().postMesData(outPath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -125,47 +126,4 @@
}
return SUCCESS;
}
-
- /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
-
- private ReturnT<String> postMesData(String mesPath,Object combParam){
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(mesUrl)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "涓婃姤mes绯荤粺",
- mesUrl + mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
- }
- return SUCCESS;
- }
- /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 5749de9..1750d38 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -70,7 +70,7 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
- <if test="locType2 != null and locType != 0">
+ <if test="locType2 != null and locType2 != 0">
and loc_type2 = #{locType2}
</if>
<if test="locType1 != null">
@@ -79,7 +79,7 @@
order by lev1 asc,bay1 asc
</select>
- <select id="queryFreeLocMastCount" resultMap="BaseResultMap">
+ <select id="queryFreeLocMastCount" resultType="int">
select count(1)
from asr_loc_mast
where row1=#{row}
--
Gitblit v1.9.1