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_taskController.java | 222 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 186 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/User_taskController.java b/src/main/java/com/fgkj/controller/User_taskController.java
index 5ccfcc7..0cab748 100644
--- a/src/main/java/com/fgkj/controller/User_taskController.java
+++ b/src/main/java/com/fgkj/controller/User_taskController.java
@@ -1,45 +1,57 @@
package com.fgkj.controller;
-import java.text.ParseException;
-import java.util.List;
+import com.fgkj.util.*;
-import com.fgkj.dto.AllModel;
-import com.fgkj.dto.BattInf;
-import com.fgkj.dto.Batt_Maint_Dealarm;
-import com.fgkj.dto.ServiceModel;
-import com.fgkj.dto.Task_Batt_Test;
-import com.fgkj.dto.User_inf;
-import com.fgkj.dto.User_task;
-import com.fgkj.dto.User_task_batt_template;
-import com.fgkj.dto.User_task_param;
+import com.fgkj.dto.*;
import com.fgkj.services.User_taskService;
import com.google.gson.reflect.TypeToken;
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.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
@RequestMapping("userTask")
@RestController
-@Api
+@Api(tags = "userTask鎺ュ彛")
public class User_taskController{
- @Autowired
+ @Resource
private User_taskService service;
+
+// ,@RequestBody User_task_param utparam,@RequestBody List<BattInf> addlist, @RequestBody User_inf uinf
//娣诲姞浣滀笟
@PostMapping("/")
- public ServiceModel add(@RequestBody User_task_param utparam,@RequestBody List<BattInf> addlist,
- @RequestBody User_inf uinf) throws ParseException{
+ @ApiOperation(notes = "",value="娣诲姞浣滀笟TODO")
+ public ServiceModel add(@RequestBody Map<String,Object> map) throws ParseException{
ServiceModel model=new ServiceModel();
- if(uinf!=null){
- utparam.setTp_name(uinf.getUId().toString());
- model=service.add(addlist, utparam);
+ try {
+ User_task_param utparam = (User_task_param) map.get("utparam"); //TODO 鍙傛暟鏈煡
+ List<BattInf> listbinf = (List<BattInf>) map.get("listbinf");
+ User_inf uinf = (User_inf) map.get("uinf");
+ if(uinf!=null){
+ utparam.setTp_name(uinf.getuId().toString());
+ model=service.add(listbinf, utparam);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ model.setMsg("娣诲姞澶辫触");
+ return model;
}
-
+
return model;
}
-
+
//4.1浣滀笟绠＄悊(淇敼浣滀笟鍚嶇О锛屼綔涓氫娇鑳斤紝浣滀笟寮�濮嬫椂闂达紝浣滀笟鎻愰啋娆℃暟锛屼綔涓氭彁閱掓椂闂达紝浣滀笟涓荤鎻愰啋浣胯兘,纭浣滀笟锛屽畬鎴愪綔涓氾紝瀹屾垚浣滀笟纭)
@PutMapping("/")
+ @ApiOperation(notes = "淇敼浣滀笟鍚嶇О锛屼綔涓氫娇鑳斤紝浣滀笟寮�濮嬫椂闂达紝浣滀笟鎻愰啋娆℃暟锛屼綔涓氭彁閱掓椂闂达紝浣滀笟涓荤鎻愰啋浣胯兘,纭浣滀笟锛屽畬鎴愪綔涓氾紝瀹屾垚浣滀笟纭" +
+ "{ \"task_id\": 1000009, \"task_name\": \"\", \"task_enabled\": 0, \"task_start_date\": \"2021-01-18 08:18:59\", \"task_notice_sum\": 0, \"task_notice_starttime\": \"2021-01-18 08:18:59\", \"task_notice_endtime\": \"2021-01-18 08:18:59\", \"task_confirm\": 0, \"task_confirm_date\": \"2021-01-18 08:18:59\", \"task_complete\": 0, \"task_complete_confirm\": 0, \"notice_master_enabled\": 0 }" +
+ "",value="浣滀笟绠＄悊")
public ServiceModel update(@RequestBody User_task utask) {
ServiceModel model=service.update(utask);
@@ -48,14 +60,53 @@
//4.1鍒犻櫎鎸囧畾鐨勪綔涓�
@DeleteMapping("/")
- public ServiceModel delete(@RequestBody User_task utask){
+ @ApiOperation(notes = "",value="鍒犻櫎鎸囧畾鐨勪綔涓�")
+ public ServiceModel delete(@RequestParam Integer task_id,@RequestParam Integer task_type){
+ User_task utask = new User_task();
+ utask.setTask_id(task_id);
+ utask.setTask_type(task_type);
ServiceModel model=service.delete(utask);
return model;
}
-
+
//4.1浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�
- @GetMapping("byCondition")
+ @PostMapping("byCondition")
+ @ApiOperation(notes = "{\n" +
+ " \"utask\": {\n" +
+ " \"task_type\": 1,\n" +
+ " \"task_create_date\": \"2001-01-25 08:19:35\",\n" +
+ " \"task_create_date1\": \"2021-01-25 08:19:35\",\n" +
+ " \"task_complete\": 1,\n" +
+ " \"task_complete_date\": \"2001-01-25 08:19:35\",\n" +
+ " \"task_complete_date1\": \"2021-01-25 08:19:35\"\n" +
+ " },\n" +
+ " \"utest\": {\n" +
+ " \"task_usr_ids\": \"1002\",\n" +
+ " \"task_exe_date\": \"2001-01-25 08:19:35\",\n" +
+ " \"task_exe_date1\": \"2021-01-25 08:19:35\"\n" +
+ " },\n" +
+ " \"ulist\": {\n" +
+ " \"uId\": 0\n" +
+ " },\n" +
+ " \"binf\": {\n" +
+ " \"stationName\": \"\",\n" +
+ " \"stationName1\": \"\",\n" +
+ " \"battGroupId\": 0,\n" +
+ " \"battGroupName1\": \"\",\n" +
+ " \"monCapStd\": 0.0,\n" +
+ " \"monVolStd\": 0.0,\n" +
+ " \"battProducer\": \"\"\n" +
+ " },\n" +
+ " \"ucheck\": {\n" +
+ " \"task_id\": 0,\n" +
+ " \"task_exe_date\": \"2021-01-25 08:19:35\",\n" +
+ " \"task_exe_date1\": \"2021-01-25 08:19:35\"\n" +
+ " },\n" +
+ " \"uinf\": {\n" +
+ " \"uId\": 1001\n" +
+ " }\n" +
+ "}",value="浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�")
public ServiceModel serchByCondition(@RequestBody Task_Batt_Test tbt){
ServiceModel model=service.serchByCondition(tbt);
@@ -64,29 +115,80 @@
}
//4.1鏍规嵁task_id鏌ヨuser_task_test/user_task_check
- @GetMapping("byInfo")
- public ServiceModel serchByInfo(@RequestBody User_task utask){
+ @PostMapping("byInfo")
+ @ApiOperation(notes = "",value="task_id鏌ヨuser_task_test/user_task_check")
+ public ServiceModel serchByInfo(@RequestParam Integer task_id,@RequestParam Integer task_type){
+ User_task utask = new User_task();
+ utask.setTask_id(task_id);
+ utask.setTask_type(task_type);
ServiceModel model=service.serchByInfo(utask);
return model;
}
//4.1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍淇℃伅
- @GetMapping("battGroup")
+ @PostMapping("battGroup")
+ @ApiOperation(notes = "{\n" +
+ " \"binf\": {\n" +
+ " \"stationName\": \"\",\n" +
+ " \"stationName1\": \"\",\n" +
+ " \"battGroupId\": 0,\n" +
+ " \"battGroupName1\": \"鐢垫睜缁�1\",\n" +
+ " \"battProductDate\": \"1901-01-18 08:18:59\",\n" +
+ " \"battProductDate1\": \"2021-01-18 08:18:59\",\n" +
+ " \"battInUseDate\": \"1901-01-18 08:18:59\",\n" +
+ " \"battInUseDate1\": \"2021-01-18 08:18:59\",\n" +
+ " \"monVolStd\": 0.0,\n" +
+ " \"monCapStd\": 0.0\n" +
+ "\n" +
+ "\n" +
+ " },\n" +
+ " \"mainf\": {\n" +
+ " \"maint_done_time\": \"1901-01-18 08:18:59\",\n" +
+ " \"maint_done_time1\": \"2021-01-18 08:18:59\"\n" +
+ " },\n" +
+ " \"uinf\": {\n" +
+ " \"uName\": \"\"\n" +
+ " },\n" +
+ " \"tdata\": {\n" +
+ " \"test_type\": 0,\n" +
+ " \"record_time\": \"1901-01-18 08:18:59\",\n" +
+ " \"record_time1\": \"2021-01-18 08:18:59\"\n" +
+ " }\n" +
+ "}",value="鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍淇℃伅")
public ServiceModel serchBattgroup(@RequestBody Batt_Maint_Dealarm bmd){
ServiceModel model = new ServiceModel();
List list=service.serchBattgroup(bmd);
- model.setCode(1);
- model.setData(list);
+ if (list.size()>0) {
+ model.setCode(1);
+ model.setData(list);
+ }
return model;
}
//0.1鏌ヨ鎸囧畾鐢ㄦ埛鐨勪綔涓氫俊鎭�
- @GetMapping("byUid")
- public ServiceModel serchByUid(@RequestBody Task_Batt_Test tbt){
- User_inf user=(User_inf)ActionUtil.getSession().getAttribute("user");
- ServiceModel model=new ServiceModel();
+ @PostMapping("byUid")
+ @ApiOperation(notes = "{\n" +
+ " \"utask\": {\n" +
+ " \"task_type\": 0,\n" +
+ " \"task_close_date\": \"2006-12-30 13:26:38\",\n" +
+ " \"task_close_date1\": \"2021-01-19 13:26:38\",\n" +
+ " \"task_complete\": 1\n" +
+ " },\n" +
+ " \"uinf\": {\n" +
+ " \"uId\": 1001\n" +
+ " },\n" +
+ " \"pageBean\": {\n" +
+ " \"pageSize\":12,\n" +
+ " \"pageNum\": 0\n" +
+ " }\n" +
+ "}",value="鏌ヨ鎸囧畾鐢ㄦ埛鐨勪綔涓氫俊鎭�")
+ public ServiceModelOnce serchByUid(@RequestBody Task_Batt_Test tbt){
+ User_inf user=(User_inf)ActionUtil.getUser();
+// User_inf user= new User_inf();
+// user.setuId(1001);
+ ServiceModelOnce model=new ServiceModelOnce();
if(user!=null && tbt!=null){
tbt.setUinf(user);
model=service.serchByUid(tbt);
@@ -96,14 +198,61 @@
}
//0.1浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�
- @GetMapping("byTask")
+ @PostMapping("byTask")
+ @ApiOperation(notes = "task_type==2 " +
+ "{\n" +
+ " \"utask\": {\n" +
+ " \"task_type\": 2,\n" +
+ " \"task_complete\": 1,\n" +
+ " \"task_complete_date\": \"2000-01-20 11:48:46\",\n" +
+ " \"task_complete_date1\": \"2031-01-20 11:48:46\"\n" +
+ " },\n" +
+ " \"binf\": {\n" +
+ " \"stationName\": \"\",\n" +
+ " \"stationName1\": \"\",\n" +
+ " \"battGroupId\": 1000003\n" +
+ " },\n" +
+ " \"ucheck\": {\n" +
+ " \"task_exe_date\": \"2001-01-20 11:48:46\",\n" +
+ " \"task_exe_date1\": \"2021-01-20 11:48:46\"\n" +
+ " },\n" +
+ " \"pageBean\": {\n" +
+ " \"pageSize\": 1,\n" +
+ " \"pageNum\": 0\n" +
+ " }\n" +
+ "}" +
+ "-------------------------" +
+ "task_type!=2 " +
+ "{\n" +
+ " \"utask\": {\n" +
+ " \"task_type\": 1,\n" +
+ " \"task_complete\": 1,\n" +
+ " \"task_complete_date\": \"2000-01-20 11:48:46\",\n" +
+ " \"task_complete_date1\": \"2031-01-20 11:48:46\"\n" +
+ " },\n" +
+ " \"utest\": {\n" +
+ " \"task_usr_ids\": \"\",\n" +
+ " \"task_exe_date\": \"2001-01-20 11:48:46\",\n" +
+ " \"task_exe_date1\": \"2031-01-20 11:48:46\"\n" +
+ " },\n" +
+ " \"binf\": {\n" +
+ " \"stationName\": \"澶師甯俓",\n" +
+ " \"stationName1\": \"\",\n" +
+ " \"battGroupId\": 1000003\n" +
+ " },\n" +
+ " \"pageBean\": {\n" +
+ " \"pageSize\": 6,\n" +
+ " \"pageNum\": 0\n" +
+ " }\n" +
+ "}",value="浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�")
public ServiceModel serchByTask(@RequestBody Task_Batt_Test tbt){
ServiceModel model=service.serchByTask(tbt);
return model;
}
//4.1鏍规嵁缁存姢鍖烘煡璇㈡墍鏈夌殑鐢垫睜缁勫拰瀵瑰簲鐨勫寘鏈轰汉(妯℃澘鍒涘缓)鍜岀淮鎶や汉鍛樹俊鎭互鍙婂悇绫讳綔涓氬搴旂殑鐢垫睜缁勪俊鎭�
- @GetMapping("byTemplate")
+ @PostMapping("serchBytemplate")
+ @ApiOperation(notes = "",value="TODO 缁存姢鍖烘煡璇㈡墍鏈夌殑鐢垫睜缁勫拰瀵瑰簲鐨勫寘鏈轰汉(妯℃澘鍒涘缓)鍜岀淮鎶や汉鍛樹俊鎭互鍙婂悇绫讳綔涓氬搴旂殑鐢垫睜缁勪俊鎭�")
public ServiceModel serchBytemplate(@RequestBody User_task_batt_template utbt){
ServiceModel model=new ServiceModel();
@@ -115,7 +264,8 @@
}
//4.1鐢辨ā鏉挎坊鍔犱綔涓�(鍚憉task锛寀test,ucheck涓坊鍔犳暟鎹�)
- @PostMapping("byTemplate")
+ @PostMapping("addBytemplate")
+ @ApiOperation(notes = "",value="TODO鐢辨ā鏉挎坊鍔犱綔涓�(鍚憉task锛寀test,ucheck涓坊鍔犳暟鎹�)")
public ServiceModel addBytemplate(@RequestBody AllModel allmodel){
User_inf uinf=(User_inf)ActionUtil.getSession().getAttribute("user");
//System.out.println(allmodel.getPmodel());
@@ -127,7 +277,7 @@
//System.out.println(allmodel.getPmodel());
if(uinf!=null && allmodel!=null){
- allmodel.getPmodel().setMsg(uinf.getUId()+"");
+ allmodel.getPmodel().setMsg(uinf.getuId()+"");
}
ServiceModel model= new ServiceModel();
try {
--
Gitblit v1.9.1