From c503c5d336b7219c1bff1f59b4176e4e49f2c3f2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:50:21 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
index 09fc8dd..e9bb7d6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,7 @@
*/
@Override
public int insertArdTubesDetails(ArdTubesDetails ardTubesDetails) {
+ ardTubesDetails.setId(IdUtils.simpleUUID());
ardTubesDetails.setUserId(SecurityUtils.getUserId());
ardTubesDetails.setCreateBy(SecurityUtils.getUsername());
ardTubesDetails.setCreateTime(DateUtils.getNowDate());
@@ -127,7 +129,7 @@
@Override
public String importArdTubesDetails(List<ArdTubesDetails> ardTubesDetailsList, Boolean isUpdateSupport, String operName, String tubeId) {
if (StringUtils.isNull(ardTubesDetailsList) || ardTubesDetailsList.size() == 0) {
- throw new ServiceException("瀵煎叆浜曟暟鎹笉鑳戒负绌猴紒");
+ throw new ServiceException("瀵煎叆绠＄嚎鏁版嵁涓嶈兘涓虹┖锛�");
}
ArdTubes tubes = ardTubesMapper.selectArdTubesById(tubeId);
int successNum = 0;
@@ -140,7 +142,7 @@
String userId = SecurityUtils.getUserId();
tubesDetails.setUserId(userId);
// 楠岃瘉鏄惁瀛樺湪杩欎釜绠＄嚎缂栧彿璇︽儏
- ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber());
+ ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber(),tubesDetails.getInflectionPointNumber());
if (StringUtils.isNull(atd)) {
BeanValidators.validateWithException(validator, tubesDetails);
tubesDetails.setCreateBy(operName);
@@ -148,7 +150,7 @@
tubesDetails.setDeptId(tubes.getDeptId());
this.insertArdTubesDetails(tubesDetails);
successNum++;
- successMsg.append("<br/>" + successNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() + " 瀵煎叆鎴愬姛");
+ successMsg.append("<br/>" + successNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, tubesDetails);
checkTubesDetailAllowed(tubesDetails);
@@ -158,14 +160,14 @@
tubesDetails.setDeptId(tubes.getDeptId());
this.updateArdTubesDetailsByReelNumber(tubesDetails);
successNum++;
- successMsg.append("<br/>" + successNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() + " 鏇存柊鎴愬姛");
+ successMsg.append("<br/>" + successNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 鏇存柊鎴愬姛");
} else {
failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() + " 宸插瓨鍦�");
+ failureMsg.append("<br/>" + failureNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber()+"-"+tubesDetails.getInflectionPointNumber() + " 宸插瓨鍦�");
}
} catch (Exception e) {
failureNum++;
- String msg = "<br/>" + failureNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() + " 瀵煎叆澶辫触锛�";
+ String msg = "<br/>" + failureNum + "銆佺绾跨紪鍙� " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 瀵煎叆澶辫触锛�";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
--
Gitblit v1.9.3