From 92ab5142d3fb424a99c5eee132e7b29388aaa859 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 12 Apr 2024 09:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83status=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9B=E6=B7=BB=E5=8A=A0Situation=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/scale/constant/SituationEnum.java | 44 +++++++++++++++++++ .../org/dromara/scale/domain/SysScale.java | 4 +- .../scale/domain/SysScaleFactorRange.java | 2 +- .../dromara/scale/domain/SysScalePublish.java | 4 +- .../dromara/scale/domain/bo/SysScaleBo.java | 7 ++- .../scale/domain/bo/SysScalePublishBo.java | 6 +-- .../domain/vo/SysEvaluationConclusionVo.java | 4 +- .../domain/vo/SysScaleFactorRangeVo.java | 2 +- .../scale/domain/vo/SysScalePublishVo.java | 6 +-- .../dromara/scale/domain/vo/SysScaleVo.java | 6 +-- .../SysEvaluationConclusionServiceImpl.java | 11 ++--- .../service/impl/SysScaleServiceImpl.java | 3 +- 12 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java new file mode 100644 index 0000000..b312590 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/constant/SituationEnum.java @@ -0,0 +1,44 @@ +package org.dromara.scale.constant; + + +import com.fasterxml.jackson.annotation.JsonValue; + + +public enum SituationEnum { + + /** + * + */ + NONE(1, "未见异常"), + LOW(2, "低风险"), + MIDDEL(3, "中风险"), + HIGH(4, "高风险"), + MAJOR(5, "重大风险"); + + private Integer status; + private String name; + + SituationEnum(Integer status, String name) { + this.status = status; + this.name = name; + } + + + public Integer getValue() { + return this.status; + } + + @JsonValue + public String getName() { + return name; + } + + public static String getNameByCode(Integer code){ + for (SituationEnum value : SituationEnum.values()) { + if(value.getValue().equals(code)){ + return value.getName(); + } + } + return null; + } +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java index d53f63e..47645db 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScale.java @@ -59,9 +59,9 @@ public class SysScale extends BaseEntity { private String scaleDetails; /** - * 状态（0正常 1停用） + * 状态（0停用 1正常） */ - private String status; + private Integer status; /** * 适应人群：对应字典项people_type diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java index 563209b..d8cb9eb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleFactorRange.java @@ -66,7 +66,7 @@ public class SysScaleFactorRange extends BaseEntity { /** * 严重度，对应数据字典 YZD */ - private Long situation; + private Integer situation; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java index ab8578e..a426020 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java @@ -59,9 +59,9 @@ public class SysScalePublish { private Date expireTime; /** - * 状态 0:正常；1:停用 + * 状态 0:停用；1:正常 */ - private Long status; + private Integer status; /** * 0:不允许，1：允许 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java index 28c5281..2cd7a57 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java @@ -1,6 +1,5 @@ package org.dromara.scale.domain.bo; -import cn.hutool.core.util.StrUtil; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import jakarta.validation.constraints.NotBlank; @@ -64,10 +63,10 @@ public class SysScaleBo extends BaseEntity { private String scaleDetails; /** - * 状态（0正常 1停用） + * 状态（0停用 1正常） */ - @NotBlank(message = "状态（0正常 1停用）不能为空", groups = {AddGroup.class, EditGroup.class}) - private String status; + @NotBlank(message = "状态（0停用 1正常）不能为空", groups = {AddGroup.class, EditGroup.class}) + private Integer status; /** * 适应人群：对应字典项people_type diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java index 956eaa4..cff5ec8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java @@ -67,10 +67,10 @@ public class SysScalePublishBo { private Date expireTime; /** - * 状态 0:正常；1:停用 + * 状态 0:停用；1:正常 */ - //@NotNull(message = "状态 0:正常；1:停用不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long status; + //@NotNull(message = "状态 0:停用；1:正常不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; /** * 0:不允许，1：允许 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java index 016030b..11def19 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationConclusionVo.java @@ -81,7 +81,9 @@ public class SysEvaluationConclusionVo implements Serializable { /** * 风险等级 */ - private Long situation; + private Integer situation; + + private String SituationName; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java index 9604926..a981d01 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleFactorRangeVo.java @@ -83,7 +83,7 @@ public class SysScaleFactorRangeVo implements Serializable { * 严重度，对应数据字典 YZD */ @ExcelProperty(value = "严重度，对应数据字典 YZD") - private Long situation; + private Integer situation; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java index 4454016..913e6e5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java @@ -69,10 +69,10 @@ public class SysScalePublishVo implements Serializable { private Date expireTime; /** - * 状态 0:正常；1:停用 + * 状态 0:停用；1:正常 */ - @ExcelProperty(value = "状态 0:正常；1:停用") - private Long status; + @ExcelProperty(value = "状态 0:停用；1:正常") + private Integer status; /** * 0:不允许，1：允许 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java index 66ffc1f..12a339a 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java @@ -59,11 +59,11 @@ public class SysScaleVo implements Serializable { private String scaleDetails; /** - * 状态（0正常 1停用） + * 状态（0停用 1正常） */ @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; + @ExcelDictFormat(readConverterExp = "0=停用,1=正常") + private Integer status; /** * 适应人群：对应字典项people_type diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java index 5c01206..0e4d342 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.scale.constant.ScaleDimensionEnum; import org.dromara.scale.constant.ScoreRuleTypeEnum; +import org.dromara.scale.constant.SituationEnum; import org.dromara.scale.constant.StatusEnum; import org.dromara.scale.domain.*; import org.dromara.scale.domain.bo.SysEvaluationAnswerBo; @@ -119,13 +120,13 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus List conclusionAdd = MapstructUtils.convert(list, SysEvaluationConclusion.class); baseMapper.insertBatch(conclusionAdd); - Long riskLevel = -1L; + Integer riskLevel = -1; String riskName = ""; //选择风险等级最高 for (SysEvaluationConclusionVo ec : list) { if (ec.getSituation() > riskLevel) { riskLevel = ec.getSituation(); - //riskName = ec.getSituationName(); + riskName = ec.getSituationName(); } } //判断风险等级是否为"高风险、重大风险"，若是，则形成预警记录 @@ -223,7 +224,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus evalConclusion.setEvalPropose(range.getEvalPropose()); evalConclusion.setFactorRangeId(range.getRangeId()); evalConclusion.setSituation(range.getSituation()); - //evalConclusion.setSituationName(range.getSituationName()); + evalConclusion.setSituationName(SituationEnum.getNameByCode(range.getSituation())); break; } } else { @@ -234,7 +235,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus evalConclusion.setEvalPropose(range.getEvalPropose()); evalConclusion.setFactorRangeId(range.getRangeId()); evalConclusion.setSituation(range.getSituation()); - //evalConclusion.setSituationName(range.getSituationName()); + evalConclusion.setSituationName(SituationEnum.getNameByCode(range.getSituation())); break; } } else if (Objects.nonNull(range.getMinValue()) && Objects.isNull(range.getMaxValue())) { @@ -244,7 +245,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus evalConclusion.setEvalPropose(range.getEvalPropose()); evalConclusion.setFactorRangeId(range.getRangeId()); evalConclusion.setSituation(range.getSituation()); - //evalConclusion.setSituationName(range.getSituationName()); + evalConclusion.setSituationName(SituationEnum.getNameByCode(range.getSituation())); break; } } //else { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java index 9ed4f8c..baea5c4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java @@ -23,7 +23,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -80,7 +79,7 @@ public class SysScaleServiceImpl implements ISysScaleService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getScaleName()), SysScale::getScaleName, bo.getScaleName()); lqw.eq(StringUtils.isNotBlank(bo.getScaleCode()), SysScale::getScaleCode, bo.getScaleCode()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysScale::getStatus, bo.getStatus()); + lqw.eq(bo.getStatus() != null, SysScale::getStatus, bo.getStatus()); if (CollUtil.isNotEmpty(bo.getScaleType())) { lqw.like(CollUtil.isNotEmpty(bo.getScaleType()), SysScale::getScaleType, bo.getScaleType().get(0));