From 50220e6ba77137b0601248b3a739a2c5495bd520 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 五月 2025 18:53:41 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/java/com/zy/common/utils/HttpHandler.java | 2 +-
src/main/resources/application-prod.yml | 8 ++++----
src/main/resources/license.lic | 0
4 files changed, 10 insertions(+), 10 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 84b443d..6445cd3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -111,7 +111,7 @@
private SiteController siteController;
- public void generateStoreWrkFile1() throws IOException, InterruptedException {
+ public synchronized void generateStoreWrkFile1() throws IOException, InterruptedException {
String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
@@ -720,13 +720,13 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
//鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
- if (locMast.getRow1() == 1 || locMast.getRow1() == 5) {
+ if (locMast.getRow1() == 1 || locMast.getRow1() == 5|| locMast.getRow1() == 9|| locMast.getRow1() == 13) {
LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", (locMast.getRow1() + 1)).eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast1)) {
log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
continue;
}
- } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8) {
+ } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8|| locMast.getRow1() == 12|| locMast.getRow1() == 16) {
LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", (locMast.getRow1() - 1)).eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast1)) {
log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
@@ -1368,9 +1368,9 @@
taskWrk.setStartPoint("15");
if (result.getAlley().equals("1")) {
taskWrk.setCrnNo(1);
- } else {
+ } else if (result.getAlley().equals("2")) {
taskWrk.setCrnNo(2);
- }
+ } else if (result.getAlley().equals("3")) {taskWrk.setCrnNo(3);}else if (result.getAlley().equals("4")) {taskWrk.setCrnNo(4);}
if (taskWrk.getIoType() == 1) {
taskWrk.setWrkSts(2);
if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index 804d9e9..2c1f611 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -15,7 +15,7 @@
*/
public class HttpHandler {
- private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
+ private static final Integer DEFAULT_TIMEOUT_SECONDS = 20;
private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");
private String uri;
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 1fa7b31..bcbe85f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1101
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -29,7 +29,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.1201
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -53,7 +53,7 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.1301
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -77,7 +77,7 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.1401
+ ip: 10.10.10.140
port: 102
rack: 0
slot: 0
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index e4e7c87..a646318 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1