From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/PubController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/PubController.java b/screen-manage/src/main/java/com/moral/api/controller/PubController.java
index 128bf4a..8ab4929 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/PubController.java
@@ -7,6 +7,7 @@
import com.moral.api.pojo.form.user.UserUpdateForm;
import com.moral.api.pojo.vo.user.UserQueryVO;
import com.moral.api.service.DeviceAdjustValueService;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.UserService;
import com.moral.api.util.CacheUtils;
import com.moral.constant.ResponseCodeEnum;
@@ -36,6 +37,8 @@
public class PubController {
@Autowired
private CacheUtils cacheUtils;
+ @Autowired
+ private DeviceService deviceService;
@Resource
private DeviceAdjustValueService deviceAdjustValueService;
@@ -70,4 +73,21 @@
return new ResultMessage();
}
+ @GetMapping(value = "device")
+ @ApiOperation(value = "redis������������device", notes = "redis������������device")
+ public ResultMessage device() {
+ deviceService.setRedisDevice();
+ return new ResultMessage();
+ }
+
+ @GetMapping(value = "selectDeviceInfoById")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ public ResultMessage selectDeviceInfoById(Integer mac) {
+ Map<String,Object> resultMap = deviceService.selectDeviceInfoById(mac);
+ return new ResultMessage();
+ }
+
}
--
Gitblit v1.8.0