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/Batttestdata_infController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/Batttestdata_infController.java b/src/main/java/com/fgkj/controller/Batttestdata_infController.java
index 25efc5f..03bb043 100644
--- a/src/main/java/com/fgkj/controller/Batttestdata_infController.java
+++ b/src/main/java/com/fgkj/controller/Batttestdata_infController.java
@@ -1,35 +1,36 @@
package com.fgkj.controller;
-import com.fgkj.util.*;
-
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Batttestdata_inf;
import com.fgkj.dto.ServiceModel;
import com.fgkj.services.Batttestdata_infService;
import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.text.ParseException;
@RequestMapping("battTestDataInf")
@RestController
-@Api
+@Api(tags = "battTestDataInf鎺ュ彛")
+//Perry TODO
public class Batttestdata_infController{
- private ServiceModel model;
+ ServiceModel model = new ServiceModel();
- @Autowired
+ @Resource
private Batttestdata_infService service;
// private Batttestdata_inf bti;
// private Batt_Maint_Dealarm bmd;
@GetMapping("byInfo")
+ @ApiOperation(notes = "",value="鍘嗗彶鏁版嵁鏌ヨ")
public ServiceModel findByInfo(@RequestBody Batttestdata_inf bti){
model=service.serchByCondition(bti);
@@ -40,6 +41,7 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭�
*/
@GetMapping("battTestInfDataById")
+ @ApiOperation(notes = "",value="鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭�")
public ServiceModel searchBattTestInfDataById(@RequestBody Batttestdata_inf bti){
// Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
model=service.serchByCondition(bti);
@@ -49,6 +51,7 @@
//0.7鐢垫祴鏀剧數娴嬭瘯姣斾緥
@GetMapping("testScale")
+ @ApiOperation(notes = "",value="鐢垫祴鏀剧數娴嬭瘯姣斾緥")
public ServiceModel searchTestsCale(@RequestBody Batt_Maint_Dealarm bmd){
try {
model=service.serchByInfo(bmd);
@@ -61,6 +64,7 @@
//0.10鐢垫睜鍋ュ悍鐜�
@GetMapping("healthRate")
+ @ApiOperation(notes = "",value="鐢垫睜鍋ュ悍鐜�")
public ServiceModel searchGood(){
model=service.serchGood();
@@ -69,6 +73,7 @@
//6.4.2鏍规嵁鏉′欢鏌ヨ绗﹀悎鏉′欢鐨勬祴璇曞畬鎴愮殑鐢垫睜缁�(钃勭數姹犳斁鐢垫祴璇曞畬鎴愮巼)
@GetMapping("completeRate")
+ @ApiOperation(notes = "",value="鏉′欢鏌ヨ绗﹀悎鏉′欢鐨勬祴璇曞畬鎴愮殑鐢垫睜缁�(钃勭數姹犳斁鐢垫祴璇曞畬鎴愮巼)")
public ServiceModel serchComplete(@RequestBody Batttestdata_inf b){
// Batttestdata_inf b=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batttestdata_inf.class);
ServiceModel model=service.serchComplete(b);
@@ -78,6 +83,7 @@
//6.4.4鏍规嵁鏉′欢鏌ヨ绗﹀悎鏉′欢鐨勬祴璇曞畬鎴愮殑鐢垫睜缁�(钃勭數姹犲閲忛璀�)
@GetMapping("capWarning")
+ @ApiOperation(notes = "",value="鏉′欢鏌ヨ绗﹀悎鏉′欢鐨勬祴璇曞畬鎴愮殑鐢垫睜缁�(钃勭數姹犲閲忛璀�)")
public ServiceModel serchCap(@RequestBody Batttestdata_inf b){
// Batttestdata_inf b=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batttestdata_inf.class);
ServiceModel model=service.serchCap(b);
@@ -87,6 +93,7 @@
//鐢垫睜缁勫巻鍙叉斁鐢垫暟鎹画鑸兘鍔涙煡璇�
@GetMapping("battLife")
+ @ApiOperation(notes = "",value="鐢垫睜缁勫巻鍙叉斁鐢垫暟鎹画鑸兘鍔涙煡璇�")
public ServiceModel serchBattLife(@RequestBody BattInf binf){
// BattInf binf = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, BattInf.class);
ServiceModel model = new ServiceModel();
@@ -100,6 +107,7 @@
/* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
@GetMapping("battTestInfDataById_ky")
+ @ApiOperation(tags = "璺ㄥ煙", notes = "",value="鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� 璺ㄥ煙涓撶敤")
public ServiceModel searchBattTestInfDataById_ky(@RequestBody Batttestdata_inf bti){
// Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
model=service.serchByCondition_ky(bti);
--
Gitblit v1.9.1