From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceConfigController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceConfigController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceConfigController.java
index c1f5da1..4369f5b 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceConfigController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceConfigController.java
@@ -50,9 +50,11 @@
// 鍒涘缓鎴愬姛鍚庯紝閲嶆柊鑾峰彇璁惧瀵硅薄
DeviceConfig created = deviceConfigService.getDeviceByCode(deviceConfig.getDeviceCode());
return Result.success(created);
- } else {
- return Result.error("璁惧閰嶇疆宸插瓨鍦�");
}
+ return Result.error("璁惧閰嶇疆宸插瓨鍦�");
+ } catch (IllegalArgumentException e) {
+ log.warn("鍒涘缓璁惧閰嶇疆鍙傛暟鏍￠獙澶辫触: {}", e.getMessage());
+ return Result.error(e.getMessage());
} catch (Exception e) {
log.error("鍒涘缓璁惧閰嶇疆澶辫触", e);
return Result.error("鍒涘缓璁惧閰嶇疆澶辫触");
@@ -80,11 +82,11 @@
return Result.error("璁惧閰嶇疆鏁版嵁鏍煎紡閿欒");
}
- deviceConfig.setId(request.getDeviceId());
+ deviceConfig.setId(request.getId());
boolean success = deviceConfigService.updateDevice(deviceConfig);
if (success) {
// 鏇存柊鎴愬姛鍚庯紝閲嶆柊鑾峰彇璁惧瀵硅薄
- DeviceConfig updated = deviceConfigService.getDeviceById(request.getDeviceId());
+ DeviceConfig updated = deviceConfigService.getDeviceById(request.getId());
return Result.success(updated);
} else {
return Result.error("璁惧閰嶇疆涓嶅瓨鍦�");
@@ -103,7 +105,7 @@
public Result<Void> deleteDevice(
@Valid @RequestBody DeviceConfigRequest request) {
try {
- deviceConfigService.deleteDevice(request.getDeviceId());
+ deviceConfigService.deleteDevice(request.getId());
return Result.success(null);
} catch (Exception e) {
log.error("鍒犻櫎璁惧閰嶇疆澶辫触", e);
@@ -119,7 +121,7 @@
public Result<DeviceConfig> getDeviceById(
@Valid @RequestBody DeviceConfigRequest request) {
try {
- DeviceConfig device = deviceConfigService.getDeviceById(request.getDeviceId());
+ DeviceConfig device = deviceConfigService.getDeviceById(request.getId());
return Result.success(device);
} catch (Exception e) {
log.error("鑾峰彇璁惧閰嶇疆澶辫触", e);
@@ -157,7 +159,7 @@
public Result<Void> enableDevice(
@Valid @RequestBody DeviceConfigRequest request) {
try {
- deviceConfigService.enableDevice(request.getDeviceId());
+ deviceConfigService.enableDevice(request.getId());
return Result.success(null);
} catch (Exception e) {
log.error("鍚敤璁惧澶辫触", e);
@@ -173,7 +175,7 @@
public Result<Void> disableDevice(
@Valid @RequestBody DeviceConfigRequest request) {
try {
- deviceConfigService.disableDevice(request.getDeviceId());
+ deviceConfigService.disableDevice(request.getId());
return Result.success(null);
} catch (Exception e) {
log.error("绂佺敤璁惧澶辫触", e);
@@ -237,7 +239,7 @@
public Result<Boolean> checkDeviceCodeExists(
@ApiParam("璁惧閰嶇疆璇锋眰") @RequestBody DeviceConfigRequest request) {
try {
- boolean exists = deviceConfigService.isDeviceCodeExists(request.getDeviceCode(), request.getDeviceId());
+ boolean exists = deviceConfigService.isDeviceCodeExists(request.getDeviceCode(), request.getId());
return Result.success(exists);
} catch (Exception e) {
log.error("妫�鏌ヨ澶囩紪鐮佸け璐�", e);
@@ -299,7 +301,7 @@
public Result<DeviceConfigVO.HealthCheckResult> performHealthCheck(
@Valid @RequestBody DeviceConfigRequest request) {
try {
- DeviceConfigVO.HealthCheckResult result = deviceConfigService.performHealthCheck(request.getDeviceId());
+ DeviceConfigVO.HealthCheckResult result = deviceConfigService.performHealthCheck(request.getId());
return Result.success(result);
} catch (Exception e) {
log.error("璁惧鍋ュ悍妫�鏌ュけ璐�", e);
@@ -310,7 +312,7 @@
/**
* 娴嬭瘯璁惧PLC杩炴帴
* 鏀寔涓ょ鏂瑰紡锛�
- * 1. 浼犲叆 deviceId锛屾牴鎹凡淇濆瓨鐨勮澶囬厤缃祴璇�
+ * 1. 浼犲叆 id锛屾牴鎹凡淇濆瓨鐨勮澶囬厤缃祴璇�
* 2. 鐩存帴浼犲叆 plcIp / plcPort / timeout 杩涜涓�娆℃�ф祴璇�
*/
@PostMapping("/devices/test-connection")
@@ -321,15 +323,15 @@
Integer plcPort = null;
Integer timeoutMs = null;
- // 浼樺厛鏍规嵁 deviceId 璇诲彇宸蹭繚瀛橀厤缃�
- Object deviceIdObj = body.get("deviceId");
- if (deviceIdObj != null) {
- Long deviceId = deviceIdObj instanceof Number
- ? ((Number) deviceIdObj).longValue()
- : Long.parseLong(deviceIdObj.toString());
- DeviceConfig device = deviceConfigService.getDeviceById(deviceId);
+ // 浼樺厛鏍规嵁 id 璇诲彇宸蹭繚瀛橀厤缃�
+ Object idObj = body.get("id");
+ if (idObj != null) {
+ Long id = idObj instanceof Number
+ ? ((Number) idObj).longValue()
+ : Long.parseLong(idObj.toString());
+ DeviceConfig device = deviceConfigService.getDeviceById(id);
if (device == null) {
- return Result.error("璁惧涓嶅瓨鍦�: " + deviceId);
+ return Result.error("璁惧涓嶅瓨鍦�: " + id);
}
plcIp = device.getPlcIp();
plcPort = device.getPlcPort();
--
Gitblit v1.8.0