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 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/controller/InterFaceController.java b/src/main/java/com/whyc/controller/InterFaceController.java
index 601bb85..dbb9b3f 100644
--- a/src/main/java/com/whyc/controller/InterFaceController.java
+++ b/src/main/java/com/whyc/controller/InterFaceController.java
@@ -2,51 +2,92 @@
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;
import io.swagger.annotations.ApiOperation;
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")
@ApiOperation("鑾峰彇鎵�鏈夌數姹犱俊鎭�")
- public Response getBattinf(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getBattinf(pageNum,pageSize);
+ public Response getBattinf(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String interfaceNumber) {
+ return service.getBattinf(pageNum, pageSize, interfaceNumber);
}
@GetMapping("/getPowerInf")
@ApiOperation("鑾峰彇鎵�鏈夌數婧愪俊鎭�")
- public Response getPowerInf(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getPowerInf(pageNum,pageSize);
+ public Response getPowerInf(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String interfaceNumber) {
+ return service.getPowerInf(pageNum, pageSize, interfaceNumber);
}
@PostMapping("/getBattAlarm")
@ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁")
- public Response getBattAlarm(@RequestBody InterfaceParam interfaceParam){
- return service.getBattAlarm(interfaceParam.getBattgroupIds());
+ public Response getBattAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getBattAlarm(interfaceParam.getBattgroupIds(), interfaceNumber, null);
}
@PostMapping("/getDevAlarm")
@ApiOperation("鑾峰彇璁惧鍛婅鏁版嵁")
- public Response getDevAlarm(@RequestBody InterfaceParam interfaceParam){
- return service.getDevAlarm(interfaceParam.getDeviceIds());
+ public Response getDevAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getDevAlarm(interfaceParam.getDeviceIds(), interfaceNumber);
}
@PostMapping("/getPowerAlarm")
@ApiOperation("鑾峰彇鐢垫簮鍛婅鏁版嵁")
- public Response getPowerAlarm(@RequestBody InterfaceParam interfaceParam) {
- return service.getPwrdevAlarm(interfaceParam.getPowerDeviceIds());
+ public Response getPowerAlarm(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber) {
+ return service.getPwrdevAlarm(interfaceParam.getPowerDeviceIds(), interfaceNumber);
+ }
+
+ @PostMapping("getRealTimeAlarm")
+ @ApiOperation("鑾峰彇瀹炴椂鍛婅鏁版嵁")
+ public Response getRealTimeAlarm(@RequestBody InterfaceParam interfaceParam) {
+ return service.getRealTimeAlarm(interfaceParam);
+ }
+
+
+ @PostMapping("/getBattAlarmHistory")
+ @ApiOperation("鑾峰彇鐢垫睜鍛婅鏁版嵁鍘嗗彶")
+ public Response getBattAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
+ 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")
+ @ApiOperation("鑾峰彇鐢垫簮鍛婅鏁版嵁鍘嗗彶")
+ public Response getPowerAlarmHistory(@RequestBody InterfaceParam interfaceParam, @RequestParam String interfaceNumber,@RequestParam int pageNum,@RequestParam int pageSize) {
+ return service.getPwrdevAlarmHistory(interfaceParam.getPowerDeviceIds(), interfaceNumber,pageNum,pageSize);
}
@PostMapping("/getRealtime")
- @ApiOperation("鑾峰彇瀹炴椂鏁版嵁")
+ @ApiOperation("鑾峰彇瀹炴椂鐘舵�佷俊鎭�")
public Response getRealtime(@RequestBody InterfaceParam interfaceParam) {
return service.getRealTime(interfaceParam);
}
@@ -59,7 +100,7 @@
@GetMapping("/createInterface")
@ApiOperation("鐢熸垚绗笁鏂归獙璇佺爜")
- public Response createInterface(@RequestParam String interfaceName) {
+ public Response createInterface(@RequestParam String interfaceName) throws NoSuchAlgorithmException {
return service.createInterface(interfaceName);
}
@@ -69,9 +110,48 @@
return service.updateInterface(num, enable);
}
- @GetMapping("/decryptInterface")
- @ApiOperation("瑙ｅ瘑")
- public Response decryptInterface(@RequestParam String encryptRandom) {
- return service.decryptInterface(encryptRandom);
+ @GetMapping("getBattStationInfoByStationId")
+ @ApiOperation("鑾峰彇鐢垫睜鏈烘埧淇℃伅")
+ public Response getBattStationInfoByStationId(@RequestParam String stationId,@RequestParam String interfaceNumber){
+ return service.getBattStationInfoByStationId(stationId,interfaceNumber);
+ }
+
+ /**
+ * 鏍稿鏀剧數:
+ * 鑾峰彇鍙傛暟: 鈶爏endCmdGet
+ * 璁剧疆鍙傛暟: 鈶endCmdSet
+ * 鍚姩: 鈶爏endCmdGet
+ * 鍋滄: 鈶爏endCmdGet
+ *
+ * 鍐呴樆娴嬭瘯:
+ * 鍚姩: 鈶爏endCmdGet
+ * 鍋滄: 鈶爏endCmdGet
+ */
+ @ApiOperation("鍙戦�佹寚浠�,鑾峰彇鍙傛暟(鍚姩|鍋滄|鑾峰彇鍙傛暟)")
+ @GetMapping("sendCmdGet")
+ public Response sendCmdGet(@RequestParam int opCmd,@RequestParam Integer testCmd,@RequestParam int devId,@RequestParam int battGroupNum,@RequestParam String interfaceNumber){
+ return service.sendCmdGet(opCmd,testCmd,devId,battGroupNum,interfaceNumber);
+ }
+
+ @ApiOperation("鍙戦�佹寚浠�,璁剧疆鍙傛暟")
+ @PostMapping("sendCmdSet")
+ 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