From 8ec0064cd95292f14027006a8be47c1a71f69af9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 31 十二月 2025 17:02:57 +0800
Subject: [PATCH] 添加查询所有玻璃数据
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/EngineeringSequenceServiceImpl.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/EngineeringSequenceServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/EngineeringSequenceServiceImpl.java
index f5eaab5..397cbf3 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/EngineeringSequenceServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/EngineeringSequenceServiceImpl.java
@@ -5,7 +5,6 @@
import com.mes.device.mapper.EngineeringSequenceMapper;
import com.mes.device.service.EngineeringSequenceService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,27 +56,45 @@
String sequenceStr = engineeringId.substring(engineeringId.length() - 2);
int sequence = Integer.parseInt(sequenceStr);
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪
+ EngineeringSequence existing = baseMapper.selectByEngineeringId(engineeringId);
+
EngineeringSequence engineeringSequence = new EngineeringSequence();
engineeringSequence.setEngineeringId(engineeringId);
engineeringSequence.setDate(date);
engineeringSequence.setSequence(sequence);
- engineeringSequence.setCreatedTime(new Date());
- engineeringSequence.setUpdatedTime(new Date());
- engineeringSequence.setCreatedBy("system");
- engineeringSequence.setUpdatedBy("system");
-
- boolean result = save(engineeringSequence);
-
- if (result) {
- log.info("淇濆瓨宸ョ▼鍙锋垚鍔�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+
+ boolean result;
+ if (existing != null) {
+ // 濡傛灉宸插瓨鍦紝鍒欐洿鏂�
+ engineeringSequence.setId(existing.getId());
+ // 淇濈暀鍘熷鍒涘缓淇℃伅
+ engineeringSequence.setCreatedTime(existing.getCreatedTime());
+ engineeringSequence.setCreatedBy(existing.getCreatedBy());
+ // 鏇存柊涓哄綋鍓嶆椂闂�
+ engineeringSequence.setUpdatedTime(new Date());
+ engineeringSequence.setUpdatedBy("system");
+ result = updateById(engineeringSequence);
+ if (result) {
+ log.info("鏇存柊宸ョ▼鍙锋垚鍔�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+ } else {
+ log.error("鏇存柊宸ョ▼鍙峰け璐�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+ }
} else {
- log.error("淇濆瓨宸ョ▼鍙峰け璐�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+ // 濡傛灉涓嶅瓨鍦紝鍒欐彃鍏�
+ engineeringSequence.setCreatedTime(new Date());
+ engineeringSequence.setUpdatedTime(new Date());
+ engineeringSequence.setCreatedBy("system");
+ engineeringSequence.setUpdatedBy("system");
+ result = save(engineeringSequence);
+ if (result) {
+ log.info("淇濆瓨宸ョ▼鍙锋垚鍔�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+ } else {
+ log.error("淇濆瓨宸ョ▼鍙峰け璐�: engineeringId={}, date={}, sequence={}", engineeringId, date, sequence);
+ }
}
return result;
- } catch (DuplicateKeyException dup) {
- log.error("淇濆瓨宸ョ▼鍙峰敮涓�閿啿绐�: date={}, engineeringId={}", date, engineeringId, dup);
- throw new RuntimeException("淇濆瓨宸ョ▼鍙峰け璐�", dup);
} catch (Exception e) {
log.error("淇濆瓨宸ョ▼鍙峰け璐�, date={}, engineeringId={}", date, engineeringId, e);
throw new RuntimeException("淇濆瓨宸ョ▼鍙峰け璐�", e);
--
Gitblit v1.8.0