绕组实验更新接口

whycrzg

2021-05-21 06fc824fdbd64b7221656a7b591b39fd5ccacc1f

绕组实验更新接口

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

@@ -57,61 +57,62 @@
    }

    @PostMapping("")
    @ApiOperation(value = "开始实验",notes = "试验编号唯一，接口 experimentId 获取")
    @ApiOperation(value = "开始实验",notes = "试验编号唯一，接口 experimentId 获取  {\n" +
            "  \"id\": \"\",\n" +
            "  \"name\": \"\",\n" +
            "  \"type\": \"\",\n" +
            "  \"projectId\": 0,\n" +
            "  \"deviceSn\": \"\",\n" +
            "  \"deviceId\": \"\",\n" +
            "  \"rz_link\": 0,\n" +
            "  \"startTime\": \"2021-05-21 10:54:25\",\n" +
            "  \"endTime\": \"2021-05-21 10:54:25\",\n" +
            "  \"duration\": \"\",\n" +
            "  \"userId\": 0,\n" +
            "  \"username\": \"\",\n" +
            "  \"createTime\": \"2021-05-21 10:54:25\",\n" +
            "  \"status\": 0\n" +
            "}")
    public Response addWindingExperiment(@RequestBody Experiment experiment){

        return service.addWindingExperiment(experiment);
    }

    @GetMapping("getRZStep")
    @ApiOperation(value = "实验数据",notes = "step参数 1 2 对应实验步骤1、2 ")
    public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@RequestParam int step,@RequestParam int pageNum, @RequestParam int pageSize){

    @PostMapping("saveWindingStep1")
    @ApiOperation(value = "保存数据 实验步骤1",notes = "")
        return service.getExperimentWindingStep1(step,pageNum,pageSize);
    }


    @PostMapping("saveRZStep")
    @ApiOperation(value = "保存数据",notes = "step参数 1 2 对应实验步骤1、2 ")
    public Response addExperimentWindingStep1(@RequestBody List<ExperimentWindingStep1> windingStep1s){

        return service.addExperimentWindingStep1(windingStep1s);
    }
    @PostMapping("saveWindingStep2")
    @ApiOperation(value = "保存数据 实验步骤2",notes = "")
    public Response addExperimentWindingStep2(@RequestBody List<ExperimentWindingStep2> windingStep2s){

        return service.addExperimentWindingStep2(windingStep2s);
    }

    @GetMapping("getWindingStep1")
    @ApiOperation(value = "实验数据1")
    public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@RequestParam int pageNum, @RequestParam int pageSize){

        return service.getExperimentWindingStep1(pageNum,pageSize);
    }

    @GetMapping("getWindingStep2")
    @ApiOperation(value = "实验数据2")
    public Response<PageInfo<ExperimentWindingStep2>> getExperimentWindingStep2(@RequestParam int pageNum, @RequestParam int pageSize){

        return service.getExperimentWindingStep2(pageNum,pageSize);
    }


    @DeleteMapping("delExperimentWinding")
    @DeleteMapping("delRZExperiment")
    @ApiOperation(value = "删除绕组实验数据",notes = "根据唯一试验编号删除试验数据")
    public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId){

        return service.delExperimentWindingbyId(experimentId);
    }

    @PostMapping("updateWindingStep1")
    @ApiOperation(value = "编辑试验数据1",notes = "根据试验编号experimentId编辑试验数据")
    @PostMapping("updateRZStep")
    @ApiOperation(value = "编辑试验数据",notes = "根据试验编号experimentId编辑试验数据 step参数 1 2 对应实验步骤1、2")
    public Response updateExperimentWindingStep1ById(@RequestBody List<ExperimentWindingStep1> windingStep1s){

        return service.updateExperimentWindingStep1(windingStep1s);
    }


    @PostMapping("updateWindingStep2")
    @ApiOperation(value = "编辑试验数据2",notes = "根据试验编号experimentId编辑试验数据")
    public Response updateExperimentWindingStep2ById(@RequestBody List<ExperimentWindingStep2> windingStep2s){
    @PostMapping("updateFlag")
    @ApiOperation(value = "完成试验")
    public Response updateFlag(@ApiParam(value = "试验编号", required = true) @RequestParam String id) {

        return service.updateExperimentWindingStep2(windingStep2s);
        return service.updateFlag(id);
    }

}

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

@@ -8,4 +8,6 @@
public interface ExperimentMapper extends CustomMapper<Experiment>{
    List<Experiment> getPage(ExperimentConditionDTO condition);

    int updateFlag(Experiment experiment);

}

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

@@ -30,6 +30,9 @@
    private String deviceSn;
    @ApiModelProperty("被测设备id")
    private String deviceId;

    @ApiModelProperty("各相绕组连接情况 0 引出; 1 内部连接")
    private Integer rz_link;
    @ApiModelProperty("启动时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date startTime;
@@ -105,6 +108,14 @@
        this.deviceId = deviceId;
    }

    public Integer getRz_link() {
        return rz_link;
    }

    public void setRz_link(Integer rz_link) {
        this.rz_link = rz_link;
    }

    public Date getStartTime() {
        return startTime;
    }

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

@@ -71,6 +71,9 @@
    @ApiModelProperty("设备类型")
    private String deviceId;

    @ApiModelProperty("实验步骤")
    private Integer step;

    private String note;

    private static final long serialVersionUID = 1L;
@@ -163,6 +166,14 @@
        this.deviceId = deviceId;
    }

    public Integer getStep() {
        return step;
    }

    public void setStep(Integer step) {
        this.step = step;
    }

    public String getNote() {
        return note;
    }

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

@@ -61,12 +61,19 @@
    }

    /**
     * 绕组实验步骤1
     * 绕组实验步骤 step参数 1 2 对应实验步骤1、2
     * @param list
     * @return
     */
    public Response<Object> addExperimentWindingStep1(List<ExperimentWindingStep1> list) {
        Boolean flag = true;
        if (list != null) {
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep1 experimentWindingStep1 = list.get(i);
                experimentWindingStep1.setSaveTime(new Date());
                list.set(i, experimentWindingStep1);
            }
        }
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            for (int i = 0; i < list.size(); i++) {
@@ -99,6 +106,13 @@
     */
    public Response<Object> addExperimentWindingStep2(List<ExperimentWindingStep2> list) {
        Boolean flag = true;
        if (list != null) {
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep2 experimentWindingStep2 = list.get(i);
                experimentWindingStep2.setSaveTime(new Date());
                list.set(i, experimentWindingStep2);
            }
        }
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            for (int i = 0; i < list.size(); i++) {
@@ -153,6 +167,7 @@

    /**
     * 根据 experimentId 编辑参数
     * step参数 1 2 对应实验步骤1、2
     * @param windingStep1s
     * @return
     */
@@ -279,17 +294,19 @@
    }

    /**
     * 实验数据1
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(int step, int pageNum, int pageSize) {

        PageHelper.startPage(pageNum, pageSize);
        List<ExperimentWindingStep1> list = mapper1.selectList(null);
//        mapper.getRealNameById();
//        mapper.getdeviceIdById();
        QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
        wrapper.eq("step",step);
        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }
@@ -328,4 +345,31 @@
        }
        return response;
    }


    /**
     * 状态:-1-取消,0-未开始,1-进行中,2-完成
     *      * 不对controller接口提供取消功能
     * @param id
     * @return
     */
    public Response updateFlag(String id) {
        Response<Object> response = new Response<>();
        QueryWrapper<Experiment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id",id);
        Experiment experiment1 = mapper.selectOne(queryWrapper);
        if (experiment1 ==null){
            response.setMsg(0,"试验编号有误");
        }
        try {
            Experiment experiment = new Experiment<>();
            experiment.setId(id);
            experiment.setEndTime(new Date());
            mapper.updateFlag(experiment);
        } catch (Exception e) {
            e.printStackTrace();
            response.setMsg(0,"更新失败");
        }
        return response.setMsg(1,"更新成功");
    }
}

 src/main/resources/mapper/ExperimentMapper.xml

@@ -23,4 +23,8 @@
        and status = 2
    </select>

    <update id="updateFlag" parameterType="com.whyc.pojo.Experiment">
        UPDATE `db_3.5mw_web`.`tb_experiment` SET `end_time`=#{endTime},`status`='2' WHERE id=#{id};
    </update>

</mapper>