绕组实验更新接口

whycrzg

2021-05-21 eb2441afaa201e0a5cfdbadfd5945dafc7e0ff39

绕组实验更新接口

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

@@ -49,52 +49,29 @@
        return service.getProjectName();
    }

    @GetMapping("getRealName")
    @ApiOperation(value = "获取测试名")
    public Response<Object> getRealName(@ApiParam(value = "用户登录名",required = true)@RequestParam String name){

        return service.getRealName(name);
    }

    @PostMapping("")
    @ApiOperation(value = "开始实验")
    @ApiOperation(value = "开始实验",notes = "试验编号唯一，接口 experimentId 获取")
    public Response addWindingExperiment(@RequestBody Experiment experiment){

        return service.addWindingExperiment(experiment);
    }
    @PostMapping("addWindingStep1")
    @ApiOperation(value = "实验步骤1",notes = "[\n" +
            "  {\n" +
            "    \"winding\": \"绕组1\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-19 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  },\n" +
            "  {\n" +
            "    \"winding\": \"绕组2\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-19 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  }\n" +
            "]")


    @PostMapping("saveWindingStep1")
    @ApiOperation(value = "保存数据 实验步骤1",notes = "")
    public Response addExperimentWindingStep1(@RequestBody List<ExperimentWindingStep1> windingStep1s){

        return service.addExperimentWindingStep1(windingStep1s);
    }
    @PostMapping("addWindingStep2")
    @ApiOperation(value = "实验步骤2",notes = "[\n" +
            "  {\n" +
            "    \"winding\": \"绕组\",\n" +
            "    \"electricCurrent\": 10.0,\n" +
            "    \"vol\": 10.0,\n" +
            "    \"resistance\": 20.0,\n" +
            "    \"temperature\": 10.0,\n" +
            "    \"saveTime\": \"2021-05-18 08:16:20\",\n" +
            "    \"experimentId\": \"RZ_20210518132332\",\n" +
            "    \"status\": 0\n" +
            "  }\n" +
            "]")
    @PostMapping("saveWindingStep2")
    @ApiOperation(value = "保存数据 实验步骤2",notes = "")
    public Response addExperimentWindingStep2(@RequestBody List<ExperimentWindingStep2> windingStep2s){

        return service.addExperimentWindingStep2(windingStep2s);

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

@@ -26,6 +26,11 @@
    @ApiModelProperty("绕组编号 测绕组引线(多个)；测各相绕组引线(单个)")
    private String winding;



    @ApiModelProperty("测试人")
    private String realName;

    /**
     * 电流(μA)
     */
@@ -63,6 +68,9 @@
    @ApiModelProperty("状态:0-未开始,1-进行中,2-已完成")
    private Integer status;

    @ApiModelProperty("设备类型")
    private String deviceId;

    private String note;

    private static final long serialVersionUID = 1L;
@@ -81,6 +89,14 @@

    public void setWinding(String winding) {
        this.winding = winding;
    }

    public String getRealName() {
        return realName;
    }

    public void setRealName(String realName) {
        this.realName = realName;
    }

    public Float getElectricCurrent() {
@@ -139,6 +155,14 @@
        this.status = status;
    }

    public String getDeviceId() {
        return deviceId;
    }

    public void setDeviceId(String deviceId) {
        this.deviceId = deviceId;
    }

    public String getNote() {
        return note;
    }

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

@@ -26,6 +26,9 @@
    @ApiModelProperty("绕组编号 测绕组引线(多个)；测各相绕组引线(单个)")
    private String winding;

    @ApiModelProperty("测试人")
    private String realName;

    /**
     * 电流(mA)
     */
@@ -63,6 +66,9 @@
    @ApiModelProperty("状态:0-未开始,1-进行中,2-已完成")
    private Integer status;

    @ApiModelProperty("设备类型")
    private String deviceId;

    private String note;

    private static final long serialVersionUID = 1L;
@@ -81,6 +87,14 @@

    public void setWinding(String winding) {
        this.winding = winding;
    }

    public String getRealName() {
        return realName;
    }

    public void setRealName(String realName) {
        this.realName = realName;
    }

    public Float getElectricCurrent() {
@@ -139,6 +153,14 @@
        this.status = status;
    }

    public String getDeviceId() {
        return deviceId;
    }

    public void setDeviceId(String deviceId) {
        this.deviceId = deviceId;
    }

    public String getNote() {
        return note;
    }

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

@@ -4,14 +4,8 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.ExperimentMapper;
import com.whyc.mapper.ExperimentWindingStep1Mapper;
import com.whyc.mapper.ExperimentWindingStep2Mapper;
import com.whyc.mapper.ProjectMapper;
import com.whyc.pojo.Experiment;
import com.whyc.pojo.ExperimentWindingStep1;
import com.whyc.pojo.ExperimentWindingStep2;
import com.whyc.pojo.Project;
import com.whyc.mapper.*;
import com.whyc.pojo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
@@ -41,6 +35,10 @@

    @Resource
    private ProjectMapper projectMapper;


    @Resource
    private UserMapper userMapper;

    /**
     * 绕组实验 开始实验
@@ -290,7 +288,8 @@

        PageHelper.startPage(pageNum, pageSize);
        List<ExperimentWindingStep1> list = mapper1.selectList(null);

//        mapper.getRealNameById();
//        mapper.getdeviceIdById();
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }
@@ -312,4 +311,21 @@
    }


    /**
     * 获取测试名
     * @param name
     * @return
     */
    public Response<Object> getRealName(String name) {
        Response<Object> response = new Response<>();
        QueryWrapper<User> wrapper = new QueryWrapper<>();
        wrapper.eq("name", name);
        User user = userMapper.selectOne(wrapper);
        if (null != user) {
            response.set(1, user.getRealName());
        }else{
            response.setMsg(0,"查询失败");
        }
        return response;
    }
}