From f72da3bc5ca43fd37c1f0de15a1e9128a627a563 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 13:59:35 +0800
Subject: [PATCH] fix：日报数据调整
---
screen-api/src/main/java/com/moral/api/controller/OrganizationController.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 6101bfc..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,7 +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;
@@ -34,6 +37,9 @@
@Autowired
private DeviceService deviceService;
+
+ @Autowired
+ private OrganizationService organizationService;
/**
* @param request ������������
@@ -72,4 +78,20 @@
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