From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/BatttestdataInfController.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BatttestdataInfController.java b/src/main/java/com/whyc/controller/BatttestdataInfController.java
index 622f976..61fe0de 100644
--- a/src/main/java/com/whyc/controller/BatttestdataInfController.java
+++ b/src/main/java/com/whyc/controller/BatttestdataInfController.java
@@ -1,15 +1,15 @@
package com.whyc.controller;
-import com.whyc.dto.BattState;
import com.whyc.dto.Response;
+import com.whyc.dto.paramter.GroupTestCapPar;
import com.whyc.pojo.Battinf;
import com.whyc.service.BatttestdataInfService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.List;
/**
* 鐢垫睜缁埅鑳藉姏鍘嗗彶鏌ヨ
@@ -25,25 +25,62 @@
@PostMapping("/searchBattTestInfDataById")
@ApiOperation(value = "鑾峰彇鍏呮斁鐢佃褰�")
- public Response searchBattTestInfDataById(@RequestParam int battGroupId) {
- return service.searchBattTestInfDataById(battGroupId);
+ public Response searchBattTestInfDataById(@RequestParam int battGroupId,@RequestParam int fbsDeviceId) {
+ return service.searchBattTestInfDataById(battGroupId,fbsDeviceId);
}
@PostMapping("/searchBattLastHrDataById")
@ApiOperation(value = "鏈�鍚庝竴娆℃牳瀹规斁鐢垫暟鎹�")
- public Response searchBattLastHrDataById(@RequestParam int battGroupId) {
- return service.searchBattLastHrDataById(battGroupId);
+ public Response searchBattLastHrDataById(@RequestParam int battGroupId, @RequestParam int devId) {
+ String lang = ActionUtil.getLang();
+ return service.searchBattLastHrDataById(battGroupId, devId, lang);
}
- //@PostMapping("/searchBattLife")
- //@ApiOperation(value = "鐢垫睜缁勫巻鍙叉斁鐢垫暟鎹画鑸兘鍔涙煡璇�",notes = "Batttestdata_infAction!serchBattLife")
- //public Response searchBattLife(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody Battinf binf){
- // if (binf.getBattGroupId()==0){
- // return service.searchBattLifeNow(pageNum,pageSize,binf);
- // }
- // if(binf.getBattGroupId()==1){
- // return service.searchBattLife(pageNum,pageSize,binf);
- // }
- // return new Response().set(1,false,"鍙傛暟閿欒");
- //}
+ @PostMapping("/searchBattLife")
+ @ApiOperation(value = "鐢垫睜缁勫巻鍙叉斁鐢垫暟鎹画鑸兘鍔涙煡璇�", notes = "Batttestdata_infAction!serchBattLife锛宯um: 3, //鐢垫睜鐘舵�乗n" +
+ " BattGroupId: this.selectValue3, //缁埅鑳藉姏绫诲瀷 \n" +
+ " StationName: this.selectValue2, //鏈烘埧绫诲瀷\n" +
+ " StationName1: this.selectValue1, //缁存姢鍖篭n" +
+ " BattProductDate: this.startDrsj,\n" +
+ " BattProductDate1: this.endDrsj, //鐢熶骇鏃ユ湡娈�")
+ public Response searchBattLife(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody Battinf binf) {
+ if (binf.getBattGroupId() == 0) {
+ return service.searchBattLifeNow(pageNum, pageSize, binf);
+ }
+ if (binf.getBattGroupId() == 1) {
+ return service.searchBattLife(pageNum, pageSize, binf);
+ }
+ return new Response().set(1, false, "鍙傛暟閿欒");
+ }
+
+ @PostMapping("/searchGroupTestCap")
+ @ApiOperation(value = "缁熻鏃堕棿娈靛唴璁惧鐨勬祴璇曞閲�")
+ public Response searchGroupTestCap(@RequestBody GroupTestCapPar groupCapPar) {
+ return service.searchGroupTestCap(groupCapPar);
+ }
+
+
+ @GetMapping("getHrYeardisBatt")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍(宸插純鐢ㄦ病鏈夊姞and test_stoptype in (2, 3, 4, 6))")
+ public Response getHrYeardisBatt() {
+ return service.getHrYeardisBatt();
+ }
+
+ @GetMapping("getJcdisBatt")
+ @ApiOperation(value = "鑾峰彇瀹炴椂鍋滅數鏀剧數鏈烘埧")
+ public Response getJcdisBatt() {
+ return service.getJcdisBatt();
+ }
+
+ @GetMapping("getHrYeardisBattInfo")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�")
+ public Response getHrYeardisBattInfo() {
+ return service.getHrYeardisBattInfo();
+ }
+
+ @GetMapping("getHrYeardisBattInfoZC")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�(姝ｅ父鍋滄:2.3.4.6)")
+ public Response getHrYeardisBattInfoZC() {
+ return service.getHrYeardisBattInfoZC();
+ }
}
--
Gitblit v1.9.1