dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsTrafficIndex.java
@@ -5,7 +5,6 @@ import lombok.Data; import java.io.Serial; import java.math.BigDecimal; import java.util.Date; /** @@ -40,7 +39,7 @@ /** * 指标1值 */ private BigDecimal targetOneValue; private String targetOneValue; /** * 指标1单位 @@ -55,7 +54,7 @@ /** * 指标1上浮或下降值 */ private BigDecimal targetOneCompareValue; private String targetOneCompareValue; /** * 指标2名称 @@ -65,7 +64,7 @@ /** * 指标2值 */ private BigDecimal targetTwoValue; private String targetTwoValue; /** * 指标2单位 @@ -80,7 +79,7 @@ /** * 指标2上浮或下降值 */ private BigDecimal targetTwoCompareValue; private String targetTwoCompareValue; /** * 指标3名称 @@ -90,7 +89,7 @@ /** * 指标3值 */ private BigDecimal targetThreeValue; private String targetThreeValue; /** * 指标3单位 @@ -105,7 +104,7 @@ /** * 指标3上浮或下降值 */ private BigDecimal targetThreeCompareValue; private String targetThreeCompareValue; /** * 指标4名称 @@ -115,7 +114,7 @@ /** * 指标4值 */ private BigDecimal targetFourValue; private String targetFourValue; /** * 指标4单位 @@ -130,7 +129,7 @@ /** * 指标4上浮或下降值 */ private BigDecimal targetFourCompareValue; private String targetFourCompareValue; /** * 启用状态 1启用 2未启用 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsTrafficIndexBo.java
@@ -8,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import java.math.BigDecimal; /** * 交通指数业务对象 rs_traffic_index @@ -30,25 +29,25 @@ /** * 模块名称 */ @NotBlank(message = "模块名称不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 100, message = "模块名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String modeName; /** * 指标1名称 */ @NotBlank(message = "指标1名称不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标1名称长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetOneName; /** * 指标1值 */ @NotNull(message = "指标1值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetOneValue; @Size(min = 1, max = 15, message = "指标1值长度1-15", groups = { AddGroup.class, EditGroup.class }) private String targetOneValue; /** * 指标1单位 */ @NotBlank(message = "指标1单位不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标1单位长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetOneUnit; /** @@ -60,25 +59,25 @@ /** * 指标1上浮或下降值 */ @NotNull(message = "指标1上浮或下降值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetOneCompareValue; @Size(min = 1, max = 6, message = "指标1上浮或下降值长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetOneCompareValue; /** * 指标2名称 */ @NotBlank(message = "指标2名称不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标2名称长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetTwoName; /** * 指标2值 */ @NotNull(message = "指标2值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetTwoValue; @Size(min = 1, max = 15, message = "指标2值长度1-15", groups = { AddGroup.class, EditGroup.class }) private String targetTwoValue; /** * 指标2单位 */ @NotBlank(message = "指标2单位不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标2单位长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetTwoUnit; /** @@ -90,25 +89,25 @@ /** * 指标2上浮或下降值 */ @NotNull(message = "指标2上浮或下降值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetTwoCompareValue; @Size(min = 1, max = 6, message = "指标2上浮或下降值长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetTwoCompareValue; /** * 指标3名称 */ @NotBlank(message = "指标3名称不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标3名称长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetThreeName; /** * 指标3值 */ @NotNull(message = "指标3值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetThreeValue; @Size(min = 1, max = 15, message = "指标3值长度1-15", groups = { AddGroup.class, EditGroup.class }) private String targetThreeValue; /** * 指标3单位 */ @NotBlank(message = "指标3单位不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标3单位长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetThreeUnit; /** @@ -120,25 +119,25 @@ /** * 指标3上浮或下降值 */ @NotNull(message = "指标3上浮或下降值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetThreeCompareValue; @Size(min = 1, max = 6, message = "指标3上浮或下降值长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetThreeCompareValue; /** * 指标4名称 */ @NotBlank(message = "指标4名称不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标4名称长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetFourName; /** * 指标4值 */ @NotNull(message = "指标4值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetFourValue; @Size(min = 1, max = 15, message = "指标4值长度1-15", groups = { AddGroup.class, EditGroup.class }) private String targetFourValue; /** * 指标4单位 */ @NotBlank(message = "指标4单位不能为空", groups = { AddGroup.class, EditGroup.class }) @Size(min = 1, max = 6, message = "指标4单位长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetFourUnit; /** @@ -150,8 +149,8 @@ /** * 指标4上浮或下降值 */ @NotNull(message = "指标4上浮或下降值不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal targetFourCompareValue; @Size(min = 1, max = 6, message = "指标4上浮或下降值长度1-6", groups = { AddGroup.class, EditGroup.class }) private String targetFourCompareValue; /** * 启用状态 1启用 2未启用 @@ -162,7 +161,7 @@ /** * 周期 1 月 2年 */ @NotBlank(message = "周期 1 月 2年不能为空", groups = { AddGroup.class, EditGroup.class }) @PositiveOrZero(message = "周期 1 月 2年不能为空", groups = { AddGroup.class, EditGroup.class }) private Long period; /** dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsTrafficIndexVo.java
@@ -1,13 +1,10 @@ package org.dromara.demo.domain.vo; import java.math.BigDecimal; import org.dromara.demo.domain.RsTrafficIndex; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.demo.domain.RsTrafficIndex; import java.io.Serial; import java.io.Serializable; @@ -51,7 +48,7 @@ * 指标1值 */ @ExcelProperty(value = "指标1值") private BigDecimal targetOneValue; private String targetOneValue; /** * 指标1单位 @@ -69,7 +66,7 @@ * 指标1上浮或下降值 */ @ExcelProperty(value = "指标1上浮或下降值") private BigDecimal targetOneCompareValue; private String targetOneCompareValue; /** * 指标2名称 @@ -81,7 +78,7 @@ * 指标2值 */ @ExcelProperty(value = "指标2值") private BigDecimal targetTwoValue; private String targetTwoValue; /** * 指标2单位 @@ -99,7 +96,7 @@ * 指标2上浮或下降值 */ @ExcelProperty(value = "指标2上浮或下降值") private BigDecimal targetTwoCompareValue; private String targetTwoCompareValue; /** * 指标3名称 @@ -111,7 +108,7 @@ * 指标3值 */ @ExcelProperty(value = "指标3值") private BigDecimal targetThreeValue; private String targetThreeValue; /** * 指标3单位 @@ -129,7 +126,7 @@ * 指标3上浮或下降值 */ @ExcelProperty(value = "指标3上浮或下降值") private BigDecimal targetThreeCompareValue; private String targetThreeCompareValue; /** * 指标4名称 @@ -141,7 +138,7 @@ * 指标4值 */ @ExcelProperty(value = "指标4值") private BigDecimal targetFourValue; private String targetFourValue; /** * 指标4单位 @@ -159,7 +156,7 @@ * 指标4上浮或下降值 */ @ExcelProperty(value = "指标4上浮或下降值") private BigDecimal targetFourCompareValue; private String targetFourCompareValue; /** * 启用状态 1启用 2未启用 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
@@ -1,5 +1,6 @@ package org.dromara.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -85,7 +86,7 @@ lqw.eq(bo.getTargetFourCompareValue() != null, RsTrafficIndex::getTargetFourCompareValue, bo.getTargetFourCompareValue()); lqw.eq(bo.getStatus() != null, RsTrafficIndex::getStatus, bo.getStatus()); lqw.like(StringUtils.isNotBlank(bo.getPeriodDate()), RsTrafficIndex::getPeriodDate, bo.getPeriodDate()); lqw.orderByDesc(RsTrafficIndex::getCreateTime); return lqw; } @@ -100,6 +101,12 @@ if (flag) { bo.setId(add.getId()); } // 启用新数据将所有数据改为禁用 if (bo.getStatus().equals(1)) { LambdaUpdateWrapper<RsTrafficIndex> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.ne(RsTrafficIndex::getId, bo.getId()).set(RsTrafficIndex::getStatus, 2); baseMapper.update(updateWrapper); } return flag; } @@ -110,6 +117,12 @@ public Boolean updateByBo(RsTrafficIndexBo bo) { RsTrafficIndex update = MapstructUtils.convert(bo, RsTrafficIndex.class); validEntityBeforeSave(update); // 启用新数据将所有数据改为禁用 if (bo.getStatus().equals(1)) { LambdaUpdateWrapper<RsTrafficIndex> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.ne(RsTrafficIndex::getId, bo.getId()).set(RsTrafficIndex::getStatus, 2); baseMapper.update(updateWrapper); } return baseMapper.updateById(update) > 0; }
