From d37b9406aa079d1497bcbfe519cec7d34574f892 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 24 五月 2021 17:31:36 +0800
Subject: [PATCH] 绕组实验更新接口
---
src/main/java/com/whyc/service/WindingExperimentService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/WindingExperimentService.java b/src/main/java/com/whyc/service/WindingExperimentService.java
index 39ee621..67dcf2c 100644
--- a/src/main/java/com/whyc/service/WindingExperimentService.java
+++ b/src/main/java/com/whyc/service/WindingExperimentService.java
@@ -13,9 +13,11 @@
import org.springframework.transaction.TransactionStatus;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.UUID;
@Service
public class WindingExperimentService {
@@ -94,6 +96,7 @@
try {
for (int i = 0; i < list.size(); i++) {
ExperimentWindingStep1 windingStep1 = list.get(i);
+ windingStep1.setUuid("rz"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
windingStep1.setSaveTime(new Date());
windingStep1.setDeviceId(experiment.getDeviceId());//瀛樿澶囩被鍨�
windingStep1.setRealName(realName); //娴嬭瘯浜�
@@ -175,11 +178,21 @@
}
- public Response delExperimentWindingbyId(String experimentId) {
+ public Response delExperimentWindingbyId(String experimentId,String uuid) {
+ QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
+ wrapper.eq("experiment_id",experimentId);
+ wrapper.eq("uuid",uuid);
+ List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
+ if (list == null) {
+// System.out.println(" null ");
+ return new Response().setMsg(0, "鍒犻櫎澶辫触,璇锋煡妫�鍙傛暟鏄惁姝ｇ‘");
+ }else {
+// System.out.println("list = " + list.size());
+ }
try {
mapper.deleteById(experimentId);
- mapper1.delExperimentWindingbyId(experimentId);
+ mapper1.delExperimentWindingbyUuid(experimentId,uuid);
} catch (Exception e) {
e.printStackTrace();
return new Response().setMsg(0, "鍒犻櫎澶辫触");
@@ -204,7 +217,7 @@
try {
ExperimentWindingStep1 windingStep1 = windingStep1s.get(i);
windingStep1.setSaveTime(saveTime);
- if (mapper1.updateByIdandIndex(windingStep1) > 0) {
+ if (mapper1.updateByUuidAndIndex(windingStep1) > 0) {
bl = true;
} else {
bl = false;
--
Gitblit v1.9.1