From 4ac736a59667629e0ddaae924aca766c799ca8c2 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 11 六月 2025 20:01:49 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/AlarmInspectionService.java | 2 +-
src/main/java/com/whyc/controller/AlarmInspectionController.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmInspectionController.java b/src/main/java/com/whyc/controller/AlarmInspectionController.java
index 4419b94..e7d672e 100644
--- a/src/main/java/com/whyc/controller/AlarmInspectionController.java
+++ b/src/main/java/com/whyc/controller/AlarmInspectionController.java
@@ -28,8 +28,8 @@
@ApiOperation("鏌ヨ绔欑偣瀵瑰簲鐨勫贰妫�鍗�")
@GetMapping("")
- public Response getList(@RequestParam Integer stationId){
- return service.getList(stationId);
+ public Response getList(@RequestParam Integer stationId,@RequestParam Integer inspectionType){
+ return service.getList(stationId,inspectionType);
}
diff --git a/src/main/java/com/whyc/service/AlarmInspectionService.java b/src/main/java/com/whyc/service/AlarmInspectionService.java
index 3d0c805..8fe391e 100644
--- a/src/main/java/com/whyc/service/AlarmInspectionService.java
+++ b/src/main/java/com/whyc/service/AlarmInspectionService.java
@@ -14,7 +14,7 @@
@Resource
private AlarmInspectionMapper mapper;
- public Response getList(Integer stationId) {
+ public Response getList(Integer stationId, Integer inspectionType) {
//闇�瑕侀檮鍔犲～鍏� 璐熻矗鐝粍淇℃伅 鍙� 鍛婅璇婃柇淇℃伅
List<AlarmInspection> list = mapper.getList(stationId);
return new Response().set(1,list);
--
Gitblit v1.9.1