From c88af677e0fdb759d7c9f641f4c6a76ff2e92d56 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 23 Jul 2024 15:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E6=A0=87=E5=87=86=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/service/impl/ExperimentStandardServiceImpl.java | 5 -----
 .../aqgqj/basis/service/impl/ExperimentalServiceImpl.java | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
index 8422178..fbdd987 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
@@ -1,6 +1,5 @@
 package com.bonus.aqgqj.basis.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bonus.aqgqj.advice.ValidatorsUtils;
@@ -8,13 +7,10 @@ import com.bonus.aqgqj.basis.dao.ExperimentStandardMapper;
 import com.bonus.aqgqj.basis.entity.dto.ParamsDto;
 import com.bonus.aqgqj.basis.entity.vo.*;
 import com.bonus.aqgqj.basis.service.ExperimentStandardService;
-import com.bonus.aqgqj.system.vo.LoginUser;
 import com.bonus.aqgqj.utils.ServerResponse;
-import com.bonus.aqgqj.utils.UserUtil;
 import com.bonus.aqgqj.webResult.Constants;
 import com.bonus.aqgqj.webResult.HttpStatus;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -160,7 +156,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
             }
             // 添加试验依据
             mapper.addBasiss(experConfigVo.getBasisVos());
-            mapper.addDev(experConfigVo.getDeviceVos());
             // 添加试验主要设备
             for (ConfigMainDevVo mainDeviceVo : experConfigVo.getMainDeviceVos()) {
                 mainDeviceVo.setConfigId(experConfigVo.getId());
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
index c3ceb97..1ae22da 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
@@ -152,7 +152,15 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             // 添加试验依据信息数据
             mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
             for (int i = 0; i < vo.getExperDevVos().size(); i++) {
+                ExperDevVo experDevVo = vo.getExperDevVos().get(i);
                 // 添加试验样品数据
+                /*if(experDevVo.getDevData().contains(Constants.ERROR_RESULT) ||
+                        experDevVo.getDevData().contains(Constants.ERROR_RESULT2)
+                ){
+                    sample.setTestResult(Constants.ERROR_RESULT);
+                }else{
+                    sample.setTestResult(Constants.SUCCESS_RESULT);
+                }*/
                 mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId());
                 if (i == 0) {
                     for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) {