From 23fd3f969d2e35c40742b6cd69a24ddf0195732a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 15:25:07 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 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 726dbb7..13da43f 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,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -15,7 +14,8 @@
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.domain.Pole;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -61,22 +60,53 @@
}
});
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍寮�濮�
*/
StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴鍚屾", "IP闊虫煴鍚屾璁惧");
/**
- * IP闊虫煴鍚屾鏃ュ織璁板綍缁撴潫
+ * IP闊虫煴鍚屾 鏃ュ織璁板綍缁撴潫
*/
}
- public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.IP_VOLUME_NAME.getCode();
+ case 3:
+ orderByResult = OrderByEnums.IP_VOLUME_POLE_NAME.getCode();
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
@@ -128,6 +158,33 @@
}
}
+
+ public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {
+
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getListTerminalOnBind(SecurityUtils.getClientId(), keyword);
+
+
+ List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
+ for (TerminalVO terminalVO : list) {
+ if (bean.getId().equals(terminalVO.getId())) {
+ bean.setStatus(terminalVO.getStatus());
+ bean.setIp(terminalVO.getIp());
+ bean.setVolumn(terminalVO.getVolumn());
+ bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
+ bean.setPower(terminalVO.getPower());
+ bean.setDefaultPower(terminalVO.getDefaultPower());
+ bean.setLast(terminalVO.getLast());
+ bean.setTaskType(terminalVO.getTaskType());
+ bean.setTaskID(terminalVO.getTaskID());
+ break;
+ }
+ }
+ }
+
+ return broadcastTerminalV2EntityBos;
+ }
+
/**
* 淇敼璁惧缁戝畾鐘舵��
*
@@ -164,12 +221,12 @@
boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
/**
- * IP闊虫煴淇敼璁惧鍚嶇О鏃ュ織璁板綍寮�濮�
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍寮�濮�
*/
- String content = "{璁惧Id:" + params.getId() + "锛屼慨鏀瑰悗闊抽噺锛�" + params.getDefaultVolumn() + "}";
- StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴闊抽噺淇敼", content);
+// String content = "{璁惧Id:" + params.getId() + "锛屼慨鏀瑰悗闊抽噺锛�" + params.getDefaultVolumn() + "}";
+// StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴闊抽噺淇敼", content);
/**
- * IP闊虫煴鏀硅澶囧悕绉版棩蹇楄褰曠粨鏉�
+ * IP闊虫煴闊抽噺淇敼 鏃ュ織璁板綍缁撴潫
*/
return flag;
}
@@ -231,9 +288,11 @@
if (byId == null) {
throw new BusinessException("缁堢涓嶅瓨鍦�");
}
- boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
- if (!belong) {
- throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
}
byId.setTerminalName(name);
boolean flag = updateById(byId);
--
Gitblit v1.9.3