From 2ddb01132c0d74dedd36feb058a8484dba60bb00 Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 31 Jan 2024 14:25:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=9C=AA=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/safeproduct/entity/CarEntity.java | 2 -- .../service/ICarAnnualInspectionService.java | 8 ++++++ .../safeproduct/service/ICarInsuranceService.java | 7 +++++ .../impl/CarAnnualInspectionServiceImpl.java | 17 ++++++++++++ .../service/impl/CarInsuranceServiceImpl.java | 19 ++++++++++++- .../safeproduct/service/impl/CarServiceImpl.java | 32 ++++++++++++++++------ 6 files changed, 74 insertions(+), 11 deletions(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java index 706093a..5bc6403 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarEntity.java @@ -64,12 +64,10 @@ public class CarEntity extends BaseEntity { @ApiModelProperty("下期年检时间") private Date nextAnnualInspectionTime; - @NotNull @Size(max = 50, message = "年检状态长度不能超过50") @ApiModelProperty("年检状态") private String annualInspectionStatus; - @NotNull @Size(max = 50, message = "保险状态长度不能超过50") @ApiModelProperty("保险状态") private String insuranceStatus; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarAnnualInspectionService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarAnnualInspectionService.java index 0ed28d1..a1f7099 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarAnnualInspectionService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarAnnualInspectionService.java @@ -37,4 +37,12 @@ public interface ICarAnnualInspectionService extends IService getCarAnnualInspectionPage(Map param, Query query); + + /** + * 删除关联年检记录 + * @param carId 车辆id + * @return true-成功，false-失败 + */ + boolean removeRelativeCarAnnualInspection(Long carId); + } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarInsuranceService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarInsuranceService.java index d2be60e..4c8405a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarInsuranceService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ICarInsuranceService.java @@ -38,4 +38,11 @@ public interface ICarInsuranceService extends IService { * @return 车保记录数据 */ IPage getCarInsurancePage(Map param, Query query); + + /** + * 删除关联车保记录 + * @param carId 车辆id + * @return true-成功，false-失败 + */ + boolean removeRelativeCarInsurance(Long carId); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java index 10be8b6..8f1e765 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 年检记录服务实现类 @@ -93,6 +94,22 @@ public class CarAnnualInspectionServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CarAnnualInspectionEntity::getCarId, carId); + List list = this.list(queryWrapper); + // 若无关联年检记录，返回true + if (CollectionUtils.isEmpty(list)) { + return true; + } + List ids = list.stream().map(CarAnnualInspectionEntity::getId).collect(Collectors.toList()); + return this.removeByIds(ids); + } + + /** * 查询是否存在同月编号 * @param currentMonth 当月 * @return 存在则返回上一编号，否则返回null diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java index cd132ef..17ce3bc 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 车保记录服务实现类 @@ -55,7 +56,7 @@ public class CarInsuranceServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CarInsuranceEntity::getCarId, carId); + List list = this.list(queryWrapper); + // 若无关联用车记录，返回true + if (CollectionUtils.isEmpty(list)) { + return true; + } + List ids = list.stream().map(CarInsuranceEntity::getId).collect(Collectors.toList()); + return this.removeByIds(ids); + } + + /** * 查询是否存在同月编号 * @param currentMonth 当月 * @return 存在则返回上一编号，否则返回null diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarServiceImpl.java index df4619c..88a67ed 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarServiceImpl.java @@ -12,12 +12,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hnac.hzims.common.logs.utils.StringUtils; import com.hnac.hzims.safeproduct.dto.CarMilesYearDTO; import com.hnac.hzims.safeproduct.entity.CarEntity; -import com.hnac.hzims.safeproduct.enums.CarMaintenanceStatusEnum; import com.hnac.hzims.safeproduct.mapper.CarMapper; -import com.hnac.hzims.safeproduct.service.ICarCheckRecordService; -import com.hnac.hzims.safeproduct.service.ICarMaintenanceService; -import com.hnac.hzims.safeproduct.service.ICarService; -import com.hnac.hzims.safeproduct.service.ICarUsedRecordService; +import com.hnac.hzims.safeproduct.service.*; import com.hnac.hzims.safeproduct.vo.CarMilesYearVO; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Query; @@ -55,6 +51,12 @@ public class CarServiceImpl extends ServiceImpl implements @Autowired ICarCheckRecordService carCheckRecordService; + @Autowired + ICarInsuranceService carInsuranceService; + + @Autowired + ICarAnnualInspectionService carAnnualInspectionService; + /** * 年度里程数页面 */ @@ -195,15 +197,29 @@ public class CarServiceImpl extends ServiceImpl implements // 删除关联维保记录 boolean removeCarMaintenance = carMaintenanceService.removeRelativeCarMaintenance(id); if (!removeCarMaintenance) { - return false; + throw new ServiceException("关联维保记录删除失败"); } // 删除关联用车记录 boolean removeCarUsedRecord = carUsedRecordService.removeRelativeCarUsedRecord(id); if (!removeCarUsedRecord) { - return false; + throw new ServiceException("关联用车记录删除失败"); } // 删除关联车检记录 - return carCheckRecordService.removeRelativeCarCheckRecord(id); + boolean removeCarCheckRecord = carCheckRecordService.removeRelativeCarCheckRecord(id); + if (!removeCarCheckRecord) { + throw new ServiceException("关联车检记录删除失败"); + } + // 删除关联年检记录 + boolean removeCarAnnualInspection = carAnnualInspectionService.removeRelativeCarAnnualInspection(id); + if (!removeCarAnnualInspection) { + throw new ServiceException("关联年检记录删除失败"); + } + // 删除关联车保记录 + boolean removeCarInsurance = carInsuranceService.removeRelativeCarInsurance(id); + if (!removeCarInsurance) { + throw new ServiceException("关联车保记录删除失败"); + } + return true; } return false; }