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/DevalarmDataHistoryController.java | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java index b529c50..045738d 100644 --- a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java +++ b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java @@ -8,24 +8,36 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Api(tags="璁惧鍛婅-鍘嗗彶鍛婅") +import java.text.ParseException; +import java.util.List; + +@Api(tags="鍛婅绠$悊-璁惧鍛婅鍘嗗彶鏌ヨ") @RestController @RequestMapping("DevalarmDataHistoryAction") -public class DevalarmDataHistoryController { +public class DevalarmDataHistoryController extends BaseController{ @Autowired private DevalarmDataHistoryService service; //璁惧鍛婅鍘嗗彶鏌ヨ @ApiOperation(value = "璁惧鍛婅鍘嗗彶鏌ヨ") - @PostMapping("/serchByCondition") - public Response serchByCondition(@RequestBody DevAlarmPar par){ - return service.serchByCondition(par); + @PostMapping("serchByCondition") + public Response serchByCondition(@RequestBody DevAlarmPar param) throws ParseException, InterruptedException { + //return service.serchByCondition(par); + return service.getPageInfo(param); } + + @PostMapping("levelList") + @ApiOperation(value = "璁惧鍛婅鍘嗗彶璁板綍鏌ヨ-鍛婅绛夌骇鍒嗙被缁熻") + public Response getLevelList() throws ParseException { + //return service.serchByInfo(par); + return service.getLevelList(); + } + //璁惧鍛婅鍒犻櫎鍛婅 @ApiOperation(value = "璁惧鍛婅鍒犻櫎鍛婅") - @GetMapping("/delete") + @GetMapping("delete") public Response delete(@RequestParam int num){ return service.delete(num); } -- Gitblit v1.9.1