原子指标配置代码优化

topo_dev
liu
parent 485744c598
commit 38ea4c2d1b

@ -1,12 +1,13 @@
package com.supervision.police.service; package com.supervision.police.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.police.domain.ModelAtomicIndex; import com.supervision.police.domain.ModelAtomicIndex;
import com.supervision.police.mapper.ModelAtomicIndexMapper; import com.supervision.police.mapper.ModelAtomicIndexMapper;
import java.util.List; import java.util.List;
public interface ModelAtomicIndexService { public interface ModelAtomicIndexService extends IService<ModelAtomicIndex> {
ModelAtomicIndexMapper getMapper(); ModelAtomicIndexMapper getMapper();

@ -2,6 +2,7 @@ package com.supervision.police.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLStatement;
@ -61,6 +62,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
@Value("${case.evidence.table}") @Value("${case.evidence.table}")
private List<String> allowedTables; private List<String> allowedTables;
@Override @Override
@Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class) @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
public R<?> selectAll(ModelIndex modelIndex, Integer page, Integer size) { public R<?> selectAll(ModelIndex modelIndex, Integer page, Integer size) {
@ -152,6 +154,11 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
Assert.notEmpty(modelAtomicIndex.getQueryLang(), "查询语言不能为空"); Assert.notEmpty(modelAtomicIndex.getQueryLang(), "查询语言不能为空");
Assert.isTrue(checkSql(modelAtomicIndex.getQueryLang()), "查询语句不合法"); Assert.isTrue(checkSql(modelAtomicIndex.getQueryLang()), "查询语句不合法");
} }
// 校验是否已经存在了相同名称的原子指标
ModelAtomicIndex existIndex = modelAtomicIndexService.lambdaQuery().eq(ModelAtomicIndex::getName, modelAtomicIndex.getName()).last("limit 1").one();
if (ObjectUtil.isNotEmpty(existIndex) && !StringUtils.equals(modelAtomicIndex.getId(), existIndex.getId())){
throw new RuntimeException("已存在相同名称的原子指标");
}
if (StringUtils.isEmpty(modelAtomicIndex.getId())) { if (StringUtils.isEmpty(modelAtomicIndex.getId())) {
i = modelAtomicIndexService.getMapper().insert(modelAtomicIndex); i = modelAtomicIndexService.getMapper().insert(modelAtomicIndex);
} else { } else {
@ -297,6 +304,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
/** /**
* *
*
* @param caseId id * @param caseId id
* @param caseType * @param caseType
* @param actorId id * @param actorId id
@ -310,8 +318,10 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
.eq(ModelAtomicResult::getCasePersonId, actorId) .eq(ModelAtomicResult::getCasePersonId, actorId)
.in(CollUtil.isNotEmpty(automicIndexIds), ModelAtomicResult::getAtomicId, automicIndexIds)); .in(CollUtil.isNotEmpty(automicIndexIds), ModelAtomicResult::getAtomicId, automicIndexIds));
} }
/** /**
* id * id
*
* @param judgeLogic json * @param judgeLogic json
* @return id() * @return id()
*/ */

Loading…
Cancel
Save