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_battmaint_checkController.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/User_battmaint_checkController.java b/src/main/java/com/fgkj/controller/User_battmaint_checkController.java
index a093dbe..49a3842 100644
--- a/src/main/java/com/fgkj/controller/User_battmaint_checkController.java
+++ b/src/main/java/com/fgkj/controller/User_battmaint_checkController.java
@@ -1,63 +1,71 @@
package com.fgkj.controller;
-import java.util.List;
+import com.fgkj.util.*;
-import com.fgkj.dto.ServiceModel;
-import com.fgkj.dto.Task_Batt_Test;
-import com.fgkj.dto.User_battmaint_check;
-import com.fgkj.dto.User_battmaint_check_process;
-import com.fgkj.dto.User_inf;
+import com.fgkj.dto.*;
import com.fgkj.services.User_battmaint_checkService;
-import com.google.gson.reflect.TypeToken;
-import com.opensymphony.xwork2.ActionSupport;
+import com.google.gson.Gson;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
@RequestMapping("maintCheck")
@RestController
-@Api
+@Api(tags = "maintCheck鎺ュ彛")
public class User_battmaint_checkController{
- @Autowired
+ @Resource
private User_battmaint_checkService service;
private Task_Batt_Test tbt;
//浣滀笟鎶芥煡(鏂板缓鎶芥煡浣滀笟)
@PostMapping("/")
+ @ApiOperation(notes = "",value="浣滀笟鎶芥煡(鏂板缓鎶芥煡浣滀笟)")
public ServiceModel add(@RequestBody User_battmaint_check ubc){
ServiceModel model=service.add(ubc);
return model;
}
-
+
//浣滀笟鎶芥煡绠＄悊(缂栬緫鎶芥煡浣滀笟)
@PutMapping("/")
- public ServiceModel update(@RequestBody User_battmaint_check ubc){
- System.out.println(ubc);
- ServiceModel model=service.update(ubc);
-
+ @ApiOperation(notes = "{ \"num\": 26, \"stationId\": 0, \"usr_id\": 0, \"master_id\": 0, \"appoint_uid\": 0, \"copy_uids\": \"\", \"task_type_id\": 0, \"task_level\": 0, \"task_caption\": \"\", \"task_time_start\": \"2021-01-05 10:37:13\", \"task_time_end\": \"2021-01-05 10:37:13\", \"task_process\": \"\", \"task_done\": 0, \"task_done_time\": \"2021-01-05 10:37:13\", \"origin_usr_work_mark\": 0, \"origin_usr_work_mark1\": 0, \"task_done_confirm\": 0, \"master_audit\": 0, \"remark\": \"ttt\" }",value="浣滀笟鎶芥煡绠＄悊(缂栬緫鎶芥煡浣滀笟)")
+ public ServiceModel update(@RequestBody User_battmaint_check ubc) {
+
+ ServiceModel model = service.update(ubc);
return model;
}
-
+
+
//4.10浣滀笟鎶芥煡绠＄悊(缂栬緫璁板綍)(user_battmaint_check琛ㄤ慨鏀规椂User_battmaint_check_process琛ㄥ氨鏂板涓�鏉¤褰�)
@PutMapping("pro")
- public ServiceModel updatePro(@RequestBody User_battmaint_check ubc,@RequestBody List<User_battmaint_check_process> ubcp) {
+ @ApiOperation(notes = "user_battmaint_check琛ㄤ慨鏀规椂User_battmaint_check_process琛ㄥ氨鏂板涓�鏉¤褰� { \"ubcp\": [{ \"usr_id\": 0, \"usr_name\": \"\", \"task_rec_id\": 0, \"work_caption\": \"\", \"work_caption_time\": \"2021-01-12 08:19:54\" }],\"num\": 28, \"usr_id\": 111, \"master_id\": 0, \"appoint_uid\": 0, \"copy_uids\": \"\", \"task_type_id\": 0, \"task_level\": 0, \"task_caption\": \"\", \"task_time_start\": \"2021-01-12 08:19:54\", \"task_time_end\": \"2021-01-12 08:19:54\", \"task_process\": \"\", \"task_done\": 0, \"task_done_time\": \"2021-01-12 08:19:54\", \"origin_usr_work_mark\": 0, \"origin_usr_work_mark1\": 0, \"task_done_confirm\": 0, \"master_audit\": 0, \"remark\": \"rr\" }",value="浣滀笟鎶芥煡绠＄悊(缂栬緫璁板綍)")
+ public ServiceModel updatePro(@RequestBody User_battmaint_check ubc) {
ServiceModel model=new ServiceModel();
User_inf user=(User_inf)ActionUtil.getUser();
- if(user!=null){
+ List<User_battmaint_check_process> ubcp = ubc.getUbcp();
+
+ if(user!=null){
for (User_battmaint_check_process user_battmaint_check_process : ubcp) {
- user_battmaint_check_process.setUsr_id(user.getUId());
+ user_battmaint_check_process.setUsr_id(user.getuId());
}
model=service.updatePro(ubc, ubcp);
}
-
+
return model;
}
-
+
+ //TODO 鏁版嵁涓嶈冻寰呮祴璇�
//4.10浣滀笟鎶芥煡绠＄悊
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "{ \"binf\": { \"stationId\": \"\", \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 1000021 },\"mcheck\": { \"task_done\": 1, \"copy_uids\": \"\", \"task_time_start\": \"2001-01-05 10:37:13\", \"task_time_end\": \"2021-2-05 10:37:13\", \"origin_usr_work_mark\": 0, \"origin_usr_work_mark1\": 10, \"task_done_confirm\": 1 },\"pageBean\": { \"pageSize\": 1, \"pageNum\": 2 } }",value="浣滀笟鎶芥煡绠＄悊 TODO 鏁版嵁涓嶈冻寰呮祴璇�")
public ServiceModel serchByCondition(@RequestBody Task_Batt_Test tbt){
ServiceModel model=service.serchByCondition(tbt);
@@ -66,15 +74,21 @@
//浣滀笟鎶芥煡(鍒犻櫎璁板綍)
@DeleteMapping("/")
- public ServiceModel delete(@RequestBody User_battmaint_check ubc){
- ServiceModel model=service.delete(ubc);
-
- return model;
- }
+ @ApiOperation(notes = "",value="浣滀笟鎶芥煡(鍒犻櫎璁板綍)")
+ public ServiceModel delete(@RequestParam Integer num) {
+ User_battmaint_check ubc = new User_battmaint_check();
+ ubc.setNum(num);
+ ServiceModel model = service.delete(ubc);
+
+ return model;
+ }
//4.10浣滀笟鎶芥煡绠＄悊(鍒犻櫎璁板綍(骞朵笖鍒犻櫎鎿嶄綔璁板綍))
@DeleteMapping("pro")
- public ServiceModel deletePro(@RequestBody User_battmaint_check ubc) {
+ @ApiOperation(notes = "",value="浣滀笟鎶芥煡绠＄悊(鍒犻櫎璁板綍(骞朵笖鍒犻櫎鎿嶄綔璁板綍))")
+ public ServiceModel deletePro(@RequestParam Integer num) {
+ User_battmaint_check ubc = new User_battmaint_check();
+ ubc.setNum(num);
ServiceModel model=service.deletePro(ubc);
return model;
--
Gitblit v1.9.1