diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/TypeEnums.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/TypeEnums.java index 7c1d2a3e5..3ab5c584b 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/TypeEnums.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/TypeEnums.java @@ -9,6 +9,6 @@ public enum TypeEnums { ENTITY, DATASET, MODEL, - UNKNOWN; + UNKNOWN } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagDefineType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagDefineType.java index b876606b8..122c87510 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagDefineType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagDefineType.java @@ -4,5 +4,5 @@ public enum TagDefineType { FIELD, DIMENSION, - Tag + TAG } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagType.java index fa8d0e740..e5098baf7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/TagType.java @@ -21,7 +21,7 @@ public enum TagType { } public static TagType getType(TagDefineType tagDefineType) { - return Objects.nonNull(tagDefineType) && TagDefineType.Tag.equals(tagDefineType) ? TagType.DERIVED + return Objects.nonNull(tagDefineType) && TagDefineType.TAG.equals(tagDefineType) ? TagType.DERIVED : TagType.ATOMIC; } } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagService.java index 7a7382a1d..5e92994e1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagService.java @@ -11,11 +11,11 @@ import java.util.List; public interface TagService { - TagResp create(TagReq tagReq, User user) throws Exception; + TagResp create(TagReq tagReq, User user); - TagResp update(TagReq tagReq, User user) throws Exception; + TagResp update(TagReq tagReq, User user); - void delete(Long id, User user) throws Exception; + void delete(Long id, User user); TagResp getTag(Long id, User user); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java index 942ab407e..05385e1a4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java @@ -27,7 +27,7 @@ public class CollectServiceImpl implements CollectService { CollectDO collect = new CollectDO(); collect.setType(Strings.isEmpty(collectReq.getType()) ? type : collectReq.getType()); collect.setUsername(user.getName()); - collect.setCollectId(collectReq.getId()); + collect.setCollectId(collectReq.getCollectId()); collectMapper.insert(collect); return true; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagServiceImpl.java index 89d739a91..a959bcdd6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagServiceImpl.java @@ -57,19 +57,23 @@ public class TagServiceImpl implements TagService { } @Override - public TagResp create(TagReq tagReq, User user) throws Exception { + public TagResp create(TagReq tagReq, User user) { checkParam(tagReq); checkExit(tagReq); TagDO tagDO = convert(tagReq); tagDO.setCreatedBy(user.getName()); tagDO.setCreatedAt(new Date()); - tagDO.setStatus(StatusEnum.ONLINE.getCode()); + if (Objects.nonNull(tagReq.getStatus())) { + tagDO.setStatus(tagReq.getStatus()); + } else { + tagDO.setStatus(StatusEnum.ONLINE.getCode()); + } tagRepository.create(tagDO); return convert(tagDO); } @Override - public TagResp update(TagReq tagReq, User user) throws Exception { + public TagResp update(TagReq tagReq, User user) { if (Objects.isNull(tagReq.getId()) || tagReq.getId() <= 0) { throw new RuntimeException("id is empty"); } @@ -93,7 +97,7 @@ public class TagServiceImpl implements TagService { } @Override - public void delete(Long id, User user) throws Exception { + public void delete(Long id, User user) { TagDO tagDO = tagRepository.getTagById(id); if (Objects.isNull(tagDO)) { throw new RuntimeException("tag not found");