From b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 03 Sep 2023 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 2 ++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 ++++++++++
screen-manage/src/main/java/com/moral/api/controller/PubController.java | 20 ++++++++++++++++++++
3 files changed, 32 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();
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index 899c7ae..e67f393 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -73,4 +73,6 @@
**/
List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);
+ void setRedisDevice();
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index a747d6e..ade5420 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
@@ -623,4 +624,13 @@
organizationUnitAlarmMapper.update(null, deleteWrapper);
}
}
+
+ @Override
+ public void setRedisDevice() {
+ List<Device> list = lambdaQuery().eq(Device::getIsDelete,0).list();
+ for(Device d : list){
+ Map<String, Object> deviceInfo = selectDeviceInfoById(d.getId());
+ setDeviceInfoToRedis(d.getMac(), deviceInfo);
+ }
+ }
}
--
Gitblit v1.8.0