更新试验接口

whycxzp

2021-05-19 5552728b86383ac123209ac666c1eb808645d753

更新试验接口

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

@@ -6,6 +6,7 @@
import com.whyc.pojo.Experiment;
import com.whyc.pojo.ExperimentBaseData;
import com.whyc.pojo.ExperimentBaseDataKZ;
import com.whyc.pojo.ExperimentPoint;
import com.whyc.service.ExperimentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +38,7 @@

    @PostMapping
    @ApiOperation(value = "新增试验-空载")
    public Response addKZ(@RequestBody Experiment<ExperimentBaseDataKZ> experiment){
    public Response addKZ(@RequestBody Experiment<ExperimentBaseDataKZ, ExperimentPoint> experiment){
        return service.addKZ(experiment);
    }


 src/main/java/com/whyc/mapper/ExperimentPointMapper.java

New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;

import com.whyc.pojo.ExperimentPoint;

public interface ExperimentPointMapper extends CustomMapper<ExperimentPoint>{
}

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

@@ -14,7 +14,7 @@
@Alias("Experiment")
@ApiModel
@TableName(schema = "`db_3.5mw_web`" , value = "`tb_experiment`")
public class Experiment<T> {
public class Experiment<BaseData,Point> {

    @ApiModelProperty("试验编号")
    @TableId(type= IdType.INPUT)
@@ -51,7 +51,10 @@
    private Integer status;
    @ApiModelProperty("基础数据")
    @TableField(exist = false)
    private T baseData;
    private BaseData baseData;
    @ApiModelProperty("测试点")
    @TableField(exist = false)
    private Point point;

    public String getId() {
        return id;
@@ -157,11 +160,19 @@
        this.status = status;
    }

    public T getBaseData() {
    public BaseData getBaseData() {
        return baseData;
    }

    public void setBaseData(T baseData) {
    public void setBaseData(BaseData baseData) {
        this.baseData = baseData;
    }

    public Point getPoint() {
        return point;
    }

    public void setPoint(Point point) {
        this.point = point;
    }
}

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

New file
@@ -0,0 +1,96 @@
package com.whyc.pojo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.util.Date;

/**
 * 测试点,
 * 负载点
 */
@Alias("ExperimentPoint")
@ApiModel
@TableName(schema = "`db_3.5mw_web`" , value = "`tb_experiment_point`")
public class ExperimentPoint {

    private Integer    id;
    @ApiModelProperty("对应试验")
    private String    experimentId;
    @ApiModelProperty("负载点名称")
    private String    name;
    @ApiModelProperty("负载百分数")
    private Integer    percentage;
    @ApiModelProperty("负载时长")
    private Integer    duration;
    private Date    startTime;
    private Date    endTime;
    @ApiModelProperty("状态:0-未开始,1-进行中,2-已完成")
    private Integer    status;

    public Integer getId() {
        return id;
    }

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

    public String getExperimentId() {
        return experimentId;
    }

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

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Integer getPercentage() {
        return percentage;
    }

    public void setPercentage(Integer percentage) {
        this.percentage = percentage;
    }

    public Integer getDuration() {
        return duration;
    }

    public void setDuration(Integer duration) {
        this.duration = duration;
    }

    public Date getStartTime() {
        return startTime;
    }

    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }

    public Date getEndTime() {
        return endTime;
    }

    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }

    public Integer getStatus() {
        return status;
    }

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

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

@@ -9,9 +9,12 @@
import com.whyc.dto.Response;
import com.whyc.mapper.ExperimentBaseDataKZMapper;
import com.whyc.mapper.ExperimentMapper;
import com.whyc.mapper.ExperimentPointMapper;
import com.whyc.pojo.Experiment;
import com.whyc.pojo.ExperimentBaseDataKZ;
import com.whyc.pojo.ExperimentPoint;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
@@ -26,6 +29,8 @@
    private ExperimentMapper mapper;
    @Resource
    private ExperimentBaseDataKZMapper kzMapper;
    @Resource
    private ExperimentPointMapper pointMapper;

    /**
     * 绕组:rz,
@@ -68,14 +73,24 @@

    }

    @Transactional
    public Response addKZ(Experiment experiment) {
        //插入experiment数据
        experiment.setCreateTime(new Date());
        //新增初始化状态为1,正在进行
        experiment.setStatus(1);
        mapper.insert(experiment);

        //插入experiment_base_data数据
        kzMapper.insert((ExperimentBaseDataKZ) experiment.getBaseData());

        //插入experiment_point数据
        ExperimentPoint point = (ExperimentPoint) experiment.getPoint();
        point.setStatus(1);
        pointMapper.insert(point);

        //TODO 插入紧急停止数据

        return new Response().setMsg(1,"新增成功");
    }