From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index 85e2fcc..f8cf860 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -1,17 +1,21 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
+import com.sandu.ximon.admin.redis.DeviceRedisKey;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
-import com.sandu.ximon.admin.dto.TerminalDto;
+import com.sandu.ximon.admin.vo.RedisDeviceStatus;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -29,6 +33,8 @@
@Autowired
private IPBroadcastMapper broadcastTerminalV2EntityMapper;
+ @Autowired
+ private RedisUtils redisUtils;
/**
* 鍚屾缁堢
@@ -68,6 +74,15 @@
*/
}
+ /**
+ * IP闊虫煴鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param order
+ * @param seq
+ * @param broadcastTerminalV2Param
+ * @return
+ */
public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
@@ -158,6 +173,22 @@
}
}
+ /**
+ * IP闊虫煴鍒楄〃锛堢敤浜庨椤垫暟鎹粺璁★級
+ *
+ * @return
+ */
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalListOnHome() {
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
+
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, null, 2);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, SecurityUtils.getUserId(), 2);
+ }
+
+ return broadcastTerminalV2EntityBos;
+ }
public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {
@@ -170,7 +201,7 @@
if (bean.getId().equals(terminalDto.getId())) {
bean.setStatus(terminalDto.getStatus());
bean.setIp(terminalDto.getIp());
- bean.setVolumn(terminalDto.getVolumn());
+ bean.setVolumn(terminalDto.getVolume());
bean.setDefaultVolumn(terminalDto.getDefaultVolumn());
bean.setPower(terminalDto.getPower());
bean.setDefaultPower(terminalDto.getDefaultPower());
@@ -306,4 +337,45 @@
*/
return flag;
}
+
+
+ public static Object getInfo() {
+ return TerminalAPIUtils.getTerminalInfo(25);
+ }
+
+ /**
+ * 鍚慠edis涓瓨鍏ヨ澶囩姸鎬�
+ */
+ public void setCacheData() {
+ //鏈嶅姟鍣ㄦ墍鏈夐煶鏌变俊鎭�
+ List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
+ list.forEach(
+ device -> {
+ RedisDeviceStatus deviceStatus = new RedisDeviceStatus();
+ deviceStatus.setDeviceId(device.getId().toString());
+ if (device != null) {
+ //绌洪棽 1銆� 宸ヤ綔涓� 2 鎴栬�� 4銆� 鏂嚎 0锛� 鎶� 閿� 8
+ switch (device.getStatus()) {
+ case 1:
+ case 2:
+ case 4:
+ deviceStatus.setStatus(0);
+ break;
+ case 0:
+ deviceStatus.setStatus(1);
+ break;
+ case 8:
+ deviceStatus.setStatus(0);
+ break;
+ default:
+ deviceStatus.setStatus(1);
+
+ }
+ }
+ redisUtils.set(DeviceRedisKey.IP_BROADCAST + device.getId(), JSON.toJSONString(deviceStatus));
+// redisUtils.delete(DeviceRedisKey.IP_BROADCAST + device.getId());
+ }
+ );
+
+ }
}
--
Gitblit v1.9.3