From 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 06 六月 2022 11:05:17 +0800
Subject: [PATCH] bug修复

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 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 fcdbc2d..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
@@ -14,6 +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.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;
@@ -66,14 +68,45 @@
          */
     }
 
-    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;
@@ -123,6 +156,33 @@
         } else {
             return broadcastTerminalV2EntityBos_final;
         }
+    }
+
+
+    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;
     }
 
     /**
@@ -228,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