src/main/java/com/whyc/controller/WindingExperimentController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/ExperimentWindingStep1.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WindingExperimentService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/WindingExperimentController.java
@@ -94,9 +94,9 @@ @DeleteMapping("delRZExperiment") @ApiOperation(value = "删除绕组实验数据",notes = "根据唯一试验编号删除试验数据") public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId){ public Response delExperimentWindingbyId(@ApiParam(value = "试验编号",required = true) @RequestParam String experimentId,@ApiParam(value = "唯一标识",required = true) @RequestParam String uuid){ return service.delExperimentWindingbyId(experimentId); return service.delExperimentWindingbyId(experimentId,uuid); } @PostMapping("updateRZStep") src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
@@ -3,6 +3,7 @@ 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; @@ -35,4 +36,21 @@ //完成试验 @Update("update `db_3.5mw_web`.`tb_experiment_winding_step1` set status =2 where experiment_id=#{id} ") int updateFlag(String id); //根据 uuid 删除试验数据 @Delete(" delete from tb_experiment_winding_step1 where experiment_id=#{experimentId} and uuid = #{uuid}") int delExperimentWindingbyUuid(String experimentId, String uuid); //根据 uuid 编辑试验数据 @Update(" update `db_3.5mw_web`.tb_experiment_winding_step1\n" + " set\n" + " electric_current = #{electricCurrent},\n" + " vol = #{vol},\n" + " resistance = #{resistance},\n" + " save_time = #{saveTime},\n" + " temperature = #{temperature}\n" + " WHERE\n" + " index_id = #{indexId} AND\n" + " uuid = #{uuid}") int updateByUuidAndIndex(ExperimentWindingStep1 windingStep1); } src/main/java/com/whyc/pojo/ExperimentWindingStep1.java
@@ -23,6 +23,8 @@ @ApiModelProperty("唯一标识") private Integer indexId; @ApiModelProperty("唯一标识") private String uuid; /** * 绕组编号 测绕组引线(多个);测各相绕组引线(单个) */ @@ -99,6 +101,14 @@ this.indexId = indexId; } public String getUuid() { return uuid; } public void setUuid(String uuid) { this.uuid = uuid; } public String getWinding() { return winding; } src/main/java/com/whyc/service/WindingExperimentService.java
@@ -13,9 +13,11 @@ import org.springframework.transaction.TransactionStatus; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @Service public class WindingExperimentService { @@ -94,6 +96,7 @@ try { for (int i = 0; i < list.size(); i++) { ExperimentWindingStep1 windingStep1 = list.get(i); windingStep1.setUuid("rz"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())); windingStep1.setSaveTime(new Date()); windingStep1.setDeviceId(experiment.getDeviceId());//存设备类型 windingStep1.setRealName(realName); //测试人 @@ -175,11 +178,21 @@ } public Response delExperimentWindingbyId(String experimentId) { public Response delExperimentWindingbyId(String experimentId,String uuid) { QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>(); wrapper.eq("experiment_id",experimentId); wrapper.eq("uuid",uuid); List<ExperimentWindingStep1> list = mapper1.selectList(wrapper); if (list == null) { // System.out.println(" null "); return new Response().setMsg(0, "删除失败,请查检参数是否正确"); }else { // System.out.println("list = " + list.size()); } try { mapper.deleteById(experimentId); mapper1.delExperimentWindingbyId(experimentId); mapper1.delExperimentWindingbyUuid(experimentId,uuid); } catch (Exception e) { e.printStackTrace(); return new Response().setMsg(0, "删除失败"); @@ -204,7 +217,7 @@ try { ExperimentWindingStep1 windingStep1 = windingStep1s.get(i); windingStep1.setSaveTime(saveTime); if (mapper1.updateByIdandIndex(windingStep1) > 0) { if (mapper1.updateByUuidAndIndex(windingStep1) > 0) { bl = true; } else { bl = false;