From bf7833def6436a4100f15d179717190d9574666c Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期三, 26 五月 2021 09:34:13 +0800
Subject: [PATCH] 绕组实验更新接口
---
src/main/java/com/whyc/service/WindingExperimentService.java | 9 ++++-----
src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java | 4 +---
src/main/java/com/whyc/controller/WindingExperimentController.java | 7 +++++--
src/main/resources/mapper/ExperimentWindingStep1Mapper.xml | 3 ++-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WindingExperimentController.java b/src/main/java/com/whyc/controller/WindingExperimentController.java
index 582f228..a9914cd 100644
--- a/src/main/java/com/whyc/controller/WindingExperimentController.java
+++ b/src/main/java/com/whyc/controller/WindingExperimentController.java
@@ -78,9 +78,12 @@
@GetMapping("getRZStep")
@ApiOperation(value = "瀹為獙鏁版嵁",notes = "step鍙傛暟 1 2 瀵瑰簲瀹為獙姝ラ1銆�2 ")
- public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@RequestParam int rzLink,@RequestParam int step,@RequestParam int pageNum, @RequestParam int pageSize){
+ public Response<PageInfo<ExperimentWindingStep1>> getExperimentWindingStep1(@ApiParam(value = "璇曢獙缂栧彿",required = true)@RequestParam String experimentId ,
+ @ApiParam(value = "鍚勭浉缁曠粍杩炴帴鎯呭喌: 0 寮曞嚭; 1 鍐呴儴杩炴帴",required = true)@RequestParam int rzLink,
+ @ApiParam(value = "瀹為獙姝ラ: 1 瀹為獙姝ラ1; 2 瀹為獙姝ラ2",required = true)@RequestParam int step,
+ @RequestParam int pageNum, @RequestParam int pageSize){
- return service.getExperimentWindingStep1(rzLink,step,pageNum,pageSize);
+ return service.getExperimentWindingStep1(experimentId,rzLink,step,pageNum,pageSize);
}
diff --git a/src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java b/src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
index d94949f..ef14abe 100644
--- a/src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
+++ b/src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
@@ -1,12 +1,10 @@
package com.whyc.mapper;
-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;
import java.util.List;
@@ -31,7 +29,7 @@
//鏍规嵁璇曢獙ID鏌ヨ鍒皍id鍦╰b_user琛ㄦ煡璇eal_name
String getRealName(String experimentId);
- List<ExperimentWindingStep1> selectlistByCondition(@Param(value = "rzLink") int rzLink,@Param(value = "step") int step);
+ List<ExperimentWindingStep1> selectlistByCondition(@Param(value = "experimentId")String experimentId, @Param(value = "rzLink") int rzLink, @Param(value = "step") int step);
//瀹屾垚璇曢獙
int updateRzFlag(String id);
diff --git a/src/main/java/com/whyc/service/WindingExperimentService.java b/src/main/java/com/whyc/service/WindingExperimentService.java
index 5bb24d0..ca5c963 100644
--- a/src/main/java/com/whyc/service/WindingExperimentService.java
+++ b/src/main/java/com/whyc/service/WindingExperimentService.java
@@ -335,19 +335,18 @@
* 瀹為獙鏁版嵁 step鍙傛暟 1 2 瀵瑰簲瀹為獙姝ラ1銆�2
*
*
+ *
+ * @param experimentId
* @param rzLink
* @param step
* @param pageNum
* @param pageSize
* @return
*/
- public Response getExperimentWindingStep1(int rzLink, int step, int pageNum, int pageSize) {
+ public Response getExperimentWindingStep1(String experimentId, 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.selectlistByCondition(rzLink,step);
-// List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
+ List<ExperimentWindingStep1> list = mapper1.selectlistByCondition(experimentId,rzLink,step);
PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
}
diff --git a/src/main/resources/mapper/ExperimentWindingStep1Mapper.xml b/src/main/resources/mapper/ExperimentWindingStep1Mapper.xml
index 7611f4b..6b7409f 100644
--- a/src/main/resources/mapper/ExperimentWindingStep1Mapper.xml
+++ b/src/main/resources/mapper/ExperimentWindingStep1Mapper.xml
@@ -32,7 +32,8 @@
SELECT
*
FROM
- `db_3.5mw_web`.`tb_experiment_winding_step1` WHERE step =#{step} AND rz_link =#{rzLink}
+ `db_3.5mw_web`.`tb_experiment_winding_step1` WHERE step =#{step} AND rz_link =#{rzLink} AND experiment_id =
+ #{experimentId}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tb_experiment_winding_step1
--
Gitblit v1.9.1