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未启用 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未启用 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未启用 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()); } /**