From bca71a07ca0d47c5b3490bef6aea657e1f3d2d78 Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Fri, 8 Aug 2025 16:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B00808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InspectionMallPartnersController.java | 11 ++--- .../module/job/logger/AccessLogCleanJob.java | 41 ------------------- 2 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 dl-module-inspection/src/main/java/cn/iocoder/yudao/module/job/logger/AccessLogCleanJob.java diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java index 720305a4..17b160dc 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java @@ -221,7 +221,7 @@ public class InspectionMallPartnersController extends BaseController { } } - rows.add(CollUtil.newArrayList(Optional.ofNullable(item.getCarNum()).orElse(item.getCertificateNum()), Optional.ofNullable(item.getGoodsTitle()).orElse(""), Optional.ofNullable(item.getSkuName()).orElse(""), Optional.ofNullable(item.getBusinessChannel()).orElse(""), Optional.ofNullable(item.getCustomerSource()).orElse(""), Optional.ofNullable(item.getOtherName()).orElse(""), Optional.ofNullable(item.getInsuranceCompanyName()).orElse(""), ObjectUtil.isNotEmpty(item.getInsuranceExpiryDate()) ? DateUtil.format(item.getInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isNotEmpty(item.getVehicleInsuranceExpiryDate()) ? DateUtil.format(item.getVehicleInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isEmpty(item.getGoodsPrice()) ? "" : BigDecimal.valueOf(item.getGoodsPrice()) + rows.add(CollUtil.newArrayList(ObjectUtil.isNotEmpty(item.getCarNum()) ? item.getCarNum() : item.getCertificateNum(), Optional.ofNullable(item.getGoodsTitle()).orElse(""), Optional.ofNullable(item.getSkuName()).orElse(""), Optional.ofNullable(item.getBusinessChannel()).orElse(""), Optional.ofNullable(item.getCustomerSource()).orElse(""), Optional.ofNullable(item.getOtherName()).orElse(""), Optional.ofNullable(item.getInsuranceCompanyName()).orElse(""), ObjectUtil.isNotEmpty(item.getInsuranceExpiryDate()) ? DateUtil.format(item.getInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isNotEmpty(item.getVehicleInsuranceExpiryDate()) ? DateUtil.format(item.getVehicleInsuranceExpiryDate(), "yyyy-MM-dd") : "", ObjectUtil.isEmpty(item.getGoodsPrice()) ? "" : BigDecimal.valueOf(item.getGoodsPrice()) .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP) .toString(), ObjectUtil.isEmpty(item.getRealPayMoney()) ? "暂未支付" : BigDecimal.valueOf(item.getRealPayMoney()) .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP) @@ -239,17 +239,18 @@ public class InspectionMallPartnersController extends BaseController { //时间类型 if (StringUtils.isNotEmpty(query.getDateType())) { + filterBuilder.append("时间类型："); if (query.getDateType().equals("nextInspectionTime")) { - filterBuilder.append("下次年检时间：") + filterBuilder.append("下次年检时间") .append("，"); } else if (query.getDateType().equals("jcTime")) { - filterBuilder.append("检测时间：") + filterBuilder.append("检测时间") .append("，"); } else if (query.getDateType().equals("bxTime")) { - filterBuilder.append("保险到期时间（交强）：") + filterBuilder.append("保险到期时间（交强）") .append("，"); } else if (query.getDateType().equals("bxVehicleTime")) { - filterBuilder.append("保险到期时间（商业）：") + filterBuilder.append("保险到期时间（商业）") .append("，"); } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/job/logger/AccessLogCleanJob.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/job/logger/AccessLogCleanJob.java deleted file mode 100644 index d8917f2e..00000000 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/job/logger/AccessLogCleanJob.java +++ /dev/null @@ -1,41 +0,0 @@ -//package cn.iocoder.yudao.module.job.logger; -// -//import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; -//import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; -//import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.stereotype.Component; -// -//import javax.annotation.Resource; -// -///** -// * 物理删除 N 天前的访问日志的 Job -// * -// * @author j-sentinel -// */ -//@Component -//@Slf4j -//public class AccessLogCleanJob implements JobHandler { -// -// @Resource -// private ApiAccessLogService apiAccessLogService; -// -// /** -// * 清理超过（14）天的日志 -// */ -// private static final Integer JOB_CLEAN_RETAIN_DAY = 14; -// -// /** -// * 每次删除间隔的条数，如果值太高可能会造成数据库的压力过大 -// */ -// private static final Integer DELETE_LIMIT = 100; -// -// @Override -// @TenantIgnore -// public String execute(String param) { -// Integer count = apiAccessLogService.cleanAccessLog(JOB_CLEAN_RETAIN_DAY, DELETE_LIMIT); -// log.info("[execute][定时执行清理访问日志数量 ({}) 个]", count); -// return String.format("定时执行清理访问日志数量 %s 个", count); -// } -// -//}