From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 7 +++++--
src/main/java/com/zy/common/utils/NyHttpUtils.java | 10 ++++------
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 2 +-
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 2 +-
src/main/resources/application.yml | 4 ++--
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index 93f79c3..932b977 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -13,5 +13,5 @@
public interface AgvBasDevpMapper extends BaseMapper<AgvBasDevp> {
@Update("update agv_bas_devp set barcode = #{barcode} where dev_no = #{devNo}")
- public void updateBarcode(@Param("devNo") String devNo, @Param("barcode") String barcode);
+ int updateBarcode(@Param("devNo") String devNo, @Param("barcode") String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index 72d2777..4e6b582 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -8,6 +8,6 @@
public interface AgvBasDevpService extends IService<AgvBasDevp> {
- void updateBarcode(String devNo, String barcode);
+ int updateBarcode(String devNo, String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 73151db..1cefa6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -10,7 +10,7 @@
public class AgvBasDevpServiceImpl extends ServiceImpl<AgvBasDevpMapper, AgvBasDevp> implements AgvBasDevpService {
@Override
- public void updateBarcode(String devNo, String barcode) {
- this.baseMapper.updateBarcode(devNo,barcode);
+ public int updateBarcode(String devNo, String barcode) {
+ return this.baseMapper.updateBarcode(devNo,barcode);
}
}
diff --git a/src/main/java/com/zy/common/utils/NyHttpUtils.java b/src/main/java/com/zy/common/utils/NyHttpUtils.java
index 40a7436..5727eed 100644
--- a/src/main/java/com/zy/common/utils/NyHttpUtils.java
+++ b/src/main/java/com/zy/common/utils/NyHttpUtils.java
@@ -315,17 +315,15 @@
// 璇诲彇鏈嶅姟鍣ㄧ殑鍝嶅簲
StringBuffer sb = new StringBuffer();
- String response = null;
char[] chars = new char[2048];//缂撳啿鍖�
- do {
+ while (true) {
reader.read(chars);
- String trim = new String(chars).trim();
+ String trim = new String(chars);
sb.append(trim);
- if (sb.lastIndexOf("\r\n") != -1) {
+ if (trim.lastIndexOf("\r\n") != -1) {
break;
}
- } while (response != null);
-// System.out.println("Received response from server: " + sb);
+ }
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
if (!result.get("msgType").equals("responseMsg")) {//涓嶆槸鍝嶅簲鍐呭
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 60c83c6..4776474 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -56,7 +56,10 @@
String devNo = slave.getId() == 13 ? "310-1" : slave.getId() == 15 ? "312-2" : slave.getId() == 17 ? "314-1" : slave.getId() == 19 ? "316-1" : null;
if(!Cools.isEmpty(devNo)){
barcode = barcode.substring(3,barcode.length());
- agvBasDevpService.updateBarcode(devNo,barcode);
+ int updateBarcode = agvBasDevpService.updateBarcode(devNo, barcode);
+ if (updateBarcode <= 0) {
+ News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}锛屾洿鏂扮珯鐐规潯鐮佸け璐�", slave.getId(), this.barcode);
+ }
}
News.info("{}鍙锋潯鐮佸櫒锛屾洿鏂版垚鍔�", slave.getId());
JSONObject jsonObject = new JSONObject();
@@ -77,7 +80,7 @@
close(); //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
socket = new Socket();
SocketAddress socketAddress = new InetSocketAddress(slave.getIp(), slave.getPort());
- socket.connect(socketAddress, 1000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
+ socket.connect(socketAddress, 10000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataInputStream = new DataInputStream(socket.getInputStream());
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8b95d92..44f9bb4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -396,7 +396,7 @@
id: 11
ip: 10.10.10.225
port: 2002
- # 鏉＄爜鎵弿浠�
+ # 鏉＄爜鎵弿浠�310
barcode[11]:
id: 12
ip: 10.10.10.224
@@ -434,7 +434,7 @@
# 鏉＄爜鎵弿浠�
barcode[18]:
id: 19
- ip: 10.10.10.171
+ ip: 10.10.10.235
port: 2002
# 鏉＄爜鎵弿浠�
barcode[19]:
--
Gitblit v1.9.1