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/User_task_changeController.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/User_task_changeController.java b/src/main/java/com/fgkj/controller/User_task_changeController.java
index 365d84a..fbbfbc7 100644
--- a/src/main/java/com/fgkj/controller/User_task_changeController.java
+++ b/src/main/java/com/fgkj/controller/User_task_changeController.java
@@ -1,24 +1,29 @@
 package com.fgkj.controller;
 
+import com.fgkj.util.*;
+
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.dto.Task_Batt_Test;
 import com.fgkj.dto.User_task_change;
 import com.fgkj.services.User_task_changeService;
-import com.opensymphony.xwork2.ActionSupport;
 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("userTaskChange")
 @RestController
-@Api
+@Api(tags = "userTaskChange鎺ュ彛")
 public class User_task_changeController{
 
-	@Autowired
+	@Resource
 	private User_task_changeService service;
 
 	//4.1浣滀笟鍙樻洿鐢宠
 	@PostMapping("/")
+	@ApiOperation(notes = "",value="浣滀笟鍙樻洿鐢宠")
 	public ServiceModel add(@RequestBody User_task_change utc) {
 		ServiceModel model=service.add(utc);
 		
@@ -26,6 +31,7 @@
 	}
 	//4.5浣滀笟鍙樻洿鏌ヨ(瀹℃壒)
 	@PutMapping("/")
+	@ApiOperation(notes = "",value="浣滀笟鍙樻洿鏌ヨ(瀹℃壒)")
 	public ServiceModel update(@RequestBody User_task_change utc) {
 		ServiceModel model=service.update(utc);
 		
@@ -33,14 +39,18 @@
 	}
 	//4.5浣滀笟鍙樻洿鏌ヨ(鍒犻櫎璁板綍)
 	@DeleteMapping("/")
-	public ServiceModel delete(@RequestBody User_task_change utc) {
+	@ApiOperation(notes = "",value="浣滀笟鍙樻洿鏌ヨ(鍒犻櫎璁板綍)")
+	public ServiceModel delete(@RequestParam Integer num) {
+		User_task_change utc = new User_task_change();
+		utc.setNum(num);
 		ServiceModel model=service.delete(utc);
 		
 		return model;
 	}
-	
+
 	//4.5浣滀笟鍙樻洿鏌ヨ
-	@GetMapping("byCondition")
+	@PostMapping("byCondition")
+	@ApiOperation(notes = "{ \"binf\": { \"stationName\": \"婀栧寳鐪�-姝︽眽甯�-涓滆タ婀栧尯-61850鏈烘埧-2G-2G-2\", \"stationName1\": \"婀栧寳鐪乗", \"battGroupId\": 0, \"battGroupName\": \"tt\", \"battGroupName1\": \"t\", \"monCapStd\": 150, \"monVolStd\": 2, \"battProducer\": \"鐞嗗+\" },\"uchange\": { \"usr_id\": 0, \"change_type_id\": 0, \"task_type_id\": 0, \"task_change_approve_res\": 0, \"change_ask_time\": \"2001-01-23 08:14:23\", \"change_ask_time1\": \"2021-01-23 08:14:23\" },\"pageBean\": { \"pageSize\": 11, \"pageNum\": 0 } }",value="浣滀笟鍙樻洿鏌ヨ")
     public ServiceModel serchByCondition(@RequestBody Task_Batt_Test tbt){
     	ServiceModel model=service.serchByCondition(tbt);
 		
@@ -49,10 +59,11 @@
     
     //鏌ヨ鎵�鏈�
 	@GetMapping("all")
+	@ApiOperation(notes = "鏈疄鐜�",value="鏌ヨ鎵�鏈�")
     public ServiceModel searchAll(){
-    	ServiceModel model=service.searchAll();
+//    	ServiceModel model=service.searchAll();
 		
-		return model;
+		return new ServiceModel();
 	}
 
 }

--
Gitblit v1.9.1