From dc1c8c974d9469591ead4dd1d774bbfb97a33331 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 17:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/controller/ProfessionController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/ProfessionController.java b/screen-api/src/main/java/com/moral/api/controller/ProfessionController.java
index 455c8aa..5ed4c4e 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ProfessionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ProfessionController.java
@@ -44,9 +44,13 @@
return ResultMessage.ok(response);
}
- @ApiOperation(value = "���������������������������������������������", notes = "���������������������������������������������")
+ @ApiOperation(value = "������������������������������������������������", notes = "������������������������������������������������")
@GetMapping("getSensorByProfessions")
- public ResultMessage getProfessions(HttpServletRequest request) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "professions", value = "������key���������������������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getSensorByProfessions(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
if (ObjectUtils.isEmpty(params.get("organizationId")) || ObjectUtils.isEmpty(params.get("professions"))) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -68,14 +72,14 @@
public ResultMessage professionContribution(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
if (ObjectUtils.isEmpty(params.get("organizationId"))
- ||ObjectUtils.isEmpty(params.get("professions"))
+ || ObjectUtils.isEmpty(params.get("professions"))
|| ObjectUtils.isEmpty(params.get("type"))
|| ObjectUtils.isEmpty(params.get("time"))
|| ObjectUtils.isEmpty(params.get("sensorCode"))) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> response = professionService.professionContribution(params);
+ Map<String, Object> response = professionService.professionContribution(params);
return ResultMessage.ok(response);
}
--
Gitblit v1.8.0