From 69790994b403a61e92a20cef7451b7f087b50ad2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 17:16:47 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
index c92f3cf..d63117f 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,15 +13,16 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import java.util.Map;
import com.moral.api.entity.Device;
+import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import com.sun.org.apache.regexp.internal.RE;
+
@Slf4j
@Api(tags = {"���������������������"})
@@ -31,7 +31,7 @@
public class AppDevicController {
@Autowired
- private OrganizationService organizationService;
+ private MonitorPointService monitorPointService;
@Autowired
private DeviceService deviceService;
@@ -39,21 +39,18 @@
@GetMapping("selectOrganization")
- @ApiOperation(value = "���������������������")
+ @ApiOperation(value = "���������������������")
public ResultMessage selectOrganization(){
- List<Organization> organizations = organizationService.getOrganizations();
- return ResultMessage.ok(organizations);
+ List<MonitorPoint> monitorPoints = monitorPointService.getOrganizations();
+ return ResultMessage.ok(monitorPoints);
}
@GetMapping("selectDevice")
@ApiOperation(value = "���������������������")
- public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "������ID") Integer organizationId){
- List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
- if (ObjectUtils.isEmpty(organizationDevice)){
- return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
- }
- return ResultMessage.ok(organizationDevice);
+ public ResultMessage selectDevice(@RequestParam @ApiParam(value = "monitorPointId",name = "������ID") Integer monitorPointId){
+ List<Device> organizationDevice = deviceService.getOrganizationDevice(monitorPointId);
+ return ResultMessage.ok(ObjectUtils.isEmpty(organizationDevice)?null:organizationDevice);
}
@GetMapping("fuzzySearch")
--
Gitblit v1.8.0