From 4024ef51a8d22d575dc929d806d49b30598b422d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:50:45 +0800
Subject: [PATCH] chore:推送修改提交
---
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 d63117f..17b65e8 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
@@ -16,11 +16,10 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.MonitorPoint;
-import com.moral.api.entity.Organization;
+import com.moral.api.pojo.vo.device.AppDeviceVo;
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.api.service.SpecialDeviceService;
import com.moral.constant.ResultMessage;
@@ -35,6 +34,9 @@
@Autowired
private DeviceService deviceService;
+
+ @Autowired
+ private SpecialDeviceService specialDeviceService;
@@ -56,8 +58,15 @@
@GetMapping("fuzzySearch")
@ApiOperation(value = "���������������������")
public ResultMessage fuzzySearch(@RequestParam @ApiParam(value = "mac",name = "������mac���") String mac){
- List<Device> devices = deviceService.getFuzzySearch(mac);
+ List<AppDeviceVo> devices = deviceService.getFuzzySearch(mac);
return ResultMessage.ok(devices);
}
+
+ @GetMapping("specialDevice")
+ @ApiOperation(value = "������������������")
+ public ResultMessage selectSpecialDevice(){
+ List<AppDeviceVo> appDeviceVos = specialDeviceService.selectSpecialDevice();
+ return ResultMessage.ok(appDeviceVos);
+ }
}
--
Gitblit v1.8.0