whycrzg
2021-05-26 bf7833def6436a4100f15d179717190d9574666c
src/main/java/com/whyc/controller/WindingExperimentController.java
@@ -57,7 +57,7 @@
    }
    @PostMapping("")
    @ApiOperation(value = "开始实验",notes = "试验编号唯一,接口 experimentId 获取  {\n" +
    @ApiOperation(value = "开始实验",notes = "GET /experiment/exist接口查询当前是否有正在进行的试验;  {\n" +
            "  \"id\": \"\",\n" +
            "  \"name\": \"\",\n" +
            "  \"type\": \"\",\n" +
@@ -70,8 +70,6 @@
            "  \"duration\": \"\",\n" +
            "  \"userId\": 0,\n" +
            "  \"username\": \"\",\n" +
            "  \"createTime\": \"2021-05-21 10:54:25\",\n" +
            "  \"status\": 0\n" +
            "}")
    public Response addWindingExperiment(@RequestBody Experiment experiment){
@@ -80,14 +78,17 @@
    @GetMapping("getRZStep")
    @ApiOperation(value = "实验数据",notes = "step参数 1 2 对应实验步骤1、2 ")
    public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@RequestParam int step,@RequestParam int pageNum, @RequestParam int pageSize){
    public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@ApiParam(value = "试验编号",required = true)@RequestParam String  experimentId ,
                                                                                @ApiParam(value = "各相绕组连接情况: 0 引出; 1 内部连接",required = true)@RequestParam int rzLink,
                                                                                @ApiParam(value = "实验步骤: 1 实验步骤1; 2 实验步骤2",required = true)@RequestParam int step,
                                                                                @RequestParam int pageNum, @RequestParam int pageSize){
        return service.getExperimentWindingStep1(step,pageNum,pageSize);
        return service.getExperimentWindingStep1(experimentId,rzLink,step,pageNum,pageSize);
    }
    @PostMapping("saveRZStep")
    @ApiOperation(value = "保存数据",notes = "step参数 1 2 对应实验步骤1、2 不需要传value的参数 保存时间saveTime、状态status、设备类型deviceId、note")
    @ApiOperation(value = "保存数据",notes = "step参数 1 2 对应实验步骤1、2 不需要传value的参数  测试人realName 保存时间saveTime、状态status、设备类型deviceId、note")
    public Response addExperimentWindingStep1(@RequestBody List<ExperimentWindingStep1> windingStep1s){
        return service.addExperimentWindingStep1(windingStep1s);
@@ -96,9 +97,9 @@
    @DeleteMapping("delRZExperiment")
    @ApiOperation(value = "删除绕组实验数据",notes = "根据唯一试验编号删除试验数据")
    public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId){
    public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId,@ApiParam(value = "唯一标识",required = true) @RequestParam String uuid){
        return service.delExperimentWindingbyId(experimentId);
        return service.delExperimentWindingbyId(experimentId,uuid);
    }
    @PostMapping("updateRZStep")
@@ -109,7 +110,7 @@
    }
    @PostMapping("updateFlag")
    @PostMapping("finishRZExperiment")
    @ApiOperation(value = "完成试验")
    public Response updateFlag(@ApiParam(value = "试验编号", required = true) @RequestParam String id) {