diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 6c8be9f..6b06794 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -1,13 +1,15 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,14 +65,23 @@ @ApiOperation("业务能力新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerAbility ability) { - return abilityService.addAbility(ability); + public ReturnDTO add(@RequestBody List abilities) { + if(!CollectionUtils.isEmpty(abilities) && abilityService.saveBatch(abilities)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("业务能力删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return abilityService.deleteAbility(idDto); + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(abilityService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 6c8be9f..6b06794 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -1,13 +1,15 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,14 +65,23 @@ @ApiOperation("业务能力新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerAbility ability) { - return abilityService.addAbility(ability); + public ReturnDTO add(@RequestBody List abilities) { + if(!CollectionUtils.isEmpty(abilities) && abilityService.saveBatch(abilities)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("业务能力删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return abilityService.deleteAbility(idDto); + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(abilityService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java index af42cc7..ff74967 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java @@ -1,9 +1,11 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; @@ -73,8 +75,11 @@ @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody List ids) { - if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(userInfoService.removeByIds(idsDTO.getIds())) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 6c8be9f..6b06794 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -1,13 +1,15 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,14 +65,23 @@ @ApiOperation("业务能力新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerAbility ability) { - return abilityService.addAbility(ability); + public ReturnDTO add(@RequestBody List abilities) { + if(!CollectionUtils.isEmpty(abilities) && abilityService.saveBatch(abilities)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("业务能力删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return abilityService.deleteAbility(idDto); + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(abilityService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java index af42cc7..ff74967 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java @@ -1,9 +1,11 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; @@ -73,8 +75,11 @@ @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody List ids) { - if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(userInfoService.removeByIds(idsDTO.getIds())) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 957b114..d464dc5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,14 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; - @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; - @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 6c8be9f..6b06794 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -1,13 +1,15 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,14 +65,23 @@ @ApiOperation("业务能力新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerAbility ability) { - return abilityService.addAbility(ability); + public ReturnDTO add(@RequestBody List abilities) { + if(!CollectionUtils.isEmpty(abilities) && abilityService.saveBatch(abilities)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("业务能力删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return abilityService.deleteAbility(idDto); + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(abilityService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java index af42cc7..ff74967 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java @@ -1,9 +1,11 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; @@ -73,8 +75,11 @@ @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody List ids) { - if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(userInfoService.removeByIds(idsDTO.getIds())) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 957b114..d464dc5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,14 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; - @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; - @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java index 7e2c142..37ffd75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java @@ -3,12 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOutsourcerAbilityMapper; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.service.business.IBusinessOutsourcerAbilityService; @@ -54,22 +49,6 @@ } - @Override - public ReturnDTO addAbility(BusinessOutsourcerAbility ability) { - if(abilityMapper.insert(ability) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - - @Override - public ReturnDTO deleteAbility(IdDTO idDto) { - if(abilityMapper.deleteById(idDto.getId()) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - private QueryWrapper getWrapper(OutsourcerAbilityListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("outsourcer_id", request.getOutsourcerId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java index 6c8be9f..6b06794 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java @@ -1,13 +1,15 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -62,14 +65,23 @@ @ApiOperation("业务能力新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerAbility ability) { - return abilityService.addAbility(ability); + public ReturnDTO add(@RequestBody List abilities) { + if(!CollectionUtils.isEmpty(abilities) && abilityService.saveBatch(abilities)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("业务能力删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return abilityService.deleteAbility(idDto); + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(abilityService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java index af42cc7..ff74967 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java @@ -1,9 +1,11 @@ package com.casic.missiles.controller.business; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; @@ -73,8 +75,11 @@ @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody List ids) { - if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(userInfoService.removeByIds(idsDTO.getIds())) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java index 957b114..d464dc5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java @@ -51,14 +51,14 @@ @ApiModelProperty(value = "申请时间", dataType = "String") private String applicantTime; - @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目申请审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目申请审批状态类型-字典code", dataType = "String") private String applyApprovalStatus; @ApiModelProperty(value = "分包项目申请审批状态类型-字典value", dataType = "String") private String applyApprovalStatusName; - @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) +// @DictCodeField(message = "分包项目验收审批状态类型不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @ApiModelProperty(value = "分包项目验收审批状态类型-字典code", dataType = "String") private String checkApprovalStatus; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java index 7e2c142..37ffd75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java @@ -3,12 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOutsourcerAbilityMapper; import com.casic.missiles.model.business.BusinessOutsourcerAbility; import com.casic.missiles.service.business.IBusinessOutsourcerAbilityService; @@ -54,22 +49,6 @@ } - @Override - public ReturnDTO addAbility(BusinessOutsourcerAbility ability) { - if(abilityMapper.insert(ability) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - - @Override - public ReturnDTO deleteAbility(IdDTO idDto) { - if(abilityMapper.deleteById(idDto.getId()) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - private QueryWrapper getWrapper(OutsourcerAbilityListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("outsourcer_id", request.getOutsourcerId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerAbilityService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerAbilityService.java index 26ac0f1..f16dd28 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerAbilityService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerAbilityService.java @@ -2,8 +2,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.outsource.OutsourcerAbilityListRequest; import com.casic.missiles.model.business.BusinessOutsourcerAbility; @@ -22,8 +20,4 @@ Page listPage(Page page, OutsourcerAbilityListRequest request); List list(OutsourcerAbilityListRequest request); - - ReturnDTO addAbility(BusinessOutsourcerAbility ability); - - ReturnDTO deleteAbility(IdDTO idDto); }