林火综合应急信息管理系统cloud后端
guoshilong
2023-03-14 cef4d402f712aa7b42a2347970cc536c59dcc301
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
@@ -33,24 +33,24 @@
   @Override
   @GetMapping(REAL_TIME)
   public List<FireVO> getRealtime(String time) {
      return fireService.getRealtime(time);
   public R<List<FireVO>> getRealtime(String time) {
      return R.data(fireService.getRealtime(time));
   }
   @Override
   @PostMapping(FIRE_ALARM_INCIDENT)
   public BladePage<FireVO> selectFirePage(@RequestParam("current") Integer current,@RequestParam("size") Integer size, @RequestBody FireVO fire) {
   public R<BladePage<FireVO>> selectFirePage(@RequestParam("current") Integer current,@RequestParam("size") Integer size, @RequestBody FireVO fire) {
      Query query = new Query();
      query.setCurrent(current);
      query.setSize(size);
      IPage<FireVO> fireVOIPage = fireService.selectFirePage(Condition.getPage(query), fire);
      return BladePage.of(fireVOIPage);
      return R.data(BladePage.of(fireVOIPage));
   }
   @Override
   @PostMapping(DISASTER_ASSESSMENT)
   public FireSupplementEntity getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity) {
   public R<FireSupplementEntity> getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity) {
      FireSupplementEntity one = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplementEntity));
      return one;
      return R.data(one);
   }
}