wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2299 【开发】 基础修复

Browse Source
This commit is contained in:
yangheng 2024-04-23 20:02:31 +08:00
parent 0ebdeaf782
commit 946dec0992
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/ReturnCodeEnum.java
View File

@ -44,6 +44,7 @@ public enum ReturnCodeEnum{
TYPE_UNKNOWN(909, "未知类型"),
DATA_NOT_EXIST(910, "数据不存在"),
ATTR_NOT_CONSISTENT(911, "对象字段与规则字段不一致"),
;

2
tyr-api/src/main/java/cn/axzo/tyr/client/feign/DataObjectApi.java
View File

@ -1,6 +1,6 @@
package cn.axzo.tyr.client.feign;
import cn.axzo.core.domain.PageResult;
import cn.axzo.basics.common.page.PageResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.req.CreateDataObjectReq;
import cn.axzo.tyr.client.model.req.EditDataObjectReq;

2
tyr-server/src/main/java/cn/axzo/tyr/server/controller/data/object/DataObjectController.java
View File

@ -1,7 +1,7 @@
package cn.axzo.tyr.server.controller.data.object;
import cn.axzo.basics.auth.enums.WorkspaceTypeWithLegacyEnum;
import cn.axzo.core.domain.PageResult;
import cn.axzo.basics.common.page.PageResult;
import cn.axzo.framework.domain.ServiceException;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.common.enums.AttrPermissionEnum;

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/DataObjectService.java
View File

@ -1,6 +1,6 @@
package cn.axzo.tyr.server.service;
import cn.axzo.core.domain.PageResult;
import cn.axzo.basics.common.page.PageResult;
import cn.axzo.tyr.client.model.req.CreateDataObjectReq;
import cn.axzo.tyr.client.model.req.EditDataObjectReq;
import cn.axzo.tyr.client.model.req.PageDataObjectReq;

18
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.axzo.tyr.server.service.impl;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.core.domain.PageResult;
import cn.axzo.basics.common.page.PageResult;
import cn.axzo.tyr.client.common.enums.ReturnCodeEnum;
import cn.axzo.tyr.client.common.enums.YesNoEnum;
import cn.axzo.tyr.client.model.data.object.AttributeBO;
@ -75,7 +75,7 @@ public class DataObjectServiceImpl implements DataObjectService {
List<DataObjectAttr> objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Objects.nonNull(req.getDefaultDataObjectRuleBO()) ? Lists.newArrayList(req.getDefaultDataObjectRuleBO()) : null);
List<DataObjectRule> dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList());
@ -124,7 +124,11 @@ public class DataObjectServiceImpl implements DataObjectService {
generalObjectRuleList.forEach(rule -> {
if (CollUtil.isNotEmpty(attrMap) && CollUtil.isNotEmpty(rule.getDataObjectRuleAttrList())) {
rule.getDataObjectRuleAttrList().forEach(ruleAttr -> {
ruleAttr.setDataObjectAttrId(attrMap.get(ruleAttr.getAttrCode()));
Long id = attrMap.get(ruleAttr.getAttrCode());
if (Objects.isNull(id)) {
throw new cn.axzo.framework.domain.ServiceException(ReturnCodeEnum.ATTR_NOT_CONSISTENT.getMessage());
}
ruleAttr.setDataObjectAttrId(id);
ruleAttr.setDataObjectId(dataObject.getId());
ruleAttr.setDataObjectCode(dataObject.getDataObjectCode());
ruleAttr.setDataObjectRuleId(rule.getId());
@ -358,18 +362,18 @@ public class DataObjectServiceImpl implements DataObjectService {
private void checkObjectNameOrCodeUnique(String dataObjectCode, String dataObjectName) {
DataObjectQueryBO bo = DataObjectQueryBO.builder()
.dataObjectName(dataObjectCode)
.dataObjectCode(dataObjectName)
.dataObjectName(dataObjectName)
.dataObjectCode(dataObjectCode)
.build();
List<DataObject> dataObjects = dataObjectDao.duplicateListByBO(bo);
if (CollUtil.isNotEmpty(dataObjects)) {
boolean nameDuplicate = false;
boolean codeDuplicate = false;
for (DataObject dataObject : dataObjects) {
if (dataObject.getDataObjectName().equals(dataObjectCode)) {
if (dataObject.getDataObjectName().equals(dataObjectName)) {
nameDuplicate = true;
}
if (dataObject.getDataObjectCode().equals(dataObjectName)) {
if (dataObject.getDataObjectCode().equals(dataObjectCode)) {
codeDuplicate = true;
}
}