From 8c189b243bfbbacb2ab1ce79f4e1ff22708f125a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 26 七月 2021 16:45:09 +0800
Subject: [PATCH] 修复接口
---
src/main/java/com/whyc/controller/ExperimentController.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ExperimentController.java b/src/main/java/com/whyc/controller/ExperimentController.java
index 819fcab..cb3626c 100644
--- a/src/main/java/com/whyc/controller/ExperimentController.java
+++ b/src/main/java/com/whyc/controller/ExperimentController.java
@@ -6,6 +6,7 @@
import com.whyc.pojo.Experiment;
import com.whyc.pojo.ExperimentBaseData;
import com.whyc.pojo.ExperimentBaseDataKZ;
+import com.whyc.pojo.ExperimentPoint;
import com.whyc.service.ExperimentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,12 @@
@Autowired
private ExperimentService service;
+
+ @GetMapping("exist")
+ @ApiOperation(value = "鏌ヨ褰撳墠鏄惁鏈夋鍦ㄨ繘琛岀殑璇曢獙",notes = "濡傛灉鏈�,code=1,杩斿洖璇曢獙鐨勫熀纭�鏁版嵁;濡傛灉娌℃湁,code=-1")
+ public Response exist(){
+ return service.exist();
+ }
@GetMapping("experimentId")
@ApiOperation(value = "鏌ヨ褰撳墠璇曢獙缂栧彿",notes = "浼犲叆鐨則ype閫夋嫨鍏朵竴:" +
@@ -35,23 +42,76 @@
return service.getExperimentId(type);
}
- @PostMapping
- @ApiOperation(value = "鏂板璇曢獙-绌鸿浇")
- public Response addKZ(@RequestBody Experiment<ExperimentBaseDataKZ> experiment){
- return service.addKZ(experiment);
+ @PostMapping("kzfz")
+ @ApiOperation(value = "鏂板璇曢獙-绌鸿浇/璐熻浇")
+ public Response addKZFZ(@RequestBody Experiment<ExperimentBaseDataKZ, ExperimentPoint> experiment){
+ return service.addKZFZ(experiment);
}
- @GetMapping
- @ApiOperation(value = "鏌ヨ璇曢獙-绌鸿浇")
- public Response<Experiment<ExperimentBaseDataKZ>> add(){
- return null;
+ @GetMapping("checkPrecondition")
+ @ApiOperation(value = "妫�鏌ュ墠缃潯浠�",notes = "浼犲叆鐨則ype閫夋嫨鍏朵竴:" +
+ "缁曠粍:rz,\n" +
+ "绌鸿浇:kz,\n" +
+ "璐熻浇:fz,\n" +
+ "鍗囨俯:sw,\n" +
+ "瓒呴��:cs,\n" +
+ "绌鸿浇鍙嶇數鍔ㄥ娍:kzfdds,\n" +
+ "鎸姩:zd,\n" +
+ "鑰愬帇:ny,\n" +
+ "杞姩鎯噺:zdgl,\n")
+ public Response checkPrecondition(@RequestParam String type){
+ return service.checkPrecondition(type);
}
+ @PutMapping("precondition")
+ @ApiOperation(value = "璁剧疆鍓嶇疆鏉′欢",notes = "id:杩涚嚎灞忓紑鍏崇姸鎬�-1,澶у姛鐜囨暣娴佺數婧�-2,..." +
+ "value:寮�鍏充俊鍙�:鍏�-0,寮�-1,鏁板�间俊鍙�:鐢垫簮-寮�-500-鍏�-400,A鎺�-寮�-500-鍏�-400,B鎺�-寮�-0-鍏�-100")
+ public Response setPrecondition(@RequestParam Integer id,@RequestParam Integer value){
+ return service.setPrecondition(id,value);
+ }
+ /**
+ * 寮�濮嬭瘯楠�,璇锋眰鎺ュ彛1,鑾峰彇璇曢獙娴嬭瘯鐐�
+ */
+ @GetMapping("point")
+ @ApiOperation(value = "鏌ヨ娴嬭瘯鐐瑰垪琛�")
+ public Response getPoint(@RequestParam String experimentId){
+ return service.getPoint(experimentId);
+ }
+ /**
+ * 寮�濮嬭瘯楠�,妫�鏌ヤ腑缃潯浠�
+ * @return
+ */
+ @GetMapping("checkPreconditionStep1")
+ @ApiOperation(value = "姝ラ1,妫�鏌ュ崌娓╂儏鍐�")
+ public Response checkPreconditionStep1(@RequestParam String experimentId){
+ return service.checkPreconditionStep1(experimentId);
+ }
+ @PostMapping("startExperimentPoint")
+ @ApiOperation(value = "鍚姩娴嬭瘯鐐�",notes = "浼犲叆id,duration")
+ public Response StartExperimentPoint(@RequestBody ExperimentPoint point){
+ return service.startExperimentPoint(point);
+ }
+ @PostMapping("finishExperiment")
+ @ApiOperation(value = "瀹屾垚瀹為獙")
+ public Response finishExperiment(@RequestParam String experimentId){
+ return service.finishExperiment(experimentId);
+ }
+ @PostMapping("finishExperimentPoint")
+ @ApiOperation(value = "缁撴潫娴嬭瘯鐐�")
+ public Response finishExperimentPoint(@RequestParam Integer id){
+ return service.finishExperimentPoint(id);
+ }
+
+ @PostMapping("restartExperimentPoint")
+ @ApiOperation(value = "閲嶅仛娴嬭瘯鐐�")
+ public Response restartExperimentPoint(@RequestParam Integer id){
+ return service.restartExperimentPoint(id);
+ }
/*======History======*/
--
Gitblit v1.9.1