绕组实验更新接口

whycrzg

2021-05-26 bf7833def6436a4100f15d179717190d9574666c

绕组实验更新接口

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

@@ -78,9 +78,12 @@

    @GetMapping("getRZStep")
    @ApiOperation(value = "实验数据",notes = "step参数 1 2 对应实验步骤1、2 ")
    public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@RequestParam int rzLink,@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(rzLink,step,pageNum,pageSize);
        return service.getExperimentWindingStep1(experimentId,rzLink,step,pageNum,pageSize);
    }



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

@@ -1,12 +1,10 @@
package com.whyc.mapper;


import com.whyc.pojo.Experiment;
import com.whyc.pojo.ExperimentWindingStep1;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.junit.runners.Parameterized;

import java.util.List;

@@ -31,7 +29,7 @@
    //根据试验ID查询到uid在tb_user表查询real_name
    String getRealName(String experimentId);

    List<ExperimentWindingStep1> selectlistByCondition(@Param(value = "rzLink") int rzLink,@Param(value = "step")  int step);
    List<ExperimentWindingStep1> selectlistByCondition(@Param(value = "experimentId")String experimentId, @Param(value = "rzLink") int rzLink, @Param(value = "step") int step);

    //完成试验
    int updateRzFlag(String id);

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

@@ -335,19 +335,18 @@
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     *
     *
     * @param experimentId
     * @param rzLink
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int rzLink, int step, int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(String experimentId, int rzLink, int step, int pageNum, int pageSize) {

        PageHelper.startPage(pageNum, pageSize);
        QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
        wrapper.eq("step",step);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(rzLink,step);
//        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(experimentId,rzLink,step);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }

 src/main/resources/mapper/ExperimentWindingStep1Mapper.xml

@@ -32,7 +32,8 @@
    SELECT
    *
    FROM
    `db_3.5mw_web`.`tb_experiment_winding_step1` WHERE step =#{step} AND rz_link =#{rzLink}
    `db_3.5mw_web`.`tb_experiment_winding_step1` WHERE step =#{step} AND rz_link =#{rzLink} AND experiment_id =
    #{experimentId}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
    delete from tb_experiment_winding_step1