diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 19b2f23..d04a7c0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -241,8 +241,8 @@ @ApiOperation("开展的检定或校准项目编辑") @PostMapping("/carryOut/update") - public ReturnDTO carryOutItemUpdate(@RequestBody @Valid BizEquipmentStandardCarryoutItem carryoutItem) { - return carryoutItemService.updateCarryoutItem(carryoutItem); + public ReturnDTO carryOutItemUpdate(@RequestBody @Valid List carryoutItemList) { + return carryoutItemService.updateCarryoutItem(carryoutItemList); } @ApiOperation("开展的检定或校准项目批量删除") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 19b2f23..d04a7c0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -241,8 +241,8 @@ @ApiOperation("开展的检定或校准项目编辑") @PostMapping("/carryOut/update") - public ReturnDTO carryOutItemUpdate(@RequestBody @Valid BizEquipmentStandardCarryoutItem carryoutItem) { - return carryoutItemService.updateCarryoutItem(carryoutItem); + public ReturnDTO carryOutItemUpdate(@RequestBody @Valid List carryoutItemList) { + return carryoutItemService.updateCarryoutItem(carryoutItemList); } @ApiOperation("开展的检定或校准项目批量删除") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java index 6e65738..3b7d65f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java @@ -15,10 +15,8 @@ import com.casic.missiles.mapper.equipment.BizEquipmentStandardCarryoutItemMapper; import com.casic.missiles.model.equipment.BizEquipmentStandardCarryoutItem; import com.casic.missiles.service.equipment.IBizEquipmentStandardCarryoutItemService; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.google.gson.JsonArray; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -59,15 +57,18 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Transactional(rollbackFor = Exception.class) @Override - public ReturnDTO updateCarryoutItem(BizEquipmentStandardCarryoutItem carryoutItem) { - List list = carryoutItem.getPersonList(); - String s = JSON.toJSONString(list); - carryoutItem.setParamPerson(s); - if (this.baseMapper.updateById(carryoutItem) > 0) { - return ReturnUtil.success(); + public ReturnDTO updateCarryoutItem(List carryoutItemList) { + for (BizEquipmentStandardCarryoutItem carryoutItem : carryoutItemList) { + List list = carryoutItem.getPersonList(); + String s = JSON.toJSONString(list); + carryoutItem.setParamPerson(s); + if (this.baseMapper.updateById(carryoutItem) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + return ReturnUtil.success(); } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 19b2f23..d04a7c0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -241,8 +241,8 @@ @ApiOperation("开展的检定或校准项目编辑") @PostMapping("/carryOut/update") - public ReturnDTO carryOutItemUpdate(@RequestBody @Valid BizEquipmentStandardCarryoutItem carryoutItem) { - return carryoutItemService.updateCarryoutItem(carryoutItem); + public ReturnDTO carryOutItemUpdate(@RequestBody @Valid List carryoutItemList) { + return carryoutItemService.updateCarryoutItem(carryoutItemList); } @ApiOperation("开展的检定或校准项目批量删除") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java index 6e65738..3b7d65f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCarryoutItemServiceImpl.java @@ -15,10 +15,8 @@ import com.casic.missiles.mapper.equipment.BizEquipmentStandardCarryoutItemMapper; import com.casic.missiles.model.equipment.BizEquipmentStandardCarryoutItem; import com.casic.missiles.service.equipment.IBizEquipmentStandardCarryoutItemService; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.google.gson.JsonArray; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -59,15 +57,18 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Transactional(rollbackFor = Exception.class) @Override - public ReturnDTO updateCarryoutItem(BizEquipmentStandardCarryoutItem carryoutItem) { - List list = carryoutItem.getPersonList(); - String s = JSON.toJSONString(list); - carryoutItem.setParamPerson(s); - if (this.baseMapper.updateById(carryoutItem) > 0) { - return ReturnUtil.success(); + public ReturnDTO updateCarryoutItem(List carryoutItemList) { + for (BizEquipmentStandardCarryoutItem carryoutItem : carryoutItemList) { + List list = carryoutItem.getPersonList(); + String s = JSON.toJSONString(list); + carryoutItem.setParamPerson(s); + if (this.baseMapper.updateById(carryoutItem) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + return ReturnUtil.success(); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCarryoutItemService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCarryoutItemService.java index 67a363d..32663b7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCarryoutItemService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCarryoutItemService.java @@ -23,7 +23,7 @@ ReturnDTO addCarryoutItem(List carryoutItemList); - ReturnDTO updateCarryoutItem(BizEquipmentStandardCarryoutItem carryoutItem); + ReturnDTO updateCarryoutItem(List carryoutItemList); ReturnDTO deleteCarryoutItem(IdsDTO idsDTO); }