From 9f21969b69703a35bde9d659be19f3e39795010d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 12 五月 2022 11:58:01 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 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 1554e7b..616ce3a 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
@@ -5,12 +5,15 @@
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.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
+import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,7 +37,14 @@
* 鍚屾缁堢
*/
public void synchTerminal() {
- List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
+ List<BroadcastTerminalV2Entity> server;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ server = broadcastTerminalV2EntityMapper.listAll(null);
+ } else {
+ server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
+ }
+
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
System.out.println(list);
list.stream().forEach(item -> {
@@ -56,7 +66,6 @@
b.setStreetlightId(0L);
b.setExist(1);
save(b);
-// broadcastTerminalV2EntityMapper.insert(b);
}
});
}
@@ -65,10 +74,9 @@
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
- Long clientId = SecurityUtils.getClientId();
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
- if (2 == broadcastTerminalV2Param.getWorkState()) {
+ if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
@@ -78,9 +86,17 @@
if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState);
+ }
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, broadcastTerminalV2Param.getBindingState());
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ }
}
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -178,13 +194,48 @@
/**
* 缁堢璇︽儏
*/
- public TerminalVO getIpTerminalDetail(Integer id) {
- return TerminalAPIUtils.getTerminalInfo(id);
+ public EquipmentInfomation getIpTerminalDetail(String id) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("IP闊虫煴");
+ if (id == null || id.trim().length() == 0) {
+ return equipmentInfo;
+ }
+ BroadcastTerminalV2Entity one = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, id));
+ if (one != null) {
+ equipmentInfo.setEquipmentMac(id);
+ equipmentInfo.setEquipmentName(one.getTerminalName());
+ }
+ TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
+ if (terminalInfo != null) {
+ //绌洪棽 1銆� 宸ヤ綔涓� 2 鎴栬�� 4銆� 鏂嚎 0锛� 鎶� 閿� 8
+ switch (terminalInfo.getStatus()) {
+ case 1:
+ equipmentInfo.setEquipmentState("绌洪棽");
+ break;
+ case 2:
+ case 4:
+ equipmentInfo.setEquipmentState("宸ヤ綔涓�");
+ break;
+ case 0:
+ equipmentInfo.setEquipmentState("鏂嚎");
+ break;
+ case 8:
+ equipmentInfo.setEquipmentState("鎶ラ敊");
+ break;
+ default:
+ equipmentInfo.setEquipmentState("鏈煡");
+
+ }
+ } else {
+ equipmentInfo.setEquipmentState("鏈煡");
+ }
+ return equipmentInfo;
}
/**
* 鏍规嵁缁堢id鑾峰彇缁堢淇℃伅
+ *
* @param name
* @param id
* @return
@@ -194,6 +245,10 @@
if (byId == null) {
throw new BusinessException("缁堢涓嶅瓨鍦�");
}
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
byId.setTerminalName(name);
return updateById(byId);
}
--
Gitblit v1.9.3