b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-24 23:28:30 +08:00
parent 71114f73dc
commit 4698ca34fb
20 changed files with 1146 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AccidentRecordServiceImpl.java
+56 -2
View File
@@ -45,6 +45,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
* 事故记录 服务实现类
@@ -62,6 +63,8 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl<AccidentRecordMap
private static final int MONEY_SCALE = 2;
private static final String VEHICLE = "车辆";
private static final String SHIP = "船舶";
private static final Set<String> ACCIDENT_NATURES = Set.of("重大事故", "一般事故", "轻微事故", "其他");
private static final Set<String> ACCIDENT_RESPONSIBILITIES = Set.of("全部责任", "主要责任", "同等责任", "次要责任", "无责任");
@Override
public IPage<AccidentRecordVO> selectAccidentRecordPage(IPage<AccidentRecordVO> page, AccidentRecordVO accidentRecord) {
@@ -86,19 +89,64 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl<AccidentRecordMap
throw new ServiceException("导入数据不能为空");
}
List<AccidentRecordExcel> errorList = new ArrayList<>();
List<AccidentRecord> accidentRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
AccidentRecordExcel excel = data.get(index);
try {
AccidentRecord accidentRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, AccidentRecord.class));
submit(accidentRecord);
prepare(accidentRecord);
List<String> validationErrors = validateImportAccidentRecord(accidentRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
validateVehicleTypeImmutable(accidentRecord);
accidentRecordList.add(accidentRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (AccidentRecord accidentRecord : accidentRecordList) {
if (!save(accidentRecord)) {
throw new ServiceException("事故记录保存失败");
}
}
return errorList;
}
private List<String> validateImportAccidentRecord(AccidentRecord accidentRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(accidentRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(accidentRecord.getVehicleType()) && !VEHICLE.equals(accidentRecord.getVehicleType()) && !SHIP.equals(accidentRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(accidentRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(accidentRecord.getAccidentDate()), "事故发生日期不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(accidentRecord.getAccidentNature()), "事故性质不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(accidentRecord.getAccidentNature()) && !ACCIDENT_NATURES.contains(accidentRecord.getAccidentNature()), "事故性质不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(accidentRecord.getAccidentResponsibility()), "事故责任不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(accidentRecord.getAccidentResponsibility()) && !ACCIDENT_RESPONSIBILITIES.contains(accidentRecord.getAccidentResponsibility()), "事故责任不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, accidentRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, accidentRecord.getAccidentLocation(), LOCATION_MAX_LENGTH, "事故发生地点不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, accidentRecord.getAccidentReasonDamage(), REASON_DAMAGE_MAX_LENGTH, "事故原因及损坏情况不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, accidentRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, accidentRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportMoneyErrors(validationErrors, accidentRecord.getDirectEconomicLoss(), "直接经济损失");
addImportMoneyErrors(validationErrors, accidentRecord.getInsuranceClaimAmount(), "保险理赔金额");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(accidentRecord.getInsuranceClaimAmount()) && Func.isNotEmpty(accidentRecord.getDirectEconomicLoss()) && accidentRecord.getInsuranceClaimAmount().compareTo(accidentRecord.getDirectEconomicLoss()) > 0, "保险理赔金额不能超过直接经济损失金额");
return validationErrors;
}
private void addImportMoneyErrors(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > MONEY_SCALE, fieldName + "最多保留2位小数");
}
@Override
public List<AccidentRecordExportExcel> exportAccidentRecord(Wrapper<AccidentRecord> queryWrapper) {
return list(queryWrapper).stream().map(accidentRecord -> {
@@ -137,9 +185,15 @@ public class AccidentRecordServiceImpl extends BaseServiceImpl<AccidentRecordMap
if (Func.isEmpty(accidentRecord.getAccidentNature())) {
throw new ServiceException("事故性质不能为空");
}
if (!ACCIDENT_NATURES.contains(accidentRecord.getAccidentNature())) {
throw new ServiceException("事故性质不正确");
}
if (Func.isEmpty(accidentRecord.getAccidentResponsibility())) {
throw new ServiceException("事故责任不能为空");
}
if (!ACCIDENT_RESPONSIBILITIES.contains(accidentRecord.getAccidentResponsibility())) {
throw new ServiceException("事故责任不正确");
}
validateLength(accidentRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
validateLength(accidentRecord.getAccidentLocation(), LOCATION_MAX_LENGTH, "事故发生地点不能超过100字");
validateLength(accidentRecord.getAccidentReasonDamage(), REASON_DAMAGE_MAX_LENGTH, "事故原因及损坏情况不能超过500字");
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/AnnualInspectionRecordServiceImpl.java
+46 -2
View File
@@ -88,19 +88,63 @@ public class AnnualInspectionRecordServiceImpl extends BaseServiceImpl<AnnualIns
throw new ServiceException("导入数据不能为空");
}
List<AnnualInspectionRecordExcel> errorList = new ArrayList<>();
List<AnnualInspectionRecord> annualInspectionRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
AnnualInspectionRecordExcel excel = data.get(index);
try {
AnnualInspectionRecord annualInspectionRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, AnnualInspectionRecord.class));
submit(annualInspectionRecord);
prepare(annualInspectionRecord);
List<String> validationErrors = validateImportAnnualInspectionRecord(annualInspectionRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
validateVehicleTypeImmutable(annualInspectionRecord);
annualInspectionRecordList.add(annualInspectionRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (AnnualInspectionRecord annualInspectionRecord : annualInspectionRecordList) {
if (!save(annualInspectionRecord)) {
throw new ServiceException("年检记录保存失败");
}
}
return errorList;
}
private List<String> validateImportAnnualInspectionRecord(AnnualInspectionRecord annualInspectionRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(annualInspectionRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(annualInspectionRecord.getVehicleType()) && !VEHICLE.equals(annualInspectionRecord.getVehicleType()) && !SHIP.equals(annualInspectionRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(annualInspectionRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, VEHICLE.equals(annualInspectionRecord.getVehicleType()) && Func.isEmpty(annualInspectionRecord.getVehicleTechnicalLevel()), "车辆技术等级不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, SHIP.equals(annualInspectionRecord.getVehicleType()) && Func.isEmpty(annualInspectionRecord.getShipInspectionType()), "船舶检验类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(annualInspectionRecord.getValidUntilDate()), "有效期截止日不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(annualInspectionRecord.getValidUntilDate()) && Func.isNotEmpty(annualInspectionRecord.getInspectionAssessmentDate()) && !annualInspectionRecord.getValidUntilDate().isAfter(annualInspectionRecord.getInspectionAssessmentDate()), "有效期截止日应大于检测评定日期");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(annualInspectionRecord.getFee()), "费用不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getPassengerTypeLevel(), PASSENGER_TYPE_LEVEL_MAX_LENGTH, "客车类型及等级不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getInspectionUnit(), INSPECTION_UNIT_MAX_LENGTH, "检测评定单位不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getAssessmentUnit(), ASSESSMENT_UNIT_MAX_LENGTH, "评定(复核)单位不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, annualInspectionRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportMoneyErrors(validationErrors, annualInspectionRecord.getFee(), "费用");
return validationErrors;
}
private void addImportMoneyErrors(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > MONEY_SCALE, fieldName + "最多保留2位小数");
}
@Override
public List<AnnualInspectionRecordExportExcel> exportAnnualInspectionRecord(Wrapper<AnnualInspectionRecord> queryWrapper) {
return list(queryWrapper).stream().map(annualInspectionRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EquipmentLedgerServiceImpl.java
+53 -3
View File
@@ -19,8 +19,10 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
* 设备台账服务实现
@@ -68,19 +70,63 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl<EquipmentLedgerM
throw new ServiceException("导入数据不能为空");
}
List<EquipmentLedgerExcel> errorList = new ArrayList<>();
List<EquipmentLedger> equipmentLedgerList = new ArrayList<>();
Set<String> importEquipmentCodes = new HashSet<>();
for (int index = 0; index < data.size(); index++) {
EquipmentLedgerExcel excel = data.get(index);
try {
EquipmentLedger equipmentLedger = Objects.requireNonNull(BeanUtil.copyProperties(excel, EquipmentLedger.class));
submit(equipmentLedger);
prepare(equipmentLedger);
if (equipmentLedger.getId() == null && Func.isEmpty(equipmentLedger.getEquipmentCode())) {
equipmentLedger.setEquipmentCode(nextEquipmentCode(importEquipmentCodes));
}
List<String> validationErrors = validateImportEquipmentLedger(equipmentLedger);
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors,
!importEquipmentCodes.add(equipmentLedger.getEquipmentCode()), "设备编号在本次导入中重复");
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
validateEquipmentCodeImmutable(equipmentLedger);
equipmentLedgerList.add(equipmentLedger);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (EquipmentLedger equipmentLedger : equipmentLedgerList) {
if (!save(equipmentLedger)) {
throw new ServiceException("设备台账保存失败");
}
}
return errorList;
}
private List<String> validateImportEquipmentLedger(EquipmentLedger equipmentLedger) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, !VEHICLE.equals(equipmentLedger.getVehicleType()) && !SHIP.equals(equipmentLedger.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(equipmentLedger.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(equipmentLedger.getEquipmentCode()), "设备编号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(equipmentLedger.getEquipmentName()), "设备名称不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, equipmentLedger.getOnlineStatus() != 0 && equipmentLedger.getOnlineStatus() != 1, "是否在线不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getEquipmentCode(), EQUIPMENT_CODE_MAX_LENGTH, "设备编号格式不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getEquipmentName(), EQUIPMENT_NAME_MAX_LENGTH, "设备名称不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getEquipmentBrand(), EQUIPMENT_BRAND_MAX_LENGTH, "设备品牌不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getEquipmentType(), EQUIPMENT_TYPE_MAX_LENGTH, "设备类型不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getSpecificationModel(), SPECIFICATION_MODEL_MAX_LENGTH, "规格型号不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getOriginalEquipmentNo(), ORIGINAL_EQUIPMENT_NO_MAX_LENGTH, "原厂设备号不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, equipmentLedger.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
return validationErrors;
}
@Override
public List<EquipmentLedgerExcel> exportEquipmentLedger(Wrapper<EquipmentLedger> queryWrapper) {
return list(queryWrapper).stream()
@@ -90,10 +136,14 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl<EquipmentLedgerM
@Override
public String nextEquipmentCode() {
return nextEquipmentCode(Set.of());
}
private String nextEquipmentCode(Set<String> importEquipmentCodes) {
String prefix = "EQ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
for (int sequence = 1; sequence <= 99; sequence++) {
String code = prefix + String.format("%02d", sequence);
if (!exists(new LambdaQueryWrapper<EquipmentLedger>().eq(EquipmentLedger::getEquipmentCode, code))) {
if (!importEquipmentCodes.contains(code) && !exists(new LambdaQueryWrapper<EquipmentLedger>().eq(EquipmentLedger::getEquipmentCode, code))) {
return code;
}
}
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/EtcRecordServiceImpl.java
+42 -2
View File
@@ -64,20 +64,60 @@ public class EtcRecordServiceImpl extends BaseServiceImpl<EtcRecordMapper, EtcRe
throw new ServiceException("导入数据不能为空");
}
List<EtcRecordExcel> errorList = new ArrayList<>();
List<EtcRecord> etcRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
EtcRecordExcel excel = data.get(index);
try {
EtcRecord etcRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, EtcRecord.class));
etcRecord.setDataSource("批量导入");
submit(etcRecord);
prepare(etcRecord);
List<String> validationErrors = validateImportEtcRecord(etcRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
etcRecordList.add(etcRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (EtcRecord etcRecord : etcRecordList) {
if (!save(etcRecord)) {
throw new ServiceException("ETC记录保存失败");
}
}
return errorList;
}
private List<String> validateImportEtcRecord(EtcRecord etcRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(etcRecord.getVehicleNo()), "车牌号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(etcRecord.getEtcCardNo()), "ETC卡号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(etcRecord.getExitTime()), "出口时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(etcRecord.getTransactionAmount()), "交易金额不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(etcRecord.getEntryTime()) && Func.isNotEmpty(etcRecord.getExitTime()) && !etcRecord.getExitTime().isAfter(etcRecord.getEntryTime()), "出口时间应大于入口时间");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getEtcCardNo(), ETC_CARD_NO_MAX_LENGTH, "ETC卡号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getEntryStation(), STATION_MAX_LENGTH, "入口站不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getExitStation(), STATION_MAX_LENGTH, "出口站不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, etcRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportMoneyErrors(validationErrors, etcRecord.getTransactionAmount(), "交易金额");
return validationErrors;
}
private void addImportMoneyErrors(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > MONEY_SCALE, fieldName + "最多保留" + MONEY_SCALE + "位小数");
}
@Override
public List<EtcRecordExportExcel> exportEtcRecord(Wrapper<EtcRecord> queryWrapper) {
return list(queryWrapper).stream().map(etcRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InsuranceRecordServiceImpl.java
+59 -2
View File
@@ -57,6 +57,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Collection;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -81,6 +82,7 @@ public class InsuranceRecordServiceImpl extends BaseServiceImpl<InsuranceRecordM
private static final int OCR_TEMPLATE_MAX_LENGTH = 100;
private static final int POLICY_FILE_MAX_LENGTH = 1000;
private static final int REMARK_MAX_LENGTH = 200;
private static final Set<String> INSURANCE_TYPES = Set.of("交强险", "商业险", "承运人责任险", "货运险", "船舶险");
private static final Set<String> SUPPORT_FILE_TYPES = Set.of("jpg", "jpeg", "png", "bmp");
private static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4})[-/.年](\\d{1,2})[-/.月](\\d{1,2})日?");
@@ -110,19 +112,71 @@ public class InsuranceRecordServiceImpl extends BaseServiceImpl<InsuranceRecordM
throw new ServiceException("导入数据不能为空");
}
List<InsuranceRecordExcel> errorList = new ArrayList<>();
List<InsuranceRecord> insuranceRecordList = new ArrayList<>();
Set<String> importPolicyKeys = new HashSet<>();
for (int index = 0; index < data.size(); index++) {
InsuranceRecordExcel excel = data.get(index);
try {
InsuranceRecord insuranceRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, InsuranceRecord.class));
submit(insuranceRecord);
prepare(insuranceRecord);
List<String> validationErrors = validateImportInsuranceRecord(insuranceRecord);
if (Func.isNotEmpty(insuranceRecord.getVehicleType()) && Func.isNotEmpty(insuranceRecord.getInsuranceType()) && Func.isNotEmpty(insuranceRecord.getPolicyNo())) {
String policyKey = insuranceRecord.getVehicleType() + "\u0000" + insuranceRecord.getInsuranceType() + "\u0000" + insuranceRecord.getPolicyNo();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, !importPolicyKeys.add(policyKey), "同一车船类型和保险类型下保单号在本次导入中重复");
}
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
checkUniquePolicyNo(insuranceRecord);
insuranceRecordList.add(insuranceRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (InsuranceRecord insuranceRecord : insuranceRecordList) {
if (!save(insuranceRecord)) {
throw new ServiceException("保险记录保存失败");
}
}
return errorList;
}
private List<String> validateImportInsuranceRecord(InsuranceRecord insuranceRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(insuranceRecord.getVehicleType()) && !"车辆".equals(insuranceRecord.getVehicleType()) && !"船舶".equals(insuranceRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getInsuranceType()), "保险类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(insuranceRecord.getInsuranceType()) && !INSURANCE_TYPES.contains(insuranceRecord.getInsuranceType()), "保险类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getPolicyNo()), "保单号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getStartDate()), "开始日期不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getEndDate()), "结束日期不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(insuranceRecord.getStartDate()) && Func.isNotEmpty(insuranceRecord.getEndDate()) && insuranceRecord.getEndDate().isBefore(insuranceRecord.getStartDate()), "结束日期不能早于开始日期");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(insuranceRecord.getPremium()), "保费不能为空");
addImportNonNegativeError(validationErrors, insuranceRecord.getInsuredAmount(), "保额不能小于0");
addImportNonNegativeError(validationErrors, insuranceRecord.getPremium(), "保费不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getInsuranceType(), INSURANCE_TYPE_MAX_LENGTH, "保险类型不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getPolicyNo(), POLICY_NO_MAX_LENGTH, "保单号不能超过80字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getInvoiceNo(), INVOICE_NO_MAX_LENGTH, "发票号不能超过80字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getOcrTemplate(), OCR_TEMPLATE_MAX_LENGTH, "OCR识别模板不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getPolicyFile(), POLICY_FILE_MAX_LENGTH, "保单附件不能超过1000字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, insuranceRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
return validationErrors;
}
private void addImportNonNegativeError(List<String> validationErrors, BigDecimal value, String message) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, message);
}
@Override
public List<InsuranceRecordExportExcel> exportInsuranceRecord(Wrapper<InsuranceRecord> queryWrapper) {
return list(queryWrapper).stream().map(insuranceRecord -> {
@@ -288,6 +342,9 @@ public class InsuranceRecordServiceImpl extends BaseServiceImpl<InsuranceRecordM
if (Func.isEmpty(insuranceRecord.getInsuranceType())) {
throw new ServiceException("保险类型不能为空");
}
if (!INSURANCE_TYPES.contains(insuranceRecord.getInsuranceType())) {
throw new ServiceException("保险类型不正确");
}
if (Func.isEmpty(insuranceRecord.getPolicyNo())) {
throw new ServiceException("保单号不能为空");
}
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenancePlanServiceImpl.java
+39 -2
View File
@@ -82,19 +82,56 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
throw new ServiceException("导入数据不能为空");
}
List<MaintenancePlanExcel> errorList = new ArrayList<>();
List<MaintenancePlan> maintenancePlanList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
MaintenancePlanExcel excel = data.get(index);
try {
MaintenancePlan maintenancePlan = Objects.requireNonNull(BeanUtil.copyProperties(excel, MaintenancePlan.class));
submit(maintenancePlan);
prepare(maintenancePlan);
List<String> validationErrors = validateImportMaintenancePlan(maintenancePlan);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
maintenancePlanList.add(maintenancePlan);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (MaintenancePlan maintenancePlan : maintenancePlanList) {
if (!save(maintenancePlan)) {
throw new ServiceException("保养计划保存失败");
}
}
return errorList;
}
private List<String> validateImportMaintenancePlan(MaintenancePlan maintenancePlan) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenancePlan.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenancePlan.getVehicleType()) && !"车辆".equals(maintenancePlan.getVehicleType()) && !"船舶".equals(maintenancePlan.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenancePlan.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenancePlan.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenancePlan.getMaintainer(), MAINTAINER_MAX_LENGTH, "保养人不能超过20字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenancePlan.getMaintenanceItem(), MAINTENANCE_ITEM_MAX_LENGTH, "保养项目不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenancePlan.getAddress(), ADDRESS_MAX_LENGTH, "地址不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenancePlan.getRemark(), REMARK_MAX_LENGTH, "备注不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenancePlan.getMaintenanceTime()), "保养时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenancePlan.getCost()), "费用不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenancePlan.getCost()) && maintenancePlan.getCost().compareTo(BigDecimal.ZERO) < 0, "费用不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenancePlan.getMileage()) && maintenancePlan.getMileage().compareTo(BigDecimal.ZERO) < 0, "里程/航程数不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenancePlan.getNextMaintenanceMileage()) && maintenancePlan.getNextMaintenanceMileage().compareTo(BigDecimal.ZERO) < 0, "下次保养里程/航程不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenancePlan.getNextMaintenanceTime()) && Func.isNotEmpty(maintenancePlan.getMaintenanceTime()) && maintenancePlan.getNextMaintenanceTime().isBefore(maintenancePlan.getMaintenanceTime()), "下次保养时间不能早于保养时间");
return validationErrors;
}
@Override
public List<MaintenancePlanExportExcel> exportMaintenancePlan(Wrapper<MaintenancePlan> queryWrapper) {
return list(queryWrapper).stream().map(maintenancePlan -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java
+39 -2
View File
@@ -84,21 +84,58 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
throw new ServiceException("导入数据不能为空");
}
List<MaintenanceRecordExcel> errorList = new ArrayList<>();
List<MaintenanceRecord> maintenanceRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
MaintenanceRecordExcel excel = data.get(index);
try {
MaintenanceRecord maintenanceRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, MaintenanceRecord.class));
maintenanceRecord.setCreateTime(null);
maintenanceRecord.setUpdateTime(null);
submit(maintenanceRecord);
prepare(maintenanceRecord);
List<String> validationErrors = validateImportMaintenanceRecord(maintenanceRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
maintenanceRecordList.add(maintenanceRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (MaintenanceRecord maintenanceRecord : maintenanceRecordList) {
if (!save(maintenanceRecord)) {
throw new ServiceException("车辆维修记录保存失败");
}
}
return errorList;
}
private List<String> validateImportMaintenanceRecord(MaintenanceRecord maintenanceRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenanceRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenanceRecord.getVehicleType()) && !"车辆".equals(maintenanceRecord.getVehicleType()) && !"船舶".equals(maintenanceRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenanceRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getMaintainer(), MAINTAINER_MAX_LENGTH, "维修人不能超过20字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getLocation(), LOCATION_MAX_LENGTH, "维修位置不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getReplacedPart(), REPLACED_PART_MAX_LENGTH, "更换零件不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getAddress(), ADDRESS_MAX_LENGTH, "地址不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, maintenanceRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenanceRecord.getMaintenanceTime()), "维修时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(maintenanceRecord.getCost()), "费用不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenanceRecord.getCost()) && maintenanceRecord.getCost().compareTo(BigDecimal.ZERO) < 0, "费用不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenanceRecord.getMileage()) && maintenanceRecord.getMileage().compareTo(BigDecimal.ZERO) < 0, "里程/航程数不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(maintenanceRecord.getFactoryTime()) && Func.isNotEmpty(maintenanceRecord.getMaintenanceTime()) && maintenanceRecord.getFactoryTime().isBefore(maintenanceRecord.getMaintenanceTime()), "出厂时间不能早于维修时间");
return validationErrors;
}
@Override
public List<MaintenanceRecordExportExcel> exportMaintenanceRecord(Wrapper<MaintenanceRecord> queryWrapper) {
return list(queryWrapper).stream().map(maintenanceRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MileageRecordServiceImpl.java
+45 -2
View File
@@ -84,19 +84,62 @@ public class MileageRecordServiceImpl extends BaseServiceImpl<MileageRecordMappe
throw new ServiceException("导入数据不能为空");
}
List<MileageRecordExcel> errorList = new ArrayList<>();
List<MileageRecord> mileageRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
MileageRecordExcel excel = data.get(index);
try {
MileageRecord mileageRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, MileageRecord.class));
submit(mileageRecord);
prepare(mileageRecord);
List<String> validationErrors = validateImportMileageRecord(mileageRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
validateVehicleNoImmutable(mileageRecord);
mileageRecordList.add(mileageRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (MileageRecord mileageRecord : mileageRecordList) {
if (!save(mileageRecord)) {
throw new ServiceException("里程记录保存失败");
}
}
return errorList;
}
private List<String> validateImportMileageRecord(MileageRecord mileageRecord) {
List<String> validationErrors = new ArrayList<>();
boolean isShip = VEHICLE_TYPE_SHIP.equals(mileageRecord.getVehicleType());
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, !VEHICLE_TYPE_VEHICLE.equals(mileageRecord.getVehicleType()) && !isShip, "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(mileageRecord.getVehicleNo()), isShip ? "船号不能为空" : "车牌号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, mileageRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, isShip ? "船号不能超过30字" : "车牌号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, mileageRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, mileageRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportMileageErrors(validationErrors, mileageRecord.getPreviousMonthMileage(), isShip ? "上月统计航程数" : "上月统计里程数");
addImportMileageErrors(validationErrors, mileageRecord.getCurrentMonthMileage(), isShip ? "本月统计航程数" : "本月统计里程数");
addImportMileageErrors(validationErrors, mileageRecord.getMonthlyMileage(), isShip ? "本月航行航程数" : "本月行驶里程数");
addImportMileageErrors(validationErrors, mileageRecord.getTotalMileage(), isShip ? "累计航程数" : "累计行驶里程数");
if (mileageRecord.getPreviousMonthMileage() != null && mileageRecord.getCurrentMonthMileage() != null && mileageRecord.getMonthlyMileage() != null) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, mileageRecord.getCurrentMonthMileage().subtract(mileageRecord.getPreviousMonthMileage()).compareTo(mileageRecord.getMonthlyMileage()) != 0, isShip ? "本月航行航程数应等于本月统计航程数减去上月统计航程数" : "本月行驶里程数应等于本月统计里程数减去上月统计里程数");
}
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, mileageRecord.getTotalMileage() != null && mileageRecord.getCurrentMonthMileage() != null && mileageRecord.getTotalMileage().compareTo(mileageRecord.getCurrentMonthMileage()) < 0, isShip ? "累计航程数应大于等于本月统计航程数" : "累计行驶里程数应大于等于本月统计里程数");
return validationErrors;
}
private void addImportMileageErrors(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > MILEAGE_SCALE, fieldName + "最多保留2位小数");
}
@Override
public List<MileageRecordExportExcel> exportMileageRecord(Wrapper<MileageRecord> queryWrapper) {
return list(queryWrapper).stream().map(mileageRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/OilElectricRecordServiceImpl.java
+48 -2
View File
@@ -73,20 +73,66 @@ public class OilElectricRecordServiceImpl extends BaseServiceImpl<OilElectricRec
throw new ServiceException("导入数据不能为空");
}
List<OilElectricRecordExcel> errorList = new ArrayList<>();
List<OilElectricRecord> oilElectricRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
OilElectricRecordExcel excel = data.get(index);
try {
OilElectricRecord oilElectricRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, OilElectricRecord.class));
oilElectricRecord.setDataSource(defaultDataSource(oilElectricRecord.getDataSource()));
submit(oilElectricRecord);
prepare(oilElectricRecord);
List<String> validationErrors = validateImportOilElectricRecord(oilElectricRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
oilElectricRecordList.add(oilElectricRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (OilElectricRecord oilElectricRecord : oilElectricRecordList) {
if (!save(oilElectricRecord)) {
throw new ServiceException("油电记录保存失败");
}
}
return errorList;
}
private List<String> validateImportOilElectricRecord(OilElectricRecord oilElectricRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(oilElectricRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(oilElectricRecord.getVehicleType()) && !VEHICLE.equals(oilElectricRecord.getVehicleType()) && !SHIP.equals(oilElectricRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(oilElectricRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(oilElectricRecord.getTransactionTime()), "交易时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(oilElectricRecord.getFeeType()), "费用类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(oilElectricRecord.getFeeType()) && !FEE_TYPES.contains(oilElectricRecord.getFeeType()), "费用类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(oilElectricRecord.getTransactionAmount()), "交易金额不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getCardNo(), CARD_NO_MAX_LENGTH, "卡号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getCardHolder(), CARD_HOLDER_MAX_LENGTH, "持卡人不能超过20字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getOilProduct(), OIL_PRODUCT_MAX_LENGTH, "油品不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getStation(), STATION_MAX_LENGTH, "站点不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, oilElectricRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportNumberErrors(validationErrors, oilElectricRecord.getTransactionAmount(), "交易金额", MONEY_SCALE);
addImportNumberErrors(validationErrors, oilElectricRecord.getUnitPrice(), "单价", MONEY_SCALE);
addImportNumberErrors(validationErrors, oilElectricRecord.getBalance(), "余额", MONEY_SCALE);
addImportNumberErrors(validationErrors, oilElectricRecord.getQuantity(), "数量", QUANTITY_SCALE);
return validationErrors;
}
private void addImportNumberErrors(List<String> validationErrors, BigDecimal value, String fieldName, int scale) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > scale, fieldName + "最多保留" + scale + "位小数");
}
@Override
public List<OilElectricRecordExportExcel> exportOilElectricRecord(Wrapper<OilElectricRecord> queryWrapper) {
return list(queryWrapper).stream().map(oilElectricRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/OtherExpenseRecordServiceImpl.java
+41 -2
View File
@@ -67,20 +67,59 @@ public class OtherExpenseRecordServiceImpl extends BaseServiceImpl<OtherExpenseR
throw new ServiceException("导入数据不能为空");
}
List<OtherExpenseRecordExcel> errorList = new ArrayList<>();
List<OtherExpenseRecord> otherExpenseRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
OtherExpenseRecordExcel excel = data.get(index);
try {
OtherExpenseRecord otherExpenseRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, OtherExpenseRecord.class));
otherExpenseRecord.setDataSource("批量导入");
submit(otherExpenseRecord);
prepare(otherExpenseRecord);
List<String> validationErrors = validateImportOtherExpenseRecord(otherExpenseRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
otherExpenseRecordList.add(otherExpenseRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (OtherExpenseRecord otherExpenseRecord : otherExpenseRecordList) {
if (!save(otherExpenseRecord)) {
throw new ServiceException("其他费用记录保存失败");
}
}
return errorList;
}
private List<String> validateImportOtherExpenseRecord(OtherExpenseRecord otherExpenseRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(otherExpenseRecord.getExpenseDate()), "费用日期不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(otherExpenseRecord.getExpenseType()), "费用类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(otherExpenseRecord.getExpenseType()) && !EXPENSE_TYPES.contains(otherExpenseRecord.getExpenseType()), "费用类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(otherExpenseRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(otherExpenseRecord.getVehicleType()) && !VEHICLE.equals(otherExpenseRecord.getVehicleType()) && !SHIP.equals(otherExpenseRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(otherExpenseRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(otherExpenseRecord.getAmount()), "金额不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, otherExpenseRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, otherExpenseRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, otherExpenseRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
addImportMoneyErrors(validationErrors, otherExpenseRecord.getAmount(), "金额");
return validationErrors;
}
private void addImportMoneyErrors(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.stripTrailingZeros().scale() > MONEY_SCALE, fieldName + "最多保留" + MONEY_SCALE + "位小数");
}
@Override
public List<OtherExpenseRecordExportExcel> exportOtherExpenseRecord(Wrapper<OtherExpenseRecord> queryWrapper) {
return list(queryWrapper).stream().map(otherExpenseRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TireReplacementRecordServiceImpl.java
+37 -2
View File
@@ -84,19 +84,54 @@ public class TireReplacementRecordServiceImpl extends BaseServiceImpl<TireReplac
throw new ServiceException("导入数据不能为空");
}
List<TireReplacementRecordExcel> errorList = new ArrayList<>();
List<TireReplacementRecord> tireReplacementRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
TireReplacementRecordExcel excel = data.get(index);
try {
TireReplacementRecord tireReplacementRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, TireReplacementRecord.class));
submit(tireReplacementRecord);
prepare(tireReplacementRecord);
List<String> validationErrors = validateImportTireReplacementRecord(tireReplacementRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
tireReplacementRecordList.add(tireReplacementRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (TireReplacementRecord tireReplacementRecord : tireReplacementRecordList) {
if (!save(tireReplacementRecord)) {
throw new ServiceException("轮胎更换记录保存失败");
}
}
return errorList;
}
private List<String> validateImportTireReplacementRecord(TireReplacementRecord tireReplacementRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(tireReplacementRecord.getVehicleNo()), "车牌号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(tireReplacementRecord.getReplacementTime()), "换胎时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(tireReplacementRecord.getReplacementCost()), "换胎费用不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getHandler(), HANDLER_MAX_LENGTH, "处理人不能超过20字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getTireBrand(), TIRE_BRAND_MAX_LENGTH, "轮胎品牌不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getReplacementDescription(), DESCRIPTION_MAX_LENGTH, "换胎说明不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, tireReplacementRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(tireReplacementRecord.getTireQuantity()) && tireReplacementRecord.getTireQuantity() <= 0, "更换轮胎数量必须大于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(tireReplacementRecord.getReplacementCost()) && tireReplacementRecord.getReplacementCost().compareTo(BigDecimal.ZERO) < 0, "换胎费用不能小于0");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(tireReplacementRecord.getReplacementCost()) && tireReplacementRecord.getReplacementCost().stripTrailingZeros().scale() > 2, "换胎费用最多保留2位小数");
return validationErrors;
}
@Override
public List<TireReplacementRecordExportExcel> exportTireReplacementRecord(Wrapper<TireReplacementRecord> queryWrapper) {
return list(queryWrapper).stream().map(tireReplacementRecord -> {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportChangeRecordServiceImpl.java
+34 -2
View File
@@ -84,19 +84,51 @@ public class TransportChangeRecordServiceImpl extends BaseServiceImpl<TransportC
throw new ServiceException("导入数据不能为空");
}
List<TransportChangeRecordExcel> errorList = new ArrayList<>();
List<TransportChangeRecord> transportChangeRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
TransportChangeRecordExcel excel = data.get(index);
try {
TransportChangeRecord transportChangeRecord = Objects.requireNonNull(BeanUtil.copyProperties(excel, TransportChangeRecord.class));
submit(transportChangeRecord);
prepare(transportChangeRecord);
List<String> validationErrors = validateImportTransportChangeRecord(transportChangeRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
transportChangeRecordList.add(transportChangeRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (TransportChangeRecord transportChangeRecord : transportChangeRecordList) {
if (!save(transportChangeRecord)) {
throw new ServiceException("变更记录保存失败");
}
}
return errorList;
}
private List<String> validateImportTransportChangeRecord(TransportChangeRecord transportChangeRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(transportChangeRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(transportChangeRecord.getVehicleType()) && !VEHICLE.equals(transportChangeRecord.getVehicleType()) && !SHIP.equals(transportChangeRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(transportChangeRecord.getChangeItem()), "变更事项不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(transportChangeRecord.getChangeItem()) && !CHANGE_ITEMS.contains(transportChangeRecord.getChangeItem()), "变更事项不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(transportChangeRecord.getChangeContent()), "变更内容不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, transportChangeRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, transportChangeRecord.getChangeContent(), CHANGE_CONTENT_MAX_LENGTH, "变更内容不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, transportChangeRecord.getRemark(), REMARK_MAX_LENGTH, "备注不能超过200字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, transportChangeRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
return validationErrors;
}
@Override
public List<TransportChangeRecordExportExcel> exportTransportChangeRecord(Wrapper<TransportChangeRecord> queryWrapper) {
return list(queryWrapper).stream()
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ViolationRecordServiceImpl.java
+53 -2
View File
@@ -91,6 +91,7 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl<ViolationRecordM
throw new ServiceException("导入数据不能为空");
}
List<ViolationRecordImportExcel> errorList = new ArrayList<>();
List<ViolationRecord> violationRecordList = new ArrayList<>();
for (int index = 0; index < data.size(); index++) {
ViolationRecordImportExcel excel = data.get(index);
try {
@@ -100,15 +101,65 @@ public class ViolationRecordServiceImpl extends BaseServiceImpl<ViolationRecordM
} else {
violationRecord.setViolationType(excel.getViolationTypeOrItem());
}
submit(violationRecord);
prepare(violationRecord);
List<String> validationErrors = validateImportViolationRecord(violationRecord);
if (Func.isNotEmpty(validationErrors)) {
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, validationErrors));
errorList.add(excel);
continue;
}
validateVehicleTypeImmutable(violationRecord);
violationRecordList.add(violationRecord);
} catch (Exception exception) {
excel.setErrorMessage("第" + (index + 2) + "行：" + exception.getMessage());
String message = exception instanceof ServiceException ? exception.getMessage() : "导入失败";
excel.setErrorMessage(org.springblade.common.excel.ImportFailureExcelUtil.formatErrorMessage(index + 2, List.of(message)));
errorList.add(excel);
}
}
if (Func.isNotEmpty(errorList)) {
org.springframework.transaction.interceptor.TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return errorList;
}
for (ViolationRecord violationRecord : violationRecordList) {
if (!save(violationRecord)) {
throw new ServiceException("违章记录保存失败");
}
}
return errorList;
}
private List<String> validateImportViolationRecord(ViolationRecord violationRecord) {
List<String> validationErrors = new ArrayList<>();
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getVehicleType()), "车船类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(violationRecord.getVehicleType()) && !"车辆".equals(violationRecord.getVehicleType()) && !"船舶".equals(violationRecord.getVehicleType()), "车船类型不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getVehicleNo()), "车牌号/船号不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getDriverName()), "驾驶人/船长不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, "车辆".equals(violationRecord.getVehicleType()) && Func.isEmpty(violationRecord.getViolationType()), "类型不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, "船舶".equals(violationRecord.getVehicleType()) && Func.isEmpty(violationRecord.getViolationItem()), "事项不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getViolationTime()), "时间不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(violationRecord.getViolationTime()) && violationRecord.getViolationTime().isAfter(LocalDateTime.now()), "时间不能超过当前时间");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getLocation()), "地址不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getProcessStatus()), "状态不能为空");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(violationRecord.getProcessStatus()) && !PROCESSED.equals(violationRecord.getProcessStatus()) && !UNPROCESSED.equals(violationRecord.getProcessStatus()), "状态值不正确");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isEmpty(violationRecord.getProcessDescription()), "过程描述不能为空");
addImportNonNegativeError(validationErrors, violationRecord.getFineAmount(), "被罚金额");
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(violationRecord.getDeductPoints()) && (violationRecord.getDeductPoints() < 0 || violationRecord.getDeductPoints() > MAX_DEDUCT_POINTS), "被扣分数范围为0-15分");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getVehicleNo(), VEHICLE_NO_MAX_LENGTH, "车牌号/船号不能超过30字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getDriverName(), DRIVER_NAME_MAX_LENGTH, "驾驶人/船长不能超过20字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getViolationType(), TYPE_MAX_LENGTH, "类型不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getViolationItem(), ITEM_MAX_LENGTH, "事项不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getLocation(), LOCATION_MAX_LENGTH, "地址不能超过100字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getPenaltyUnit(), PENALTY_UNIT_MAX_LENGTH, "被罚单位不能超过50字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getProcessDescription(), DESCRIPTION_MAX_LENGTH, "过程描述不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getProcessResult(), RESULT_MAX_LENGTH, "处理结果不能超过500字");
org.springblade.common.excel.ImportFailureExcelUtil.addLengthValidationError(validationErrors, violationRecord.getAttachments(), ATTACHMENTS_MAX_LENGTH, "附件不能超过1000字");
return validationErrors;
}
private void addImportNonNegativeError(List<String> validationErrors, BigDecimal value, String fieldName) {
org.springblade.common.excel.ImportFailureExcelUtil.addValidationError(validationErrors, Func.isNotEmpty(value) && value.compareTo(BigDecimal.ZERO) < 0, fieldName + "不能小于0");
}
@Override
public List<ViolationRecordExcel> exportViolationRecord(Wrapper<ViolationRecord> queryWrapper) {
return list(queryWrapper).stream().map(violationRecord -> {