From 16b32f4511aa90b95b13a15751850cf6db0829e2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 22 五月 2025 17:02:22 +0800
Subject: [PATCH] 修改最新API地址
---
MengJiaLaMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/RotatingRackServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/MengJiaLaMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/RotatingRackServiceImpl.java b/MengJiaLaMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/RotatingRackServiceImpl.java
index 56ccd8c..b7453e0 100644
--- a/MengJiaLaMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/RotatingRackServiceImpl.java
+++ b/MengJiaLaMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/RotatingRackServiceImpl.java
@@ -28,7 +28,7 @@
public class RotatingRackServiceImpl extends ServiceImpl<RotatingRackMapper, RotatingRack> implements RotatingRackService {
private static final Logger log = LoggerFactory.getLogger(RotatingRackServiceImpl.class);
- private static final String BASE_API_URL = "http://172.17.58.75/api/Robot";
+ private static final String BASE_API_URL = "http://10.3.58.110/api/Robot";
@Autowired
private RotatingRackMapper rotatingRackMapper;
@@ -289,19 +289,17 @@
if (!erpSendSuccess) {
// ERP鍙戦�佸け璐ワ紝淇濆瓨鍒版湰鍦版暟鎹簱锛屽苟鏍囪涓哄彂閫佸け璐�
- log.warn("鍙戦�佹暟鎹埌ERP澶辫触锛屼换鍔℃暟鎹皢淇濆瓨鍒版湰鍦版暟鎹簱銆備换鍔D: {}", rotatingRack.getId());
+ log.warn("鍙戦�佹暟鎹埌ERP澶辫触锛屼换鍔℃暟鎹繚瀛樺埌鏁版嵁搴撱�備换鍔D: {}", rotatingRack.getId());
rotatingRack.setErpSentStatus(2); // 鏍囪涓哄彂閫佸け璐�
rotatingRackMapper.insert(rotatingRack);
return false;
}
- // 鍙戦�佹垚鍔燂紝鏍囪涓哄凡鍙戦��
- rotatingRack.setErpSentStatus(1);
- rotatingRackMapper.insert(rotatingRack);
+ // 鍙戦�佹垚鍔燂紝鐩存帴杩斿洖true锛屼笉淇濆瓨鍒版暟鎹簱
return true;
} catch (Exception e) {
log.error("瀹屾垚浠诲姟澶勭悊澶辫触: {}", e.getMessage(), e);
- // 鍙戠敓寮傚父鏃朵篃淇濆瓨鍒版湰鍦版暟鎹簱
+ // 鍙戠敓寮傚父鏃朵繚瀛樺埌鏈湴鏁版嵁搴�
try {
rotatingRack.setErpSentStatus(2); // 鏍囪涓哄彂閫佸け璐�
rotatingRackMapper.insert(rotatingRack);
@@ -321,8 +319,8 @@
private boolean sendToERP(Map<String, Object> data) {
try {
// 璁剧疆API鍦板潃
- String erpUrl = "http://172.17.58.75/api/Robot/Insert";
- // String erpUrl = "https://0f1b83b5-7a9b-4ac7-9ca0-fcda13725a04.mock.pstmn.io/sendData";
+ String erpUrl = "http://10.3.58.110/api/Robot/Insert";
+
// 浣跨敤ObjectMapper鎵嬪姩搴忓垪鍖朖SON
ObjectMapper objectMapper = new ObjectMapper();
@@ -336,14 +334,14 @@
HttpEntity<String> requestEntity = new HttpEntity<>(jsonData, headers);
// 璁板綍鍙戦�佺殑鏁版嵁锛屽府鍔╄皟璇�
- log.info("鍑嗗鍙戦�佹暟鎹埌ERP: {}", jsonData);
+ //log.info("鍑嗗鍙戦�佹暟鎹埌ERP: {}", jsonData);
// 鍙戦�丳OST璇锋眰
ResponseEntity<String> response = restTemplate.postForEntity(erpUrl, requestEntity, String.class);
// 妫�鏌ュ搷搴旂姸鎬佺爜
if (response.getStatusCode() == HttpStatus.OK) {
- log.info("鏁版嵁鎴愬姛鍙戦�佸埌ERP锛屽搷搴斿唴瀹癸細{}", response.getBody());
+ //log.info("鏁版嵁鎴愬姛鍙戦�佸埌ERP锛屽搷搴斿唴瀹癸細{}", response.getBody());
return true;
} else {
log.error("ERP鎺ュ彛杩斿洖闈炴垚鍔熺姸鎬佺爜锛歿}, 鍝嶅簲鍐呭: {}", response.getStatusCode(), response.getBody());
@@ -380,7 +378,7 @@
List<RotatingRack> failedRecords = rotatingRackMapper.selectList(queryWrapper);
if (failedRecords.isEmpty()) {
- log.info("娌℃湁闇�瑕侀噸璇曞彂閫佺殑鏁版嵁");
+ //log.info("娌℃湁闇�瑕侀噸璇曞彂閫佺殑鏁版嵁");
return;
}
--
Gitblit v1.8.0