diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java index c39b8c76..56a90030 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java @@ -9,17 +9,16 @@ import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.exception.CheckedException; import com.ruoyi.common.swagger.apiConstants.ApiTerminal; import com.ruoyi.system.domain.CompetitionResult; -import com.ruoyi.system.domain.vo.CompetitionTeamIntegralVo; -import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamRequest; -import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo; -import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo; +import com.ruoyi.system.domain.vo.*; import com.ruoyi.system.utils.UtilTool; import io.seata.core.model.Result; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; @@ -111,6 +110,18 @@ public class CompetitionTeamVsTeamController extends BaseController { return toAjax(competitionTeamVsTeamService.deleteCompetitionTeamVsTeamByIds(ids)); } + @ApiOperation(ApiTerminal.wxMiniProgram+"根据IDS批量删除") + @DeleteMapping("/batchDeleteByIds") + @ResponseBody + public AjaxResult batchDeleteByIds(@RequestBody Ids ids) throws Exception { + if(ObjectUtil.isNull(ids)){ + throw new InvalidParameterException("参数异常,非法操作!"); + } + if(StringUtils.isEmpty(ids.getIdList())||ids.getIdList().size()==0){ + throw new InvalidParameterException("ids不能为空!"); + } + return AjaxResult.success(competitionTeamVsTeamService.deleteBatchByIds(ids)); + } @Log(title = "赛会中球队VS球队比赛结果数据", businessType = BusinessType.OTHER) @ApiOperation("根据ID获取当前比赛赛程的所有统分结果") @GetMapping("/competitionUnifiedRecord/{id}") @@ -119,7 +130,7 @@ public class CompetitionTeamVsTeamController extends BaseController } @Log(title = "赛会中球队VS球队比赛结果数据2", businessType = BusinessType.OTHER) - @ApiOperation("根据ID获取当前比赛赛程的所有统分结果2") + @ApiOperation(ApiTerminal.wxMiniProgram+"根据ID获取当前比赛赛程的所有统分结果2") @GetMapping("/getCompetitionVsRecordById/{id}") public AjaxResult getCompetitionVsRecordById(@PathVariable("id") Long id) { return AjaxResult.success(competitionTeamVsTeamService.getCompetitionVsRecordById(id)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java index a2681efa..8377d33f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java @@ -162,6 +162,7 @@ public class WxBuildingInfoController extends BaseController @ApiOperation(ApiTerminal.wxMiniProgram+"获取球场列表") @ResponseBody public TableDataInfo getBuildingByCity(@RequestBody WxBuildingInfo entity){ + startPage(); List list = wxBuildingInfoService.getBuildingByCity(entity); return getDataTable(list); @@ -191,6 +192,7 @@ public class WxBuildingInfoController extends BaseController @ResponseBody @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取球场列表") public TableDataInfo getAllBuildingByCondition(@RequestBody BuildingInfoRequest entity){ + startPage(); List list =wxBuildingInfoService.getAllBuildingByCondition(entity); for(BuildingInfoResponse response:list){ if(1==response.getStatus()){ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/Ids.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/Ids.java new file mode 100644 index 00000000..2c4fac31 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/Ids.java @@ -0,0 +1,20 @@ +package com.ruoyi.system.domain.vo; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * guocai + */ +@Setter +@Getter +public class Ids { + + private String ids; + /** + * 前端传的ids 数组 + */ + private List idList; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java index be938909..f816dba8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java @@ -74,4 +74,6 @@ public interface ICompetitionTeamVsTeamService Boolean competitionScheduleSubmit(List vsTeamRequestList); Boolean competitionScoreSubmit(List request); + + Boolean deleteBatchByIds(Ids ids); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java index 9edae483..29188138 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java @@ -292,4 +292,11 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS } return true; } + + @Override + public Boolean deleteBatchByIds(Ids ids) { + Long[] idList = ids.getIdList().stream().toArray(Long[]::new); + competitionTeamVsTeamMapper.deleteCompetitionTeamVsTeamByIds(idList); + return Boolean.TRUE; + } }