绕组实验更新接口

whycrzg

2021-05-24 c83a32ddf1d9c7dc31c149406d62219fb7b54efa

绕组实验更新接口

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

@@ -80,9 +80,9 @@

    @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(@RequestParam int rzLink,@RequestParam int step,@RequestParam int pageNum, @RequestParam int pageSize){

        return service.getExperimentWindingStep1(step,pageNum,pageSize);
        return service.getExperimentWindingStep1(rzLink,step,pageNum,pageSize);
    }



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

@@ -3,6 +3,8 @@

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

import java.util.List;

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

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

}

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

@@ -34,6 +34,8 @@
    @ApiModelProperty("测试人")
    private String realName;

    @ApiModelProperty("各相绕组连接情况 0 引出; 1 内部连接")
    private Integer rzLink;
    /**
     * 电流(μA)
     */
@@ -113,6 +115,14 @@
        this.realName = realName;
    }

    public Integer getRzLink() {
        return rzLink;
    }

    public void setRzLink(Integer rzLink) {
        this.rzLink = rzLink;
    }

    public Float getElectricCurrent() {
        return electricCurrent;
    }

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

@@ -98,7 +98,7 @@
                    windingStep1.setDeviceId(experiment.getDeviceId());//存设备类型
                    windingStep1.setRealName(realName);       //测试人
                    windingStep1.setStatus(1);                //状态:0-未开始,1-进行中,2-已完成

                    windingStep1.setRzLink(experiment.getRz_link());   //各相绕组连接情况 0 引出; 1 内部连接
                    if (mapper1.insert(windingStep1) > 0) {
                        flag = true;
                    } else {
@@ -322,17 +322,20 @@
    /**
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     *
     * @param rzLink
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int step, int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(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.selectList(wrapper);
        List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(rzLink,step);
//        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }

 src/main/resources/mapper/ExperimentWindingStep1Mapper.xml

@@ -26,7 +26,13 @@
  <select id="getRealName" resultType="java.lang.String">
    SELECT real_name FROM `db_3.5mw_web`.`tb_user`
    WHERE id = (SELECT user_id FROM `db_3.5mw_web`.`tb_experiment` WHERE
    id = #{experimentId});
    id = #{experimentId})
  </select>
  <select id="selectlistByCondition" resultType="com.whyc.pojo.ExperimentWindingStep1">
    SELECT
    *
    FROM
    `db_3.5mw_web`.`tb_experiment_winding_step1` WHERE step =#{step} AND rz_link =#{rzLink}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
    delete from tb_experiment_winding_step1