whycxzp
2021-05-21 324fdc077e4c18c8916f0951543077fa8b7d64b0
更新试验接口
3个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/whyc/controller/ExperimentController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/Experiment.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/ExperimentService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/ExperimentController.java
@@ -45,7 +45,7 @@
    @PostMapping("kzfz")
    @ApiOperation(value = "新增试验-空载/负载")
    public Response addKZFZ(@RequestBody Experiment<ExperimentBaseDataKZ, ExperimentPoint> experiment){
        return service.addKZ(experiment);
        return service.addKZFZ(experiment);
    }
    @GetMapping("checkPrecondition")
src/main/java/com/whyc/pojo/Experiment.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.type.Alias;
import java.util.Date;
import java.util.List;
@Alias("Experiment")
@ApiModel
@@ -54,7 +55,7 @@
    private BaseData baseData;
    @ApiModelProperty("测试点")
    @TableField(exist = false)
    private Point point;
    private List<Point> point;
    public String getId() {
        return id;
@@ -168,11 +169,11 @@
        this.baseData = baseData;
    }
    public Point getPoint() {
    public List<Point> getPoint() {
        return point;
    }
    public void setPoint(Point point) {
    public void setPoint(List<Point> point) {
        this.point = point;
    }
}
src/main/java/com/whyc/service/ExperimentService.java
@@ -106,7 +106,7 @@
    }
    @Transactional
    public Response addKZ(Experiment experiment) {
    public Response addKZFZ(Experiment experiment) {
        //插入experiment数据
        experiment.setCreateTime(new Date());
        //新增初始化状态为0未开始,正在进行
@@ -117,10 +117,9 @@
        kzMapper.insert((ExperimentBaseDataKZ) experiment.getBaseData());
        //插入experiment_point数据
        ExperimentPoint point = (ExperimentPoint) experiment.getPoint();
        point.setStatus(1);
        pointMapper.insert(point);
        List<ExperimentPoint> points = (List<ExperimentPoint>) experiment.getPoint();
        points.stream().forEach(p->p.setStatus(0));
        pointMapper.insertBatchSomeColumn(points);
        //TODO 插入紧急停止数据
        return new Response().setMsg(1,"新增成功");