From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Mon, 30 Oct 2023 17:13:34 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java index 4360ff1..e87b805 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java @@ -12,6 +12,7 @@ import com.moral.api.service.VersionService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; +import com.moral.util.TokenUtils; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -105,4 +106,29 @@ } + + @GetMapping("queryById") + public ResultMessage queryById(VersionQueryByIdForm form){ + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + + VersionQueryDTO dto = versionService.queryVersionById(form); + + VersionQueryVO vo = VersionQueryVO.convert(dto); + + return new ResultMessage(dto.getCode(), dto.getMsg(), vo); + } + + @GetMapping("queryByOrgId") + public ResultMessage queryByOrganizationId(Integer organizationId){ + + VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId); + + VersionQueryVO vo = VersionQueryVO.convert(dto); + + return new ResultMessage(dto.getCode(), dto.getMsg(), vo); + } + } -- Gitblit v1.8.0