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 f5ea3a6..af42cc7 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 @@ -4,10 +4,10 @@ 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.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerUserInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +16,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 +63,20 @@ @ApiOperation("人员新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerUserInfo userInfo) { - return userInfoService.addUser(userInfo); + public ReturnDTO add(@RequestBody List userInfos) { + if(!CollectionUtils.isEmpty(userInfos) && userInfoService.saveBatch(userInfos)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return userInfoService.deleteUser(idDto); + public ReturnDTO delete(@RequestBody List ids) { + if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + 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 f5ea3a6..af42cc7 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 @@ -4,10 +4,10 @@ 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.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerUserInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +16,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 +63,20 @@ @ApiOperation("人员新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerUserInfo userInfo) { - return userInfoService.addUser(userInfo); + public ReturnDTO add(@RequestBody List userInfos) { + if(!CollectionUtils.isEmpty(userInfos) && userInfoService.saveBatch(userInfos)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return userInfoService.deleteUser(idDto); + public ReturnDTO delete(@RequestBody List ids) { + if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java index d9b909b..0acb7ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java @@ -53,22 +53,6 @@ return infoList; } - @Override - public ReturnDTO addUser(BusinessOutsourcerUserInfo userInfo) { - if(userInfoMapper.insert(userInfo) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - - @Override - public ReturnDTO deleteUser(IdDTO idDto) { - if(userInfoMapper.deleteById(idDto.getId()) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - private QueryWrapper getWrapper(OutsourcerUserListRequest 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/BusinessOutsourcerUserInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java index f5ea3a6..af42cc7 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 @@ -4,10 +4,10 @@ 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.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.outsource.OutsourcerUserListRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessOutsourcerUserInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -16,6 +16,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 +63,20 @@ @ApiOperation("人员新增") @PostMapping("/add") @ResponseBody - public ReturnDTO add(@RequestBody BusinessOutsourcerUserInfo userInfo) { - return userInfoService.addUser(userInfo); + public ReturnDTO add(@RequestBody List userInfos) { + if(!CollectionUtils.isEmpty(userInfos) && userInfoService.saveBatch(userInfos)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @ApiOperation("人员删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody IdDTO idDto) { - return userInfoService.deleteUser(idDto); + public ReturnDTO delete(@RequestBody List ids) { + if(!CollectionUtils.isEmpty(ids) && userInfoService.removeByIds(ids)) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java index d9b909b..0acb7ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java @@ -53,22 +53,6 @@ return infoList; } - @Override - public ReturnDTO addUser(BusinessOutsourcerUserInfo userInfo) { - if(userInfoMapper.insert(userInfo) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - - @Override - public ReturnDTO deleteUser(IdDTO idDto) { - if(userInfoMapper.deleteById(idDto.getId()) > 0){ - return ReturnUtil.success(); - } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - private QueryWrapper getWrapper(OutsourcerUserListRequest 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/IBusinessOutsourcerUserInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerUserInfoService.java index 3848657..3907ee7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerUserInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerUserInfoService.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.OutsourcerUserListRequest; import com.casic.missiles.model.business.BusinessOutsourcerUserInfo; @@ -22,8 +20,4 @@ Page listPage(Page page, OutsourcerUserListRequest request); List list(OutsourcerUserListRequest request); - - ReturnDTO addUser(BusinessOutsourcerUserInfo userInfo); - - ReturnDTO deleteUser(IdDTO idDto); }