From 7570211c347b8080fbbb7faf6f6980aa9d50bf47 Mon Sep 17 00:00:00 2001 From: yangheng <1792539268@qq.com> Date: Thu, 25 Apr 2024 10:01:34 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2299=20=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91?= =?UTF-8?q?=20=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91=E6=94=B9=E9=80=A0=20&?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/tyr/client/feign/DataObjectApi.java | 3 ++- .../client/model/req/DeleteDataObjectReq.java | 20 +++++++++++++++++++ .../data/object/DataObjectController.java | 5 +++-- .../service/impl/DataObjectServiceImpl.java | 15 ++++++++++++-- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 tyr-api/src/main/java/cn/axzo/tyr/client/model/req/DeleteDataObjectReq.java diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/DataObjectApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/DataObjectApi.java index 7eceed9d..2a68498b 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/DataObjectApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/DataObjectApi.java @@ -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 editDataObject(@RequestBody @Valid EditDataObjectReq req); @PostMapping("/api/dataObject/delete") - ApiResult deleteDataObject(@RequestParam Long dataObjectId, @RequestParam(required = false) Long updateBy); + ApiResult deleteDataObject(@RequestBody @Valid DeleteDataObjectReq req); /** * 分页查询数据对象列表 diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/DeleteDataObjectReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/DeleteDataObjectReq.java new file mode 100644 index 00000000..e59870ae --- /dev/null +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/DeleteDataObjectReq.java @@ -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; +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/data/object/DataObjectController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/data/object/DataObjectController.java index ecd3103b..88fb1bbb 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/data/object/DataObjectController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/data/object/DataObjectController.java @@ -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 deleteDataObject(Long dataObjectId, Long updateBy) { - dataObjectService.deleteDataObject(dataObjectId, updateBy); + public ApiResult deleteDataObject(DeleteDataObjectReq req) { + dataObjectService.deleteDataObject(req.getDataObjectId(), req.getUpdateBy()); return ApiResult.ok(); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java index dc530207..f3865ece 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java @@ -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 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 dataObjectRules = DataObjectMapper.INSTANCE.ruleBOs2Rules(req.getDataObjectRuleBOList()); int size = (CollUtil.isNotEmpty(defaultDataObjectRules) ? defaultDataObjectRules.size() : 0) @@ -169,6 +175,11 @@ public class DataObjectServiceImpl implements DataObjectService { List objectAttrList = DataObjectMapper.INSTANCE.attributeBOs2DataObjectAttrs(req.getAttrs()); List 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 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 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);