From 160f973ce4eb04e690c396ebd45bffbc6fb99961 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期一, 28 十一月 2022 15:43:18 +0800 Subject: [PATCH] fix: 预警研判报警事间未显示 --- ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java index 5470875..05dc82f 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java @@ -48,16 +48,20 @@ @ApiOperation("鏍规嵁闂ㄥ簵鍚嶇О鍒嗛〉鑾峰彇闂ㄥ簵鍒楄〃鍒楄〃") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鏌ヨ闂ㄥ簵") public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, - @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { - Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum); + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(value = "status", required = false) String status + ) { + Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum,status); return CommonResult.success(CommonPage.restPage(storeInfoPage)); } @ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵淇℃伅") @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鏌ヨ闂ㄥ簵") public CommonResult<StoreInfoVO> getItem(@PathVariable Long id) { StoreInfo storeInfo = storeInfoService.getById(id); StoreInfoVO vo = new StoreInfoVO(); @@ -95,6 +99,7 @@ @ApiOperation(value = "鏍规嵁id鍒犻櫎闂ㄥ簵淇℃伅") @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鍒犻櫎闂ㄥ簵") public CommonResult delete(@PathVariable Long id) { boolean success = storeInfoService.removeById(id); if (success) { @@ -107,6 +112,7 @@ @ApiOperation(value = "淇敼闂ㄥ簵淇℃伅") @RequestMapping(value = "/update", method = RequestMethod.PUT) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "淇敼闂ㄥ簵") public CommonResult update(@RequestBody StoreInfo storeInfo) { boolean success = storeInfoService.updateById(storeInfo); if (success) { @@ -119,6 +125,7 @@ @ApiOperation(value = "鏍规嵁excel妯℃澘鎵归噺瀵煎叆闂ㄥ簵淇℃伅") @RequestMapping(value = "/add/excel", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "瀵煎叆闂ㄥ簵") public CommonResult addByExcel(MultipartFile file) { boolean success = storeInfoService.addByExcel(file); if (success) { -- Gitblit v1.8.0