From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/Dev_paramController.java |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/Dev_paramController.java b/src/main/java/com/fgkj/controller/Dev_paramController.java
index 9d84619..e2eab92 100644
--- a/src/main/java/com/fgkj/controller/Dev_paramController.java
+++ b/src/main/java/com/fgkj/controller/Dev_paramController.java
@@ -9,22 +9,26 @@
 import com.fgkj.services.Dev_paramService;
 import com.fgkj.services.User_logService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+
 @RequestMapping("devParam")
 @RestController
-@Api
+@Api(tags = "devParam鎺ュ彛")
 public class Dev_paramController{
 
-	@Autowired
+	@Resource
 	private Dev_paramService service;
-	@Autowired
+	@Resource
 	private User_logService uservice;
 
 	
 	//淇敼鎵�鏈夎澶囩殑鎵�鏈夌殑鍛婅鍙傛暟
 	@PutMapping("/")
+	@ApiOperation(notes = "鏉′欢 where dev_id=? and alm_id=?",value="淇敼鎵�鏈夎澶囩殑鎵�鏈夌殑鍛婅鍙傛暟")
 	public ServiceModel update(@RequestBody Dev_param dparam){
 		// Dev_param dparam=ActionUtil.getGson().fromJson(json, Dev_param.class);
 		ServiceModel model=service.update(dparam);
@@ -38,39 +42,48 @@
 	}
 	 //鏌ヨ鎵�鏈夎澶囩殑鎵�鏈夌殑鍛婅鍙傛暟
 	@GetMapping("all")
+	@ApiOperation(notes = "",value="鏌ヨ鎵�鏈夎澶囩殑鎵�鏈夌殑鍛婅鍙傛暟")
 	public ServiceModel searchAll(){
 		ServiceModel model=service.searchAll();
 
 		return model;
 	}
 	//鏍规嵁璁惧id鍜屽憡璀︾被鍨嬫煡璁惧鍛婅鍙傛暟
-	@GetMapping("byCondition")
-	public ServiceModel serchByCondition(@RequestBody Dev_param dparam){
-		// Dev_param dparam=ActionUtil.getGson().fromJson(json, Dev_param.class);
-		ServiceModel model=service.serchByCondition(dparam);
+	@PostMapping("byCondition")
+	@ApiOperation(notes = "",value="璁惧id鍜屽憡璀︾被鍨嬫煡璁惧鍛婅鍙傛暟")
+	public ServiceModel serchByCondition(@RequestParam Integer dev_id,@RequestParam Integer alm_id) {
+		Dev_param dparam = new Dev_param();
+		dparam.setDev_id(dev_id);
+		dparam.setAlm_id(alm_id);
+		ServiceModel model = service.serchByCondition(dparam);
 
 		return model;
 	}
 	//鏌ヨ鎵�鏈夊瓨鍦ㄨ澶囧憡璀﹀弬鏁扮殑鏈烘埧
 	@GetMapping("allDevId")
+	@ApiOperation(notes = "",value="鏌ヨ鎵�鏈夊瓨鍦ㄨ澶囧憡璀﹀弬鏁扮殑鏈烘埧")
 	public ServiceModel serchAllDevId(){
 		ServiceModel model=service.serchAllDevId();
 
 		return model;
 	}
 	//鏍规嵁璁惧id鏌ヨ璁惧瀵瑰簲鐨勫憡璀﹀弬鏁扮绫�
-	@GetMapping("byInfo")
-	public ServiceModel serchByInfo(@RequestBody Dev_param dparam){
-		// Dev_param dparam=ActionUtil.getGson().fromJson(json, Dev_param.class);
-		ServiceModel model=service.serchByInfo(dparam);
+	@PostMapping("byInfo")
+	@ApiOperation(notes = "",value="璁惧id鏌ヨ璁惧瀵瑰簲鐨勫憡璀﹀弬鏁扮绫�")
+	public ServiceModel serchByInfo(@RequestParam Integer dev_id) {
+		Dev_param dparam = new Dev_param();
+		dparam.setDev_id(dev_id);
+		ServiceModel model = service.serchByInfo(dparam);
 
 		return model;
 	}
 	 //鏍规嵁璁惧id鏌ヨ璁惧鎵�鏈夌殑鍙傛暟
-	@GetMapping("paramById")
-	public ServiceModel serchParamById(@RequestBody Dev_param dparam){
-		// Dev_param dparam=ActionUtil.getGson().fromJson(json, Dev_param.class);
-		ServiceModel model=service.serchParamById(dparam);
+	@PostMapping("paramById")
+	@ApiOperation(notes = "",value="璁惧id鏌ヨ璁惧鎵�鏈夌殑鍙傛暟")
+	public ServiceModel serchParamById(@RequestParam Integer dev_id) {
+		Dev_param dparam = new Dev_param();
+		dparam.setDev_id(dev_id);
+		ServiceModel model = service.serchParamById(dparam);
 
 		return model;
 	}

--
Gitblit v1.9.1