From ba421d977e745d18a6264353c739bcaaf44c40d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 08 四月 2024 18:39:41 +0800
Subject: [PATCH] 历史数据模块接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataConfigServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataConfigServiceImpl.java
index 6049eeb..c47c155 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbBasicDataConfigServiceImpl.java
@@ -6,7 +6,9 @@
import com.ruoyi.common.basic.PageDTO;
import com.ruoyi.common.enums.CalculateTypeEnum;
import com.ruoyi.common.enums.ShowStatusEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanUtils;
+import com.ruoyi.common.utils.Checker;
import com.ruoyi.common.utils.CollUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.TbBasicDataConfig;
@@ -19,11 +21,13 @@
import com.ruoyi.system.mapper.TbBasicDataConfigMapper;
import com.ruoyi.system.mapper.TbFieldMapper;
import com.ruoyi.system.query.BasicDataConfigQuery;
+import com.ruoyi.system.query.ScoreCalculateQuery;
import com.ruoyi.system.service.TbBasicDataConfigDetailService;
import com.ruoyi.system.service.TbBasicDataConfigService;
import com.ruoyi.system.vo.BasicDataConfigDetailVO;
import com.ruoyi.system.vo.BasicDataConfigVO;
import com.ruoyi.system.vo.CalculateVO;
+import com.ruoyi.system.vo.ScoreCalculateVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,17 +57,29 @@
public void add(BasicDataConfigDTO dto) {
TbBasicDataConfig tbBasicDataConfig = BeanUtils.copyBean(dto, TbBasicDataConfig.class);
//参数校验
- Integer calculateType = tbBasicDataConfig.getCalculateType().getCode();
+ CalculateTypeEnum calculateType = tbBasicDataConfig.getCalculateType();
List<CalculateDTO> dtoList = dto.getDtoList();
- if (CalculateTypeEnum.NUMBER.getCode().equals(calculateType) && StringUtils.isBlank(dto.getNumberCalculateFormula())) {
- throw new RuntimeException("计算公式不能为空");
+ if (CalculateTypeEnum.NUMBER.equals(calculateType) && StringUtils.isBlank(dto.getNumberCalculateFormula())) {
+ throw new ServiceException("计算公式不能为空");
}
- if ((CalculateTypeEnum.TEXT.getCode().equals(calculateType) || CalculateTypeEnum.PERCENTAGE.getCode().equals(calculateType))
- && CollUtils.isEmpty(dtoList)) {
- throw new RuntimeException("计算公式不能为空");
+ boolean verify = (CalculateTypeEnum.TEXT.equals(calculateType) || CalculateTypeEnum.PERCENTAGE.equals(calculateType)) && CollUtils.isNotEmpty(dtoList);
+ if (verify) {
+ CollUtils.check(dto.getDtoList(), new Checker<CalculateDTO>() {
+ @Override
+ public void check(CalculateDTO data) {
+ if (StringUtils.isBlank(data.getKey())) {
+ throw new ServiceException("基础数据配置key不能为空");
+ }
+ if (StringUtils.isBlank(data.getValue())) {
+ throw new ServiceException("基础数据配置value不能为空");
+ }
+ }
+ });
+ } else {
+ throw new ServiceException("计算公式不能为空");
}
this.save(tbBasicDataConfig);
- if ((CalculateTypeEnum.TEXT.getCode().equals(calculateType) || CalculateTypeEnum.PERCENTAGE.getCode().equals(calculateType))) {
+ if (verify) {
List<TbBasicDataConfigDetail> details = BeanUtils.copyList(dtoList, TbBasicDataConfigDetail.class);
List<TbBasicDataConfigDetail> collect = details.stream().peek(item -> item.setBasicDataConfigId(tbBasicDataConfig.getId())).collect(Collectors.toList());
tbBasicDataConfigDetailService.saveBatch(collect);
@@ -75,17 +91,17 @@
public void edit(BasicDataConfigUpdateDTO dto) {
TbBasicDataConfig tbBasicDataConfig = BeanUtils.copyBean(dto, TbBasicDataConfig.class);
//参数校验
- Integer calculateType = tbBasicDataConfig.getCalculateType().getCode();
+ CalculateTypeEnum calculateType = tbBasicDataConfig.getCalculateType();
List<CalculateDTO> dtoList = dto.getDtoList();
- if (CalculateTypeEnum.NUMBER.getCode().equals(calculateType) && StringUtils.isBlank(dto.getNumberCalculateFormula())) {
- throw new RuntimeException("计算公式不能为空");
+ if (CalculateTypeEnum.NUMBER.equals(calculateType) && StringUtils.isBlank(dto.getNumberCalculateFormula())) {
+ throw new ServiceException("计算公式不能为空");
}
- if ((CalculateTypeEnum.TEXT.getCode().equals(calculateType) || CalculateTypeEnum.PERCENTAGE.getCode().equals(calculateType))
- && CollUtils.isEmpty(dtoList)) {
- throw new RuntimeException("计算公式不能为空");
+ boolean verify = CalculateTypeEnum.TEXT.equals(calculateType) || CalculateTypeEnum.PERCENTAGE.equals(calculateType);
+ if (verify && CollUtils.isEmpty(dtoList)) {
+ throw new ServiceException("计算公式不能为空");
}
this.updateById(tbBasicDataConfig);
- if ((CalculateTypeEnum.TEXT.getCode().equals(calculateType) || CalculateTypeEnum.PERCENTAGE.getCode().equals(calculateType))) {
+ if (verify) {
//删除原来的配置信息，重新添加新的
tbBasicDataConfigDetailService.lambdaUpdate().eq(TbBasicDataConfigDetail::getBasicDataConfigId, tbBasicDataConfig.getId()).remove();
List<TbBasicDataConfigDetail> details = BeanUtils.copyList(dtoList, TbBasicDataConfigDetail.class);
@@ -98,7 +114,7 @@
public BasicDataConfigDetailVO getDetails(Integer id) {
TbBasicDataConfig config = this.getById(id);
if (Objects.isNull(config)) {
- throw new RuntimeException("非法参数");
+ throw new ServiceException("非法参数");
}
BasicDataConfigDetailVO vo = BeanUtils.copyBean(config, BasicDataConfigDetailVO.class);
Integer code = vo.getCalculateType().getCode();
@@ -114,7 +130,7 @@
public void delete(Integer id) {
TbBasicDataConfig config = this.getById(id);
if (Objects.isNull(config)) {
- throw new RuntimeException("非法参数");
+ throw new ServiceException("非法参数");
}
this.removeById(id);
}
@@ -132,7 +148,7 @@
public void showHide(ShowHideDTO dto) {
TbBasicDataConfig config = this.getById(dto.getId());
if (Objects.isNull(config)) {
- throw new RuntimeException("非法参数");
+ throw new ServiceException("非法参数");
}
if (ShowStatusEnum.SHOW.equals(dto.getStatus())) {
//查询改配置所使用字段状态
@@ -141,9 +157,14 @@
List<TbField> list = fieldMapper.selectList(Wrappers.<TbField>lambdaQuery().in(TbField::getId, Arrays.asList(split)).eq(TbField::getStatus, ShowStatusEnum.HIDE));
if (CollUtils.isNotEmpty(list)) {
String fieldNames = list.stream().map(TbField::getFieldName).collect(Collectors.joining(","));
- throw new RuntimeException(String.format("字段“%s”已被隐藏，请重新配置后再次操作！", fieldNames));
+ throw new ServiceException(String.format("字段“%s”已被隐藏，请重新配置后再次操作！", fieldNames));
}
}
- this.lambdaUpdate().set( TbBasicDataConfig::getStatus, dto.getStatus()).eq(TbBasicDataConfig::getId, dto.getId()).update();
+ this.lambdaUpdate().set(TbBasicDataConfig::getStatus, dto.getStatus()).eq(TbBasicDataConfig::getId, dto.getId()).update();
+ }
+
+ @Override
+ public Page<ScoreCalculateVO> scoreCalculatePage(ScoreCalculateQuery query, Page<ScoreCalculateVO> page) {
+ return baseMapper.scoreCalculatePage(query, page);
}
}
--
Gitblit v1.7.1