From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 78 ++++++++++++++++----------------------
1 files changed, 33 insertions(+), 45 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 4e0e624..d585874 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
@@ -2,6 +2,7 @@
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.ximon.admin.param.BroadcastTerminalV2Param;
@@ -64,10 +65,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());
}
@@ -77,9 +77,19 @@
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();
@@ -174,49 +184,27 @@
return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
}
- /*public List<BroadcastTerminalV2Entity> getAll(Long userId) {
- Long roleId = sysUserRoleService.queryRoleId(userId);
- Long companyId = sysUserCompanyService.queryCompanyId(userId);
-
-
- List<BroadcastTerminalV2Entity> list = null;
- if(roleId == Constant.SUPER_ADMIN) {
- list = broadcastTerminalV2Dao.getAll();
- }else if(roleId == Constant.ADMIN) {
- list = broadcastTerminalV2Dao.getAllByCompanyId(companyId);
- }else {
- list = broadcastTerminalV2Dao.getAllByUserId(userId);
- }
- return list;
+ /**
+ * 缁堢璇︽儏
+ */
+ public TerminalVO getIpTerminalDetail(Integer id) {
+ return TerminalAPIUtils.getTerminalInfo(id);
}
- public BroadcastTerminalV2Entity getById(Integer i) {
- return broadcastTerminalV2Dao.getById(i);
- }
- public Object getAllWithStatus(Long userId) {
- List<BroadcastTerminalV2Entity> all = getAll(userId);
- for(BroadcastTerminalV2Entity b : all){
- try {
- TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(b.getId());
- if(null == terminalInfo) {
- b.setExist(0);
- }else {
- b.setExist(1);
- }
- b.setStatus(terminalInfo.getStatus());
- b.setIp(terminalInfo.getIp());
- b.setVolumn(terminalInfo.getVolumn());
- b.setDefaultVolumn(terminalInfo.getDefaultVolumn());
- b.setPower(terminalInfo.getPower());
- b.setDefaultPower(terminalInfo.getDefaultPower());
- b.setLast(terminalInfo.getLast());
- b.setTaskType(terminalInfo.getTaskType());
- b.setTaskID(terminalInfo.getTaskID());
- }catch (Exception e) {
- b.setExist(2);
- }
+ /**
+ * 鏍规嵁缁堢id鑾峰彇缁堢淇℃伅
+ *
+ * @param name
+ * @param id
+ * @return
+ */
+ public boolean updateBroadcastTerminalName(String name, Integer id) {
+ BroadcastTerminalV2Entity byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("缁堢涓嶅瓨鍦�");
}
- return all;
- }*/
+ byId.setTerminalName(name);
+ return updateById(byId);
+ }
}
--
Gitblit v1.9.3