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/Devstate_usrController.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/Devstate_usrController.java b/src/main/java/com/fgkj/controller/Devstate_usrController.java
index c0dfdfb..54bc5ed 100644
--- a/src/main/java/com/fgkj/controller/Devstate_usrController.java
+++ b/src/main/java/com/fgkj/controller/Devstate_usrController.java
@@ -7,57 +7,65 @@
 import com.fgkj.dto.User_inf;
 import com.fgkj.services.Devstate_usrService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 @RequestMapping("devStateUsr")
 @RestController
-@Api
+@Api(tags = "devStateUsr鎺ュ彛")
 public class Devstate_usrController{
 
-	@Autowired
+	@Resource
 	private Devstate_usrService service;
 
 	//娣诲姞
 	@PostMapping("/")
+	@ApiOperation(notes = "uid 浠巗ession涓幏鍙� { \"dev_id\": 0, \"battgroupid\": 0, \"batt_index\": 0, \"stationname\": \"\", \"battgroupname\": \"\" }",value="娣诲姞")
 	public ServiceModel add(@RequestBody Devstate_usr dev_usr) {
-		// Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
 		User_inf uinf = (User_inf)ActionUtil.getUser();
-		dev_usr.setUid(uinf.getUId());
+		dev_usr.setuId(uinf.getuId());
 		ServiceModel model=service.add(dev_usr);
 
 		return model;
 		
 	}
-    
+
 	//淇敼
+	@PutMapping("/")
+	@ApiOperation(notes = "uid 浠巗ession涓幏鍙� 淇敼鏉′欢uid dev_id { \"dev_id\": 0, \"battgroupid\": 0, \"batt_index\": 0, \"stationname\": \"\", \"battgroupname\": \"\" }",value="淇敼")
 	public ServiceModel update(@RequestBody Devstate_usr dev_usr) {
 		// Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
 		User_inf uinf = (User_inf)ActionUtil.getUser();
-		dev_usr.setUid(uinf.getUId());
+		dev_usr.setuId(uinf.getuId());
 		ServiceModel model=service.update(dev_usr);
 
 		return model;
 		
 	}
 	//鍒犻櫎
-	public ServiceModel del(@RequestBody Devstate_usr dev_usr) {
-		User_inf uinf = (User_inf)ActionUtil.getUser();
-		// Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
-		dev_usr.setUid(uinf.getUId());
-		ServiceModel model=service.del(dev_usr);
+	@DeleteMapping("/")
+	@ApiOperation(notes = "",value="鍒犻櫎")
+	public ServiceModel del(@RequestParam Integer dev_id,@RequestParam Integer battgroupid) {
+		Devstate_usr dev_usr = new Devstate_usr();
+		User_inf uinf = (User_inf) ActionUtil.getUser();
+		dev_usr.setuId(uinf.getuId());
+		dev_usr.setDev_id(dev_id);
+		dev_usr.setBattgroupid(battgroupid);
+		ServiceModel model = service.del(dev_usr);
 
 		return model;
-		
+
 	}
 	//鏍规嵁鐢ㄦ埛id鏌ヨ
+	@PostMapping("byCondition")
+	@ApiOperation(notes = "鏍规嵁session涓殑鐢ㄦ埛id鏌ヨ",value="鐢ㄦ埛id鏌ヨ")
 	public ServiceModel serchByCondition() {
 		User_inf uinf = (User_inf)ActionUtil.getUser();
 		Devstate_usr dev_usr = new Devstate_usr();
-		dev_usr.setUid(uinf.getUId());
+		dev_usr.setuId(uinf.getuId());
 		ServiceModel model=service.serchByCondition(dev_usr);
 
 		return model;

--
Gitblit v1.9.1