src/main/java/com/whyc/controller/WindingExperimentController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/ExperimentWindingStep2Mapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WindingExperimentService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/ExperimentWindingStep1Mapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/ExperimentWindingStep2Mapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/WindingExperimentController.java
@@ -1,5 +1,6 @@ package com.whyc.controller; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.pojo.Experiment; import com.whyc.pojo.ExperimentWindingStep1; @@ -8,6 +9,7 @@ import com.whyc.service.WindingExperimentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,15 +20,7 @@ @Api(tags = "绕组试验") public class WindingExperimentController { /** * 绕组试验 * winding * 电流 电压 * Current * 电阻 * * 温度 */ @Autowired private WindingExperimentService service; @@ -88,4 +82,41 @@ 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") @ApiOperation(value = "删除绕组实验数据",notes = "根据唯一试验编号删除试验数据") public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId){ return service.delExperimentWindingbyId(experimentId); } @PostMapping("updateWindingStep1") @ApiOperation(value = "编辑试验数据1",notes = "根据试验编号experimentId编辑试验数据") 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){ return service.updateExperimentWindingStep2(windingStep2s); } } src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
@@ -1,9 +1,12 @@ package com.whyc.mapper; import com.whyc.pojo.Experiment; import com.whyc.pojo.ExperimentWindingStep1; public interface ExperimentWindingStep1Mapper { import java.util.List; public interface ExperimentWindingStep1Mapper extends CustomMapper<ExperimentWindingStep1>{ int deleteByPrimaryKey(Integer id); int insert(ExperimentWindingStep1 record); @@ -15,4 +18,9 @@ int updateByPrimaryKeySelective(ExperimentWindingStep1 record); int updateByPrimaryKey(ExperimentWindingStep1 record); int delExperimentWindingbyId(String experimentId); //根据experiment_id编辑试验数据 int updateById(ExperimentWindingStep1 windingStep1); } src/main/java/com/whyc/mapper/ExperimentWindingStep2Mapper.java
@@ -1,9 +1,10 @@ package com.whyc.mapper; import com.whyc.pojo.Experiment; import com.whyc.pojo.ExperimentWindingStep2; public interface ExperimentWindingStep2Mapper { public interface ExperimentWindingStep2Mapper extends CustomMapper<ExperimentWindingStep2>{ int deleteByPrimaryKey(Integer id); int insert(ExperimentWindingStep2 record); @@ -15,4 +16,9 @@ int updateByPrimaryKeySelective(ExperimentWindingStep2 record); int updateByPrimaryKey(ExperimentWindingStep2 record); int delExperimentWindingbyId(String experimentId); //根据experiment_id编辑试验数据 int updateById(ExperimentWindingStep2 windingStep2); } src/main/java/com/whyc/service/WindingExperimentService.java
@@ -1,6 +1,8 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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; @@ -141,4 +143,177 @@ } public Response delExperimentWindingbyId(String experimentId) { try { mapper1.delExperimentWindingbyId(experimentId); mapper2.delExperimentWindingbyId(experimentId); } catch (Exception e) { e.printStackTrace(); return new Response().setMsg(0, "删除失败"); } return new Response().setMsg(1, "删除成功"); } /** * 根据 experimentId 编辑参数 * @param windingStep1s * @return */ public Response updateExperimentWindingStep1(List<ExperimentWindingStep1> windingStep1s) { boolean bl = true; TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); if (windingStep1s != null && windingStep1s.size() > 0) { for (int i = 0; i < windingStep1s.size(); i++) { try { ExperimentWindingStep1 windingStep1 = windingStep1s.get(i); if (mapper1.updateById(windingStep1) > 0) { bl = true; } else { bl = false; } } catch (Exception e) { e.printStackTrace(); dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } } if (bl) { dataSourceTransactionManager.commit(transactionStatus); return new Response().setMsg(1, "修改成功"); } else { dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } /** * 根据 experiment_id 编辑试验数据 * @param windingStep2s * @return */ public Response updateExperimentWindingStep2(List<ExperimentWindingStep2> windingStep2s) { boolean bl = true; TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); if (windingStep2s != null && windingStep2s.size() > 0) { for (int i = 0; i < windingStep2s.size(); i++) { try { ExperimentWindingStep2 windingStep2 = windingStep2s.get(i); if (mapper2.updateById(windingStep2) > 0) { bl = true; } else { bl = false; } } catch (Exception e) { e.printStackTrace(); dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } } if (bl) { dataSourceTransactionManager.commit(transactionStatus); return new Response().setMsg(1, "修改成功"); } else { dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } /** * 根据唯一ID编辑实验数据1 * @param windingStep1s * @return */ public Response updateExperimentWindingStep1ById(List<ExperimentWindingStep1> windingStep1s) { boolean bl = true; TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); if (windingStep1s != null && windingStep1s.size() > 0) { for (int i = 0; i < windingStep1s.size(); i++) { try { ExperimentWindingStep1 windingStep1 = windingStep1s.get(i); if (mapper1.updateByPrimaryKey(windingStep1) > 0) { bl = true; } else { bl = false; } } catch (Exception e) { e.printStackTrace(); dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } } if (bl) { dataSourceTransactionManager.commit(transactionStatus); return new Response().setMsg(1, "修改成功"); } else { dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } public Response updateExperimentWindingStep2ById(List<ExperimentWindingStep2> windingStep2s) { boolean bl = true; TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); if (windingStep2s != null && windingStep2s.size() > 0) { for (int i = 0; i < windingStep2s.size(); i++) { try { ExperimentWindingStep2 windingStep2 = windingStep2s.get(i); if (mapper2.updateByPrimaryKey(windingStep2) > 0) { bl = true; } else { bl = false; } } catch (Exception e) { e.printStackTrace(); dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } } if (bl) { dataSourceTransactionManager.commit(transactionStatus); return new Response().setMsg(1, "修改成功"); } else { dataSourceTransactionManager.rollback(transactionStatus); //事务回滚 return new Response().setMsg(0, "修改失败"); } } /** * 实验数据1 * @param pageNum * @param pageSize * @return */ public Response getExperimentWindingStep1(int pageNum, int pageSize) { PageHelper.startPage(pageNum, pageSize); List<ExperimentWindingStep1> list = mapper1.selectList(null); PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list); return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo); } /** * 实验数据2 * @param pageNum * @param pageSize * @return */ public Response getExperimentWindingStep2(int pageNum, int pageSize) { PageHelper.startPage(pageNum, pageSize); List<ExperimentWindingStep2> list = mapper2.selectList(null); PageInfo<ExperimentWindingStep2> pageInfo = new PageInfo<>(list); return new Response<PageInfo<ExperimentWindingStep2>>().set(1, pageInfo); } } src/main/resources/mapper/ExperimentWindingStep1Mapper.xml
@@ -27,7 +27,11 @@ delete from tb_experiment_winding_step1 where id = #{id,jdbcType=INTEGER} </delete> <insert id="insert" parameterType="com.whyc.pojo.ExperimentWindingStep1"> <delete id="delExperimentWindingbyId"> delete from tb_experiment_winding_step1 where experiment_id = #{experimentId,jdbcType=INTEGER} </delete> <insert id="insert" parameterType="com.whyc.pojo.ExperimentWindingStep1"> insert into tb_experiment_winding_step1 (id, winding, electric_current, vol, resistance, temperature, save_time, experiment_id, `status`, @@ -150,4 +154,18 @@ note = #{note,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} </update> <update id="updateById"> update tb_experiment_winding_step1 set winding = #{winding,jdbcType=VARCHAR}, electric_current = #{electricCurrent,jdbcType=FLOAT}, vol = #{vol,jdbcType=FLOAT}, resistance = #{resistance,jdbcType=FLOAT}, temperature = #{temperature,jdbcType=FLOAT}, save_time = #{saveTime,jdbcType=TIMESTAMP}, experiment_id = #{experimentId,jdbcType=VARCHAR}, `status` = #{status,jdbcType=BOOLEAN}, note = #{note,jdbcType=VARCHAR} where experiment_id = #{experimentId,jdbcType=VARCHAR} </update> </mapper> src/main/resources/mapper/ExperimentWindingStep2Mapper.xml
@@ -27,7 +27,11 @@ delete from tb_experiment_winding_step2 where id = #{id,jdbcType=INTEGER} </delete> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.whyc.pojo.ExperimentWindingStep2" useGeneratedKeys="true"> <delete id="delExperimentWindingbyId"> delete from tb_experiment_winding_step2 where experiment_id = #{experimentId,jdbcType=INTEGER} </delete> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.whyc.pojo.ExperimentWindingStep2" useGeneratedKeys="true"> insert into tb_experiment_winding_step2 (winding, electric_current, vol, resistance, temperature, save_time, experiment_id, `status`, note @@ -144,4 +148,19 @@ note = #{note,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} </update> <update id="updateById"> update tb_experiment_winding_step2 set winding = #{winding,jdbcType=VARCHAR}, electric_current = #{electricCurrent,jdbcType=FLOAT}, vol = #{vol,jdbcType=FLOAT}, resistance = #{resistance,jdbcType=FLOAT}, temperature = #{temperature,jdbcType=FLOAT}, save_time = #{saveTime,jdbcType=TIMESTAMP}, experiment_id = #{experimentId,jdbcType=VARCHAR}, `status` = #{status,jdbcType=BOOLEAN}, note = #{note,jdbcType=VARCHAR} where experiment_id = #{experimentId,jdbcType=VARCHAR} </update> </mapper>