Merge remote-tracking branch 'origin/master'

guoshilong

2023-11-03 fb798e4982a392408b3e8324c69baba0824fe3fd

 src/main/java/org/springblade/modules/house/controller/HouseRentalController.java

@@ -26,6 +26,7 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +36,8 @@
import org.springblade.modules.house.wrapper.HouseRentalWrapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.Date;

/**
 * 出租屋 控制器
@@ -93,13 +96,35 @@
   }

   /**
    * 出租屋 自定义新增
    */
   @PostMapping("/add")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "自定义新增", notes = "传入houseRentalVo")
   public R add(@RequestBody HouseRentalVO houseRentalVO) {
      return R.status(houseRentalService.add(houseRentalVO));
   }

   /**
    * 出租屋 修改
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入houseRental")
   public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
   public R update(@RequestBody HouseRentalEntity houseRental) {
      houseRental.setUpdateTime(new Date());
      houseRental.setUpdateUser(AuthUtil.getUserId());
      return R.status(houseRentalService.updateById(houseRental));
   }

   /**
    * 出租屋 自定义修改
    * @param houseRental
    * @return
    */
   @PostMapping("/updateHouseRental")
   public R updateHouseRental(@RequestBody HouseRentalVO houseRental) {
      return R.status(houseRentalService.updateHouseRental(houseRental));
   }

   /**
@@ -122,5 +147,15 @@
      return R.status(houseRentalService.removeByIds(Func.toLongList(ids)));
   }

   /**
    * 出租屋 自定义删除
    * @param id
    * @return
    */
   @PostMapping("/removeHouseRental")
   public R removeHouseRental(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
      return R.status(houseRentalService.removeHouseRental(id));
   }


}