From 3c8a4b3f45381811b49466ce2af7830cc556f6a7 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 04 三月 2024 15:33:15 +0800
Subject: [PATCH] 交通指数基础功能
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsTrafficIndex.java | 17 ++++----
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsTrafficIndexBo.java | 53 +++++++++++++-------------
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java | 15 +++++++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsTrafficIndexVo.java | 21 ++++------
4 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsTrafficIndex.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsTrafficIndex.java
index 83601d4..fde88c2 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsTrafficIndex.java
+++ b/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鏈惎鐢�
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsTrafficIndexBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsTrafficIndexBo.java
index 0418408..87385b5 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsTrafficIndexBo.java
+++ b/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;
/**
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsTrafficIndexVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsTrafficIndexVo.java
index b13e5da..8eaed8d 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsTrafficIndexVo.java
+++ b/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鏈惎鐢�
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
index abc0e5a..1817927 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
+++ b/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;
}
--
Gitblit v1.8.0