From 06fc824fdbd64b7221656a7b591b39fd5ccacc1f Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期五, 21 五月 2021 11:24:50 +0800
Subject: [PATCH] 绕组实验更新接口
---
src/main/java/com/whyc/service/WindingExperimentService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/WindingExperimentService.java b/src/main/java/com/whyc/service/WindingExperimentService.java
index 3cbb4bc..4c2ae3c 100644
--- a/src/main/java/com/whyc/service/WindingExperimentService.java
+++ b/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,"鏇存柊鎴愬姛");
+ }
}
--
Gitblit v1.9.1