From b64d778d7ea64b2c6517b4ec34646be50a930151 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 02 六月 2022 12:41:30 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java |   78 +++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 11 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..d8d628c 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,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.domain.Pole;
+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 +22,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -61,22 +59,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 +157,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 +220,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;
     }

--
Gitblit v1.9.3