From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/controller/BattTestDataInf2Controller.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestDataInf2Controller.java b/src/main/java/com/whyc/controller/BattTestDataInf2Controller.java
index 0df75cf..92b8521 100644
--- a/src/main/java/com/whyc/controller/BattTestDataInf2Controller.java
+++ b/src/main/java/com/whyc/controller/BattTestDataInf2Controller.java
@@ -1,10 +1,9 @@
package com.whyc.controller;
import com.github.pagehelper.PageInfo;
-import com.whyc.dto.BattTestDataCalcDTO;
import com.whyc.dto.BattTestDataDTO;
import com.whyc.dto.Response;
-import com.whyc.pojo.UserInf;
+import com.whyc.pojo.BatttestdataInf;
import com.whyc.service.BattTestDataInf2Service;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
@@ -12,33 +11,32 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
@RestController
@RequestMapping("battTestData")
@Api(tags = "鍦ㄧ嚎鐩戞祴-鍘嗗彶鏁版嵁绠＄悊")
-public class BattTestDataInf2Controller {
+public class BattTestDataInf2Controller extends BaseController{
@Autowired
private BattTestDataInf2Service service;
@PostMapping("calcTestData")
- @ApiOperation(value = "鐢垫睜缁勭殑鍘嗗彶娴嬭瘯鏁版嵁鏌ヨ骞惰绠楄惤鍚庡崟浣�",notes = "鍘熸帴鍙�:BattTest_ResAction!serchByCondition")
- public Response<PageInfo<BattTestDataCalcDTO>> calcTestData(@RequestBody BattTestDataDTO paramDto,
+ @ApiOperation(value = "鐢垫睜缁勭殑鍘嗗彶娴嬭瘯鏁版嵁鏌ヨ骞剁粺璁″彲鑳藉瓨鍦ㄧ殑钀藉悗鍗曚綋",notes = "鍘熸帴鍙�:BattTest_ResAction!serchByCondition")
+ public Response<PageInfo<BatttestdataInf>> calcTestData(@RequestBody BattTestDataDTO paramDto,
@RequestParam Integer pageNum,
@RequestParam Integer pageSize){
- PageInfo<BattTestDataCalcDTO> page = service.calcTestData(paramDto,pageNum,pageSize);
- return new Response().set(1,page);
+ paramDto.setUId(ActionUtil.getUser().getUId());
+ PageInfo<BatttestdataInf> page = service.calcTestData(paramDto,pageNum,pageSize);
+ return new Response<PageInfo<BatttestdataInf>>().set(1,page);
}
- @GetMapping
- @ApiOperation(value = "缁存姢鍖烘煡璇�")
- public Response<List<String>> getStationName1(){
- UserInf user = ActionUtil.getUser();
- List<String> stationName1List = service.getStationName1(user.getUId());
- return new Response<List<String>>().set(1,stationName1List);
+ @PostMapping("delete")
+ @ApiOperation(value = "鍒犻櫎")
+ public Response<Boolean> delete(@RequestParam Integer num,
+ @RequestParam Integer battGroupId,
+ @RequestParam Integer testRecordCount,
+ @RequestParam Integer testType){
+ boolean res = service.delete(num,battGroupId,testRecordCount,testType);
+ return new Response<Boolean>().setII(1,res,null,"鍒犻櫎鎴愬姛");
}
-
-
}
--
Gitblit v1.9.1