whycrzg
2021-05-24 d37b9406aa079d1497bcbfe519cec7d34574f892
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;