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/InterFaceController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterFaceController.java b/src/main/java/com/whyc/controller/InterFaceController.java
index 6acc865..dbb9b3f 100644
--- a/src/main/java/com/whyc/controller/InterFaceController.java
+++ b/src/main/java/com/whyc/controller/InterFaceController.java
@@ -2,6 +2,7 @@
import com.whyc.dto.InterfaceParam;
import com.whyc.dto.Response;
+import com.whyc.pojo.BattRealdata;
import com.whyc.pojo.Fbs9100Setparam;
import com.whyc.service.InterfaceService;
import io.swagger.annotations.Api;
@@ -9,11 +10,13 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
@RequestMapping("interface")
@RestController
@Api(tags = "绗笁鏂规帴鍙�")
-public class InterFaceController {
+public class InterFaceController extends BaseController{
@Resource
private InterfaceService service;
@GetMapping("/getBattInf")
@@ -59,10 +62,22 @@
return service.getBattAlarmHistory(interfaceParam.getBattgroupIds(), interfaceNumber,pageNum,pageSize);
}
+ @PostMapping("/getBattAlarmHistory2")
+ @ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁鍘嗗彶-甯︽椂闂寸瓫閫夊拰瀛樺湪鍒嗚〃")
+ public Response getBattAlarmHistory2(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) throws ParseException {
+ return service.getBattAlarmHistory2(interfaceParam, interfaceNumber,pageNum,pageSize);
+ }
+
@PostMapping("/getDevAlarmHistory")
@ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁鍘嗗彶")
public Response getDevAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
return service.getDevAlarmHistory(interfaceParam.getDeviceIds(), interfaceNumber,pageNum,pageSize);
+ }
+
+ @PostMapping("/getDevAlarmHistory2")
+ @ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁鍘嗗彶-甯︽椂闂寸瓫閫夊拰瀛樺湪鍒嗚〃")
+ public Response getDevAlarmHistory2(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) throws ParseException {
+ return service.getDevAlarmHistory2(interfaceParam, interfaceNumber,pageNum,pageSize);
}
@PostMapping("/getPowerAlarmHistory")
@@ -85,7 +100,7 @@
@GetMapping("/createInterface")
@ApiOperation("鐢熸垚绗笁鏂归獙璇佺爜")
- public Response createInterface(@RequestParam String interfaceName) {
+ public Response createInterface(@RequestParam String interfaceName) throws NoSuchAlgorithmException {
return service.createInterface(interfaceName);
}
@@ -123,4 +138,20 @@
public Response sendCmdSet(@RequestBody Fbs9100Setparam param,@RequestParam String interfaceNumber){
return service.sendCmdSet(param,interfaceNumber);
}
+
+ @PostMapping("/getBattHistoryDataList")
+ @ApiOperation("鑾峰彇鐢垫睜鍘嗗彶瀹炴椂鏁版嵁")
+ public Response getBattHistoryDataList(@RequestBody BattRealdata data, @RequestParam String interfaceNumber) throws ParseException, InterruptedException {
+ return service.getBattHistoryDataList(data, interfaceNumber);
+ }
+
+ /**
+ * 1.鐢垫睜鍩烘湰淇℃伅锛氱數姹犲搧鐗屻�佺數姹犲瀷鍙枫�佹姇鍏ヤ娇鐢ㄦ椂闂淬�佹爣绉板閲忋�佺數姹犵粍id
+ * 2.杩愯鏁版嵁锛氬疄闄呭閲忋�佺數姹犵粍鏁般�佽礋杞界數娴併�佺画鑸椂闀�
+ */
+ @GetMapping("/getBattGroupDataList")
+ @ApiOperation("鑾峰彇鐢垫睜鐨勬暟鎹俊鎭�,浠ヤ笂娉ㄩ噴鍖呭惈鎵�鏈夌粏鑺�")
+ public Response getBattGroupDataList(@RequestParam String stationId, @RequestParam String interfaceNumber){
+ return service.getBattGroupDataList(stationId, interfaceNumber);
+ }
}
--
Gitblit v1.9.1