From d5c71f3c85e9370100559e86e1081c44b1cc15df Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 05 一月 2022 10:37:34 +0800
Subject: [PATCH] 摄像头查询

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java |   99 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 8aeee27..2ccd48e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -1,13 +1,19 @@
 package com.sandu.ximon.admin.service;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.MonitorParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.dao.bo.MonitorBo;
 import com.sandu.ximon.dao.domain.Monitor;
 import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
 import com.sandu.ximon.admin.dto.YSY_MonitorDto;
@@ -45,48 +51,73 @@
     private final PoleBindingService poleBindingService;
 
     /**
-     * 鏌ヨ鍏ㄩ儴鎽勫儚澶�
-     */
-    public List<Monitor> listMonitor() {
-        LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
-        List<Monitor> list = list(wrapper);
-
-        return list;
-    }
-
-    /**
      * 妯＄硦鏌ヨ
      */
-    public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
-        //璁惧鐘舵��:鍦ㄧ嚎/绂荤嚎/鍏ㄩ儴
-        int equipmentState1;
-        int equipmentState2;
-        if (2 == monitorParam.getEquipmentState()) {
-            //鍦ㄧ嚎
-            equipmentState1 = 1;
-            //绂荤嚎
-            equipmentState2 = 0;
-        } else {
-            equipmentState1 = monitorParam.getEquipmentState();
-            equipmentState2 = monitorParam.getEquipmentState();
-        }
+    public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
+        Long clientId = SecurityUtils.getClientId();
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+        List<Long> listAirEquipmentId;
 
         //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
-        int bindingState1;
-        int bindingState2;
-        if (2 == monitorParam.getBindingState()) {
-            //宸茬粦瀹�
-            bindingState1 = 1;
-            //鏈粦瀹�
-            bindingState2 = 0;
+        if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
+            //鍏ㄩ儴
+            int bindingState = 2;
+            listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, bindingState);
         } else {
-            bindingState1 = monitorParam.getBindingState();
-            bindingState2 = monitorParam.getBindingState();
+            listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
         }
-//        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
-        return monitorMapper.listMonitorByKeyword1(monitorParam.getKeyword(), bindingState1, bindingState2);
+        if (CollUtil.isEmpty(listAirEquipmentId)) {
+            return CollUtil.newArrayList();
+        }
+
+        List<MonitorBo> monitorList = monitorMapper.listMonitorByIds(listAirEquipmentId);
+        return monitorList;
     }
 
+
+//    /**
+//     * 鏌ヨ鍏ㄩ儴鎽勫儚澶�
+//     */
+//    public List<Monitor> listMonitor() {
+//        LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
+//        List<Monitor> list = list(wrapper);
+//
+//        return list;
+//    }
+//
+//    /**
+//     * 妯＄硦鏌ヨ
+//     */
+//    public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
+//        //璁惧鐘舵��:鍦ㄧ嚎/绂荤嚎/鍏ㄩ儴
+//        int equipmentState1;
+//        int equipmentState2;
+//        if (2 == monitorParam.getEquipmentState()) {
+//            //鍦ㄧ嚎
+//            equipmentState1 = 1;
+//            //绂荤嚎
+//            equipmentState2 = 0;
+//        } else {
+//            equipmentState1 = monitorParam.getEquipmentState();
+//            equipmentState2 = monitorParam.getEquipmentState();
+//        }
+//
+//        //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
+//        int bindingState1;
+//        int bindingState2;
+//        if (2 == monitorParam.getBindingState()) {
+//            //宸茬粦瀹�
+//            bindingState1 = 1;
+//            //鏈粦瀹�
+//            bindingState2 = 0;
+//        } else {
+//            bindingState1 = monitorParam.getBindingState();
+//            bindingState2 = monitorParam.getBindingState();
+//        }
+////        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
+//        return monitorMapper.listMonitorByKeyword1(baseConditionVO, monitorParam.getKeyword(), bindingState1, bindingState2);
+//    }
+
     /**
      * 鍒犻櫎鎽勫儚澶�
      *

--
Gitblit v1.9.3