From 0cf3070d6e16b27b3cd467c3fda28f659aa7980e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 11:18:04 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 8f4192e..b6cd814 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,6 +5,7 @@
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;
@@ -12,6 +13,7 @@
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;
@@ -21,13 +23,7 @@
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
- // private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
-// @Autowired
-// private SysUserRoleService sysUserRoleService;
-// @Autowired
-// private SysUserCompanyService sysUserCompanyService;
-// @Autowired
-// private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
+
@Autowired
private IPBroadcastMapper broadcastTerminalV2EntityMapper;
@@ -64,7 +60,6 @@
b.setStreetlightId(0L);
b.setExist(1);
save(b);
-// broadcastTerminalV2EntityMapper.insert(b);
}
});
}
@@ -92,11 +87,9 @@
}
} else {
if (SecurityUtils.getClientId() == null) {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
- , null, broadcastTerminalV2Param.getBindingState());
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, broadcastTerminalV2Param.getBindingState());
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
- , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
}
}
@@ -201,7 +194,11 @@
if (id == null || id.trim().length() == 0) {
return equipmentInfo;
}
- equipmentInfo.setEquipmentMac(id);
+ 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
@@ -242,6 +239,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