From 0476c982d3dd4748ce0267856425c28fcb143b6f Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 16:13:02 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/OrganizationController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
index ad7a6b0..ac56f25 100644
--- a/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +17,9 @@
import javax.servlet.http.HttpServletRequest;
+import com.moral.api.entity.Organization;
+import com.moral.api.service.DeviceService;
+import com.moral.api.service.OrganizationService;
import com.moral.api.service.SysAreaService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -30,6 +34,12 @@
@Autowired
private SysAreaService sysAreaService;
+
+ @Autowired
+ private DeviceService deviceService;
+
+ @Autowired
+ private OrganizationService organizationService;
/**
* @param request ������������
@@ -49,4 +59,39 @@
List<Map<String, Object>> response = sysAreaService.getMapPath(Integer.parseInt(params.get("organizationId").toString()));
return ResultMessage.ok(response);
}
+
+ /**
+ * @param request ������������
+ * @return ������������������������������������
+ */
+ @GetMapping("getDevicesByOrganizationId")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getDevicesByOrganizationId(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("organizationId")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<Map<String, Object>> response = deviceService.getDevicesByOrganizationId(Integer.parseInt(params.get("organizationId").toString()));
+ return ResultMessage.ok(response);
+ }
+
+
+ @GetMapping("getOrganizationId")
+ @ApiOperation("������������������������")
+ public ResultMessage getOrganizationId(){
+ List<Organization> organizations = organizationService.getOrganizationId();
+ return ResultMessage.ok(ObjectUtils.isEmpty(organizations)?"0":organizations);
+ }
+
+
+ @GetMapping("queryDevices")
+ @ApiOperation("������������������")
+ public ResultMessage queryDevices(){
+ List<Organization> organizations = organizationService.queryDevices();
+ return ResultMessage.ok(organizations);
+ }
}
--
Gitblit v1.8.0