绕组实验更新 绕组集合

whycrzg

2021-05-18 9b099a2029dd15a3db3a429cb81355edec9f8ac5

绕组实验更新 绕组集合

 src/main/java/com/whyc/controller/WindingExperimentController.java

@@ -44,16 +44,48 @@
        return service.addWindingExperiment(experiment);
    }
    @PostMapping("addWindingStep1")
    @ApiOperation(value = "实验步骤1")
    public Response addExperimentWindingStep1(@RequestBody ExperimentWindingStep1 windingStep1){
    @ApiOperation(value = "实验步骤1",notes = "[\n" +
            "  {\n" +
            "    \"winding\": \"绕组1\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-19 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  },\n" +
            "  {\n" +
            "    \"winding\": \"绕组2\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-19 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  }\n" +
            "]")
    public Response addExperimentWindingStep1(@RequestBody List<ExperimentWindingStep1> windingStep1s){

        return service.addExperimentWindingStep1(windingStep1);
        return service.addExperimentWindingStep1(windingStep1s);
    }
    @PostMapping("addWindingStep2")
    @ApiOperation(value = "实验步骤2")
    public Response addExperimentWindingStep2(@RequestBody ExperimentWindingStep2 windingStep2){
    @ApiOperation(value = "实验步骤2",notes = "[\n" +
            "  {\n" +
            "    \"winding\": \"绕组\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-18 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  }\n" +
            "]")
    public Response addExperimentWindingStep2(@RequestBody List<ExperimentWindingStep2> windingStep2s){

        return service.addExperimentWindingStep2(windingStep2);
        return service.addExperimentWindingStep2(windingStep2s);
    }

}

 src/main/java/com/whyc/pojo/ExperimentWindingStep1.java

@@ -1,8 +1,9 @@
package com.whyc.pojo;

import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.io.Serializable;
@@ -22,38 +23,127 @@
    /**
     * 绕组编号 测绕组引线(多个)；测各相绕组引线(单个)
     */
    @ApiModelProperty("绕组编号 测绕组引线(多个)；测各相绕组引线(单个)")
    private String winding;

    /**
     * 电流(μA)
     */
    @ApiModelProperty("电流(μA)")
    private Float electricCurrent;

    /**
     * 电压(V)
     */
    @ApiModelProperty("电压(V)")
    private Float vol;

    /**
     * 绝缘电阻
     */
    @ApiModelProperty("绝缘电阻")
    private Float resistance;

    @ApiModelProperty("绕组温度")
    private Float temperature;

    @ApiModelProperty("保存时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date saveTime;

    /**
     * 试验编号(ID)
     */
    @ApiModelProperty("试验编号")
    private String experimentId;

    /**
     * 状态:0-未开始,1-进行中,2-已完成
     */
    private Boolean status;
    @ApiModelProperty("状态:0-未开始,1-进行中,2-已完成")
    private Integer status;

    private String note;

    private static final long serialVersionUID = 1L;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getWinding() {
        return winding;
    }

    public void setWinding(String winding) {
        this.winding = winding;
    }

    public Float getElectricCurrent() {
        return electricCurrent;
    }

    public void setElectricCurrent(Float electricCurrent) {
        this.electricCurrent = electricCurrent;
    }

    public Float getVol() {
        return vol;
    }

    public void setVol(Float vol) {
        this.vol = vol;
    }

    public Float getResistance() {
        return resistance;
    }

    public void setResistance(Float resistance) {
        this.resistance = resistance;
    }

    public Float getTemperature() {
        return temperature;
    }

    public void setTemperature(Float temperature) {
        this.temperature = temperature;
    }

    public Date getSaveTime() {
        return saveTime;
    }

    public void setSaveTime(Date saveTime) {
        this.saveTime = saveTime;
    }

    public String getExperimentId() {
        return experimentId;
    }

    public void setExperimentId(String experimentId) {
        this.experimentId = experimentId;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }
}

 src/main/java/com/whyc/pojo/ExperimentWindingStep2.java

@@ -1,8 +1,9 @@
package com.whyc.pojo;

import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.io.Serializable;
@@ -22,38 +23,128 @@
    /**
     * 绕组编号 测绕组引线(多个)；测各相绕组引线(单个)
     */
    @ApiModelProperty("绕组编号 测绕组引线(多个)；测各相绕组引线(单个)")
    private String winding;

    /**
     * 电流(mA)
     */
    @ApiModelProperty("电流(mA)")
    private Float electricCurrent;

    /**
     * 电压(V)
     */
    @ApiModelProperty("电压(V)")
    private Float vol;

    /**
     * 直流电阻
     */
    @ApiModelProperty("直流电阻")
    private Float resistance;

    @ApiModelProperty("绕组温度")
    private Float temperature;

    @ApiModelProperty("保存时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date saveTime;

    /**
     * 试验编号(ID)
     */
    @ApiModelProperty("试验编号(ID)")
    private String experimentId;

    /**
     * 状态:0-未开始,1-进行中,2-已完成
     */
    private Boolean status;
    @ApiModelProperty("状态:0-未开始,1-进行中,2-已完成")
    private Integer status;

    private String note;

    private static final long serialVersionUID = 1L;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getWinding() {
        return winding;
    }

    public void setWinding(String winding) {
        this.winding = winding;
    }

    public Float getElectricCurrent() {
        return electricCurrent;
    }

    public void setElectricCurrent(Float electricCurrent) {
        this.electricCurrent = electricCurrent;
    }

    public Float getVol() {
        return vol;
    }

    public void setVol(Float vol) {
        this.vol = vol;
    }

    public Float getResistance() {
        return resistance;
    }

    public void setResistance(Float resistance) {
        this.resistance = resistance;
    }

    public Float getTemperature() {
        return temperature;
    }

    public void setTemperature(Float temperature) {
        this.temperature = temperature;
    }

    public Date getSaveTime() {
        return saveTime;
    }

    public void setSaveTime(Date saveTime) {
        this.saveTime = saveTime;
    }

    public String getExperimentId() {
        return experimentId;
    }

    public void setExperimentId(String experimentId) {
        this.experimentId = experimentId;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public String getNote() {
        return note;
    }

    public void setNote(String note) {
        this.note = note;
    }

}

 src/main/java/com/whyc/service/WindingExperimentService.java

@@ -10,7 +10,11 @@
import com.whyc.pojo.ExperimentWindingStep1;
import com.whyc.pojo.ExperimentWindingStep2;
import com.whyc.pojo.Project;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
@@ -20,7 +24,10 @@

@Service
public class WindingExperimentService {

    @Autowired
    DataSourceTransactionManager dataSourceTransactionManager;
    @Autowired
    TransactionDefinition transactionDefinition;

    @Resource
    private ExperimentMapper mapper;
@@ -59,18 +66,31 @@

    /**
     * 绕组实验步骤1
     * @param windingStep1
     * @param list
     * @return
     */
    public Response<Object> addExperimentWindingStep1(ExperimentWindingStep1 windingStep1) {
    public Response<Object> addExperimentWindingStep1(List<ExperimentWindingStep1> list) {
        Boolean flag = true;
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            if (mapper1.insert(windingStep1) > 0) {
                return new Response().setMsg(1, "添加成功");
            } else {
                return new Response().setMsg(0, "添加失败");
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep1 windingStep1 = list.get(i);
                if (mapper1.insert(windingStep1) > 0) {
                    flag = true;
                } else {
                    flag = false;
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
            return new Response().setMsg(0, "添加失败");
        }
        if (flag) {
            dataSourceTransactionManager.commit(transactionStatus);
            return new Response().setMsg(1, "添加成功");
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            return new Response().setMsg(0, "添加失败");
        }

@@ -78,18 +98,31 @@

    /**
     * 绕组实验步骤2
     * @param windingStep2
     * @param list
     * @return
     */
    public Response<Object> addExperimentWindingStep2(ExperimentWindingStep2 windingStep2) {
    public Response<Object> addExperimentWindingStep2(List<ExperimentWindingStep2> list) {
        Boolean flag = true;
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            if (mapper2.insert(windingStep2) > 0) {
                return new Response().setMsg(1, "添加成功");
            } else {
                return new Response().setMsg(0, "添加失败");
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep2 windingStep2 = list.get(i);
                if (mapper2.insert(windingStep2) > 0) {
                    flag = true;
                } else {
                    flag = false;
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
            return new Response().setMsg(0, "添加失败");
        }
        if (flag) {
            dataSourceTransactionManager.commit(transactionStatus);
            return new Response().setMsg(1, "添加成功");
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            return new Response().setMsg(0, "添加失败");
        }