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-25 10:01:34 +08:00
parent 43f7bcf914
commit 7570211c34
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package cn.axzo.tyr.client.feign;
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.DeleteDataObjectReq;
import cn.axzo.tyr.client.model.req.EditDataObjectReq;
import cn.axzo.tyr.client.model.req.PageDataObjectReq;
import cn.axzo.tyr.client.model.res.DataObjectRes;
@ -36,7 +37,7 @@ public interface DataObjectApi {
ApiResult<Void> editDataObject(@RequestBody @Valid EditDataObjectReq req);
@PostMapping("/api/dataObject/delete")
ApiResult<Void> deleteDataObject(@RequestParam Long dataObjectId, @RequestParam(required = false) Long updateBy);
ApiResult<Void> deleteDataObject(@RequestBody @Valid DeleteDataObjectReq req);
/**
* 分页查询数据对象列表

20
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/DeleteDataObjectReq.java Normal file
View File

@ -0,0 +1,20 @@
package cn.axzo.tyr.client.model.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotNull;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DeleteDataObjectReq {
@NotNull(message = "请选择要删除的数据对象")
private Long dataObjectId;
private Long updateBy;
}

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

@ -12,6 +12,7 @@ import cn.axzo.tyr.client.common.enums.TenantScopeEnum;
import cn.axzo.tyr.client.common.enums.WorkspaceJoinType;
import cn.axzo.tyr.client.feign.DataObjectApi;
import cn.axzo.tyr.client.model.req.CreateDataObjectReq;
import cn.axzo.tyr.client.model.req.DeleteDataObjectReq;
import cn.axzo.tyr.client.model.req.EditDataObjectReq;
import cn.axzo.tyr.client.model.req.PageDataObjectReq;
import cn.axzo.tyr.client.model.res.DataObjectRes;
@ -47,8 +48,8 @@ public class DataObjectController implements DataObjectApi {
}
@Override
public ApiResult<Void> deleteDataObject(Long dataObjectId, Long updateBy) {
dataObjectService.deleteDataObject(dataObjectId, updateBy);
public ApiResult<Void> deleteDataObject(DeleteDataObjectReq req) {
dataObjectService.deleteDataObject(req.getDataObjectId(), req.getUpdateBy());
return ApiResult.ok();
}

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

@ -46,6 +46,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@Slf4j
@ -77,6 +78,11 @@ public class DataObjectServiceImpl implements DataObjectService {
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Objects.nonNull(req.getDefaultDataObjectRuleBO()) ? Lists.newArrayList(req.getDefaultDataObjectRuleBO()) : null);
if (CollUtil.isNotEmpty(req.getDataObjectRuleBOList())) {
AtomicInteger sortId = new AtomicInteger(1);
req.getDataObjectRuleBOList().forEach(e -> e.setSort(sortId.getAndIncrement()));
}
List<DataObjectRule> dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList());
int size = (CollUtil.isNotEmpty(defaultDataObjectRules) ? defaultDataObjectRules.size() : 0)
@ -169,6 +175,11 @@ public class DataObjectServiceImpl implements DataObjectService {
List<DataObjectAttr> objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs());
List<DataObjectRule> defaultDataObjectRules = DataObjectMapper.INSTANCE.defaultRuleBOs2Rules(Lists.newArrayList(req.getDefaultDataObjectRuleBO()));
if (CollUtil.isNotEmpty(req.getDataObjectRuleBOList())) {
AtomicInteger sortId = new AtomicInteger(1);
req.getDataObjectRuleBOList().forEach(e -> e.setSort(sortId.getAndIncrement()));
}
List<DataObjectRule> dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList());
int size = (CollUtil.isNotEmpty(defaultDataObjectRules) ? defaultDataObjectRules.size() : 0)
+ (CollUtil.isNotEmpty(dataObjectRules) ? dataObjectRules.size() : 0);
@ -245,7 +256,7 @@ public class DataObjectServiceImpl implements DataObjectService {
// 获取数据对象
DataObject dataObject = dataObjectDao.getById(dataObjectId);
if (Objects.isNull(dataObject)){
if (Objects.isNull(dataObject)) {
throw new cn.axzo.framework.domain.ServiceException(ReturnCodeEnum.DATA_NOT_EXIST.getMessage());
}
DataObjectRes res = DataObjectMapper.INSTANCE.dataObject2DataObjectRes(dataObject);
@ -267,7 +278,7 @@ public class DataObjectServiceImpl implements DataObjectService {
DataObjectRuleQueryBO bo2 = DataObjectRuleQueryBO.builder().dataObjectId(dataObjectId).build();
List<DataObjectRule> dataObjectRules = dataObjectRuleDao.listByBO(bo2);
if (CollUtil.isNotEmpty(dataObjectRules)) {
res.setDataObjectRuleBOList(new ArrayList<>(dataObjectRules.size()-1));
res.setDataObjectRuleBOList(new ArrayList<>(dataObjectRules.size() - 1));
dataObjectRules.forEach(e -> {
if (YesNoEnum.YES.getValue().equals(e.getIsDefault())) {
DefaultDataObjectRuleBO ruleBO = DataObjectMapper.INSTANCE.rule2DefaultRuleBO(e);