张延森 2 years ago
parent
commit
eb42f86523

+ 5
- 3
src/main/java/com/yunzhi/inte/controller/BannerController.java View File

29
      */
29
      */
30
     @RequestMapping(value="/banner",method= RequestMethod.GET)
30
     @RequestMapping(value="/banner",method= RequestMethod.GET)
31
     public ResponseBean BannerPage(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
31
     public ResponseBean BannerPage(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
32
-                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
32
+                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
33
+                                   @RequestParam(value ="state", required = false) String state) throws Exception{
33
 
34
 
34
         IPage<Banner> pg = new Page<>(pageNum, pageSize);
35
         IPage<Banner> pg = new Page<>(pageNum, pageSize);
35
-        QueryWrapper<Info> queryWrapper = new QueryWrapper<>();
36
+        QueryWrapper<Banner> queryWrapper = new QueryWrapper<>();
37
+        queryWrapper.eq(null != state && !"".equals(state), "state", state);
36
         queryWrapper.orderByDesc("qz");
38
         queryWrapper.orderByDesc("qz");
37
 
39
 
38
-        IPage<Banner> result = bannerService.page(pg);
40
+        IPage<Banner> result = bannerService.page(pg, queryWrapper);
39
         return ResponseBean.success(result);
41
         return ResponseBean.success(result);
40
     }
42
     }
41
 
43
 

+ 1
- 1
src/main/java/com/yunzhi/inte/controller/MonitorController.java View File

38
         queryWrapper.eq(null != status && !"".equals(status), "status", status);
38
         queryWrapper.eq(null != status && !"".equals(status), "status", status);
39
         queryWrapper.orderByDesc("id");
39
         queryWrapper.orderByDesc("id");
40
 
40
 
41
-        IPage<Monitor> result = monitorService.page(pg);
41
+        IPage<Monitor> result = monitorService.page(pg, queryWrapper);
42
         return ResponseBean.success(result);
42
         return ResponseBean.success(result);
43
     }
43
     }
44
 
44