From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
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