From 0a71321f86d46ac4a8335a0c38a493fd62664c25 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 04 三月 2024 17:52:25 +0800
Subject: [PATCH] 人车路基础功能
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsPcrData.java | 27 +++++--------
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java | 38 +++++++++++++------
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java | 29 ++++++--------
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java | 24 ++++-------
4 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsPcrData.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsPcrData.java
index e1c0b81..8b08c6f 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsPcrData.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsPcrData.java
@@ -1,12 +1,11 @@
package org.dromara.demo.domain;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.math.BigDecimal;
import java.io.Serial;
+import java.util.Date;
/**
* 浜鸿溅璺熀纭�淇℃伅瀵硅薄 rs_pcr_data
@@ -15,9 +14,8 @@
* @date 2024-02-27
*/
@Data
-@EqualsAndHashCode(callSuper = true)
@TableName("rs_pcr_data")
-public class RsPcrData extends BaseEntity {
+public class RsPcrData {
@Serial
private static final long serialVersionUID = 1L;
@@ -36,17 +34,14 @@
/**
* 鍛ㄦ湡
*/
- private String periodName;
+ private Long period;
/**
* 鍛ㄦ湡骞�
*/
- private String periodYear;
+ private String periodDate;
- /**
- * 鍛ㄦ湡鏈�
- */
- private Long periodMonth;
+ private Date createTime;
/**
* 鎸囨爣1鍚嶇О
@@ -56,7 +51,7 @@
/**
* 鎸囨爣1鍊�
*/
- private BigDecimal indexOneValue;
+ private String indexOneValue;
/**
* 鎸囨爣2鍚嶇О
@@ -66,7 +61,7 @@
/**
* 鎸囨爣2鍊�
*/
- private BigDecimal indexTwoValue;
+ private String indexTwoValue;
/**
* 鎸囨爣3鍚嶇О
@@ -76,7 +71,7 @@
/**
* 鎸囨爣3鍊�
*/
- private BigDecimal indexThreeValue;
+ private String indexThreeValue;
/**
* 鎸囨爣4鍚嶇О
@@ -86,7 +81,7 @@
/**
* 鎸囨爣4鍊�
*/
- private BigDecimal indexFourValue;
+ private String indexFourValue;
/**
* 鐘舵�� 1鍚敤 0鏈惎鐢�
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
index 96900e0..270fe16 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
@@ -9,6 +9,7 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 浜鸿溅璺熀纭�淇℃伅涓氬姟瀵硅薄 rs_pcr_data
@@ -37,19 +38,15 @@
* 鍛ㄦ湡
*/
@NotBlank(message = "鍛ㄦ湡涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
- private String periodName;
+ private String period;
/**
* 鍛ㄦ湡骞�
*/
- @NotBlank(message = "鍛ㄦ湡骞翠笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private String periodYear;
+ @NotBlank(message = "鍛ㄦ湡涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private String periodDate;
- /**
- * 鍛ㄦ湡鏈�
- */
- @NotNull(message = "鍛ㄦ湡鏈堜笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private Long periodMonth;
+ private Date createDate;
/**
* 鎸囨爣1鍚嶇О
@@ -60,8 +57,8 @@
/**
* 鎸囨爣1鍊�
*/
- @NotNull(message = "鎸囨爣1鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private BigDecimal indexOneValue;
+ @Size(min = 1, max = 15, message = "鎸囨爣1鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ private String indexOneValue;
/**
* 鎸囨爣2鍚嶇О
@@ -72,8 +69,8 @@
/**
* 鎸囨爣2鍊�
*/
- @NotNull(message = "鎸囨爣2鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private BigDecimal indexTwoValue;
+ @Size(min = 1, max = 15, message = "鎸囨爣2鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ private String indexTwoValue;
/**
* 鎸囨爣3鍚嶇О
@@ -84,8 +81,8 @@
/**
* 鎸囨爣3鍊�
*/
- @NotNull(message = "鎸囨爣3鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private BigDecimal indexThreeValue;
+ @Size(min = 1, max = 15, message = "鎸囨爣3鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ private String indexThreeValue;
/**
* 鎸囨爣4鍚嶇О
@@ -96,8 +93,8 @@
/**
* 鎸囨爣4鍊�
*/
- @NotNull(message = "鎸囨爣4鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
- private BigDecimal indexFourValue;
+ @Size(min = 1, max = 15, message = "鎸囨爣4鍊间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+ private String indexFourValue;
/**
* 鐘舵�� 1鍚敤 0鏈惎鐢�
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
index 76f66b2..786da4b 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
@@ -1,13 +1,10 @@
package org.dromara.demo.domain.vo;
-import java.math.BigDecimal;
-import org.dromara.demo.domain.RsPcrData;
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.RsPcrData;
import java.io.Serial;
import java.io.Serializable;
@@ -45,19 +42,16 @@
* 鍛ㄦ湡
*/
@ExcelProperty(value = "鍛ㄦ湡")
- private String periodName;
+ private Long period;
/**
* 鍛ㄦ湡骞�
*/
@ExcelProperty(value = "鍛ㄦ湡骞�")
- private String periodYear;
+ private String periodDate;
- /**
- * 鍛ㄦ湡鏈�
- */
- @ExcelProperty(value = "鍛ㄦ湡鏈�")
- private Long periodMonth;
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createDate;
/**
* 鎸囨爣1鍚嶇О
@@ -69,7 +63,7 @@
* 鎸囨爣1鍊�
*/
@ExcelProperty(value = "鎸囨爣1鍊�")
- private BigDecimal indexOneValue;
+ private String indexOneValue;
/**
* 鎸囨爣2鍚嶇О
@@ -81,7 +75,7 @@
* 鎸囨爣2鍊�
*/
@ExcelProperty(value = "鎸囨爣2鍊�")
- private BigDecimal indexTwoValue;
+ private String indexTwoValue;
/**
* 鎸囨爣3鍚嶇О
@@ -93,7 +87,7 @@
* 鎸囨爣3鍊�
*/
@ExcelProperty(value = "鎸囨爣3鍊�")
- private BigDecimal indexThreeValue;
+ private String indexThreeValue;
/**
* 鎸囨爣4鍚嶇О
@@ -105,7 +99,7 @@
* 鎸囨爣4鍊�
*/
@ExcelProperty(value = "鎸囨爣4鍊�")
- private BigDecimal indexFourValue;
+ private String indexFourValue;
/**
* 鐘舵�� 1鍚敤 0鏈惎鐢�
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
index ddb6161..c710eac 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsPcrDataServiceImpl.java
@@ -1,23 +1,25 @@
package org.dromara.demo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.demo.domain.RsPcrData;
import org.dromara.demo.domain.bo.RsPcrDataBo;
import org.dromara.demo.domain.vo.RsPcrDataVo;
-import org.dromara.demo.domain.RsPcrData;
import org.dromara.demo.mapper.RsPcrDataMapper;
import org.dromara.demo.service.IRsPcrDataService;
+import org.springframework.stereotype.Service;
+import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
/**
* 浜鸿溅璺熀纭�淇℃伅Service涓氬姟灞傚鐞�
@@ -62,9 +64,8 @@
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<RsPcrData> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getModeName()), RsPcrData::getModeName, bo.getModeName());
- lqw.like(StringUtils.isNotBlank(bo.getPeriodName()), RsPcrData::getPeriodName, bo.getPeriodName());
- lqw.eq(StringUtils.isNotBlank(bo.getPeriodYear()), RsPcrData::getPeriodYear, bo.getPeriodYear());
- lqw.eq(bo.getPeriodMonth() != null, RsPcrData::getPeriodMonth, bo.getPeriodMonth());
+ lqw.like(StringUtils.isNotBlank(bo.getPeriod()), RsPcrData::getPeriod, bo.getPeriod());
+ lqw.eq(StringUtils.isNotBlank(bo.getPeriodDate()), RsPcrData::getPeriodDate, bo.getPeriodDate());
lqw.like(StringUtils.isNotBlank(bo.getIndexOneName()), RsPcrData::getIndexOneName, bo.getIndexOneName());
lqw.eq(bo.getIndexOneValue() != null, RsPcrData::getIndexOneValue, bo.getIndexOneValue());
lqw.like(StringUtils.isNotBlank(bo.getIndexTwoName()), RsPcrData::getIndexTwoName, bo.getIndexTwoName());
@@ -74,6 +75,7 @@
lqw.like(StringUtils.isNotBlank(bo.getIndexFourName()), RsPcrData::getIndexFourName, bo.getIndexFourName());
lqw.eq(bo.getIndexFourValue() != null, RsPcrData::getIndexFourValue, bo.getIndexFourValue());
lqw.eq(bo.getStatus() != null, RsPcrData::getStatus, bo.getStatus());
+ lqw.orderByDesc(RsPcrData::getCreateTime);
return lqw;
}
@@ -88,6 +90,12 @@
if (flag) {
bo.setId(add.getId());
}
+ // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1L)) {
+ LambdaUpdateWrapper<RsPcrData> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsPcrData::getId, bo.getId()).eq(RsPcrData::getModeName, bo.getModeName()).set(RsPcrData::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return flag;
}
@@ -98,6 +106,12 @@
public Boolean updateByBo(RsPcrDataBo bo) {
RsPcrData update = MapstructUtils.convert(bo, RsPcrData.class);
validEntityBeforeSave(update);
+ // 鍚敤鏂版暟鎹皢鍏朵綑鍚岀被鍨嬫暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1L)) {
+ LambdaUpdateWrapper<RsPcrData> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsPcrData::getId, bo.getId()).eq(RsPcrData::getModeName, bo.getModeName()).set(RsPcrData::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return baseMapper.updateById(update) > 0;
}
@@ -105,7 +119,7 @@
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
*/
private void validEntityBeforeSave(RsPcrData entity){
- //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ entity.setCreateTime(new Date());
}
/**
--
Gitblit v1.8.0