From 79997243f58f6ac76bdeeb0e36614346ea2faa02 Mon Sep 17 00:00:00 2001 From: fuhao Date: Fri, 6 Sep 2024 17:20:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A2=84=E8=AD=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=86=85=E5=AE=B9=E7=9A=84=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=BF=E6=8D=A2):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/board/domain/AlertPlan.java | 4 ++-- .../ruoyi/board/domain/dto/AlertPlanAndPlanTypeDTO.java | 9 +++++++-- .../ruoyi/board/service/impl/AlertPlanServiceImpl.java | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/domain/AlertPlan.java b/ruoyi-system/src/main/java/com/ruoyi/board/domain/AlertPlan.java index 90df5f57..5ca4b4c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/domain/AlertPlan.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/domain/AlertPlan.java @@ -50,6 +50,6 @@ public class AlertPlan extends BaseEntity { /** * 显示内容 */ - @TableField(value = "display_content") - private String displayContent; + @TableField(value = "preset_content_id") + private Long presetContentId; } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/AlertPlanAndPlanTypeDTO.java b/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/AlertPlanAndPlanTypeDTO.java index 9af13945..259b5c19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/AlertPlanAndPlanTypeDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/AlertPlanAndPlanTypeDTO.java @@ -35,7 +35,12 @@ public class AlertPlanAndPlanTypeDTO { private BigDecimal minValue; /** - * 显示内容 + * 显示内容 ID */ - private String displayContent; + private Long presetContentId; + + /** + * 显示内容名称 + */ + private String presetContentName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/AlertPlanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/AlertPlanServiceImpl.java index 8f320b51..b8eb0780 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/AlertPlanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/AlertPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.ruoyi.board.domain.AlertPlan; import com.ruoyi.board.domain.PlanType; +import com.ruoyi.board.domain.PresetContent; import com.ruoyi.board.domain.dto.AlertPlanAndPlanTypeDTO; import com.ruoyi.board.mapper.AlertPlanMapper; import com.ruoyi.board.service.IAlertPlanService; @@ -25,7 +26,9 @@ public class AlertPlanServiceImpl extends MPJBaseServiceImpl eq = new MPJLambdaWrapper() .selectAll(AlertPlan.class) .select(PlanType::getTypeName) + .selectAs(PresetContent::getName, "preset_content_name") .leftJoin(PlanType.class, PlanType::getId, AlertPlan::getType) + .leftJoin(PresetContent.class, PresetContent::getId, AlertPlan::getPresetContentId) .eq(ObjectUtils.isNotEmpty(alertPlan.getType()), AlertPlan::getType, alertPlan.getType()); return selectJoinList(AlertPlanAndPlanTypeDTO.class, eq); }