From 8bd931ea6e26c312b3f9393a90acb8429bb7bc93 Mon Sep 17 00:00:00 2001 From: fuhao Date: Wed, 14 Aug 2024 15:42:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A2=84=E8=AD=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/board/AlertPlanController.java | 8 ++--- .../com/ruoyi/board/domain/AlertPlan.java | 7 ++-- .../board/domain/enums/AlertPlanType.java | 18 ++++++++++ .../ruoyi/board/mapper/AlertPlanMapper.java | 4 +-- .../ruoyi/board/service/AlertPlanService.java | 6 ---- .../service/impl/AlertPlanServiceImpl.java | 33 ++++++++++++++++--- 6 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/board/domain/enums/AlertPlanType.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/board/service/AlertPlanService.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/AlertPlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/AlertPlanController.java index c3f5cadf..e6ee143c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/AlertPlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/AlertPlanController.java @@ -1,7 +1,7 @@ package com.ruoyi.web.controller.board; import com.ruoyi.board.domain.AlertPlan; -import com.ruoyi.board.service.AlertPlanService; +import com.ruoyi.board.service.IAlertPlanService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -22,10 +22,10 @@ import java.util.List; * @Date 2024-08-06 */ @RestController -@RequestMapping("/alertPlan") +@RequestMapping("/board/plan") public class AlertPlanController extends BaseController { @Autowired - private AlertPlanService alertPlanService; + private IAlertPlanService alertPlanService; /** * 查询预警计划列表 @@ -34,7 +34,7 @@ public class AlertPlanController extends BaseController { @GetMapping("/list") public TableDataInfo list(AlertPlan alertPlan) { startPage(); - List list = alertPlanService.list(); + List list = alertPlanService.selectList(alertPlan); return getDataTable(list); } 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 b5b6da8a..9e1d080a 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +13,7 @@ import lombok.EqualsAndHashCode; * 警报计划表 */ @Data -@EqualsAndHashCode(callSuper=true) +@EqualsAndHashCode(callSuper = true) @TableName(value = "pub_alert_plan") public class AlertPlan extends BaseEntity { /** @@ -37,13 +38,13 @@ public class AlertPlan extends BaseEntity { * 最大值 */ @TableField(value = "max_value") - private Integer maxValue; + private BigDecimal maxValue; /** * 最小值 */ @TableField(value = "min_value") - private Integer minValue; + private BigDecimal minValue; /** * 显示内容 diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/domain/enums/AlertPlanType.java b/ruoyi-system/src/main/java/com/ruoyi/board/domain/enums/AlertPlanType.java new file mode 100644 index 00000000..369179ab --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/board/domain/enums/AlertPlanType.java @@ -0,0 +1,18 @@ +package com.ruoyi.board.domain.enums; + +public class AlertPlanType { + + public static int getPlanTypeByName(String planTypeName) { + // 0:雾，1:雨，2:雪 + switch (planTypeName) { + case "雾": + return 0; + case "雨": + return 1; + case "雪": + return 2; + default: + return -1; + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/mapper/AlertPlanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/board/mapper/AlertPlanMapper.java index ce5198bc..2c42d898 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/mapper/AlertPlanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/mapper/AlertPlanMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.board.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.ruoyi.board.domain.AlertPlan; -public interface AlertPlanMapper extends BaseMapper { +public interface AlertPlanMapper extends MPJBaseMapper { } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/service/AlertPlanService.java b/ruoyi-system/src/main/java/com/ruoyi/board/service/AlertPlanService.java deleted file mode 100644 index 43eab511..00000000 --- a/ruoyi-system/src/main/java/com/ruoyi/board/service/AlertPlanService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ruoyi.board.service; - -import com.ruoyi.board.domain.AlertPlan; -import com.baomidou.mybatisplus.extension.service.IService; -public interface AlertPlanService extends IService{ -} 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 92ee56bf..bc34e590 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 @@ -1,11 +1,36 @@ package com.ruoyi.board.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseServiceImpl; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.board.domain.AlertPlan; import com.ruoyi.board.mapper.AlertPlanMapper; -import com.ruoyi.board.service.AlertPlanService; -@Service -public class AlertPlanServiceImpl extends ServiceImpl implements AlertPlanService{ +import com.ruoyi.board.service.IAlertPlanService; +import java.util.List; + +@Service +public class AlertPlanServiceImpl extends MPJBaseServiceImpl implements IAlertPlanService { + + @Override + public List selectList(AlertPlan alertPlan) { + LambdaQueryWrapper alertPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); + alertPlanLambdaQueryWrapper.eq(ObjectUtils.isNotEmpty(alertPlan.getType()), AlertPlan::getType, alertPlan.getType()); + alertPlanLambdaQueryWrapper.eq(ObjectUtils.isNotEmpty(alertPlan.getLevel()), AlertPlan::getLevel, alertPlan.getLevel()); + return list(alertPlanLambdaQueryWrapper); + } + + @Override + public AlertPlan getOneByTypeAndValue(Integer planType, Double value) { + if (planType < 0) { + return null; + } + LambdaQueryWrapper alertPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); + alertPlanLambdaQueryWrapper + .eq(AlertPlan::getType, planType) + .le(AlertPlan::getMinValue, value) + .ge(AlertPlan::getMaxValue, value); + return getOne(alertPlanLambdaQueryWrapper); + } }