Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 b4b44f2021dbf083b7057fb7e192b72d08b4bf17

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java

@@ -7,6 +7,9 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

@@ -35,7 +38,8 @@
   public AjaxResult<PageInfo<TRepair>> getRepairList(String name, String siteId, BasePage basePage){
      PageInfo<TRepair> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
      List<TRepair> repairList = repairService.getRepairList(pageInfo, name, siteId);
      return AjaxResult.success(repairList);
      pageInfo.setRecords(repairList);
      return AjaxResult.success(pageInfo);
   }
   
   
@@ -44,6 +48,7 @@
   @ResponseBody
   @PostMapping("/addRepair")
   @ApiOperation(value = "添加报修记录", tags = {"管理后台-设备监控"})
   @Log(title = "【设备监控】添加报修记录", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
   public AjaxResult addRepair(@RequestBody TRepair repair){
      repairService.save(repair);
      return AjaxResult.success();
@@ -53,6 +58,7 @@
   @ResponseBody
   @DeleteMapping("/delRepair/{id}")
   @ApiOperation(value = "删除报修记录", tags = {"管理后台-设备监控"})
   @Log(title = "【设备监控】删除报修记录", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
   public AjaxResult delRepair(@PathVariable Integer id){
      repairService.removeById(id);
      return AjaxResult.success();